X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/2c0dfed5194f8639c512faa887442eb98cf70f11..b06dd0d35f2d85a00d3204b5383b865ba8548faf:/gen/ip-billing.gen

diff --git a/gen/ip-billing.gen b/gen/ip-billing.gen
index ad95d41e..688999a0 100755
--- a/gen/ip-billing.gen
+++ b/gen/ip-billing.gen
@@ -25,17 +25,17 @@ $dbh = DBI->connect("dbi:Oracle:moira", "moira", "moira")
 
 # First report all the NETWK-A hosts.
 $sth = $dbh->prepare("SELECT m.address, m.location, m.name, m.contact, " .
-		     "m.account_number, m.created, m.modtime FROM " .
-		     "machine m, subnet s WHERE m.status = 1 " .
+		     "m.billing_contact, m.account_number, m.created, " .
+		     "m.modtime FROM machine m, subnet s WHERE m.status = 1 " .
 		     "AND m.snet_id = s.snet_id AND s.status = 1 " .
 		     "AND m.address != 'unassigned' ORDER BY m.address") 
     || exit $MR_DBMS_ERR;
 
 $sth->execute || exit $MR_DBMS_ERR;
 
-while (($address, $location, $name, $contact, $accountnumber, $created, $modtime) =
+while (($address, $location, $name, $contact, $billingcontact, $accountnumber, $created, $modtime) =
        $sth->fetchrow_array) {
-    $row = "$address\t$location\t$name\t$contact\t$accountnumber\t+NETWK-A\t$created\t$modtime\n";
+    $row = "$address\t$location\t$name\t$contact\t$billingcontact\t$accountnumber\t+NETWK-A\t$created\t$modtime\n";
     $row =~ s/\0//g;
     print DAT $row;
     $count++;
@@ -54,7 +54,9 @@ while (($saddr, $name, $contact, $accountnumber, $modtime) =
        $sth->fetchrow_array) {
     @addr = unpack("C4", pack("N", $saddr));
     $address = "$addr[0].$addr[1].$addr[2].$addr[3]";
-    $row = "$address\t\t$name\t$contact\t$accountnumber\t+NETWK-10P\t\t$modtime\n";
+    # Blank field between contact and account number below because that's
+    # where the billing contact would go if we had it for subnets.
+    $row = "$address\t\t$name\t$contact\t\t$accountnumber\t+NETWK-10P\t\t$modtime\n";
     $row =~ s/\0//g;
     print DAT $row;
     $count++;
@@ -72,7 +74,9 @@ while (($saddr, $name, $contact, $accountnumber, $modtime) =
        $sth->fetchrow_array) {
     @addr = unpack("C4", pack("N", $saddr));
     $address = "$addr[0].$addr[1].$addr[2].$addr[3]";
-    $row = "$address\t\t$name\t$contact\t$accountnumber\t+NETWK-100P\t\t$modtime\n";
+    # Blank field between contact and account number below because that's
+    # where the billing contact would go if we had it for subnets.
+    $row = "$address\t\t$name\t$contact\t\t$accountnumber\t+NETWK-100P\t\t$modtime\n";
     $row =~ s/\0//g;
     print DAT $row;
     $count++;
@@ -90,26 +94,86 @@ while (($saddr, $name, $contact, $accountnumber, $modtime) =
        $sth->fetchrow_array) {
     @addr = unpack("C4", pack("N", $saddr));
     $address = "$addr[0].$addr[1].$addr[2].$addr[3]";
-    $row = "$address\t\t$name\t$contact\t$accountnumber\t+NETWK-1000P\t\t$modtime\n";
+    # Blank field between contact and account number below because that's
+    # where the billing contact would go if we had it for subnets.
+    $row = "$address\t\t$name\t$contact\t\t$accountnumber\t+NETWK-1000P\t\t$modtime\n";
     $row =~ s/\0//g;
     print DAT $row;
     $count++;
 }
 
-# +NETWK-0
+# +NETWK-DORM
+$sth = $dbh->prepare("SELECT m.address, m.location, m.name, m.contact, " .
+		     "m.billing_contact, m.account_number, m.created, " .
+		     "m.modtime FROM machine m, subnet s WHERE m.status = 1 " .
+		     "AND m.snet_id = s.snet_id AND " .
+		     "s.status = 5 AND m.address != 'unassigned' " .
+		     "ORDER BY m.address")
+    || exit $MR_DBMS_ERR;
+
+$sth->execute || exit $MR_DBMS_ERR;
+
+while (($address, $location, $name, $contact, $billingcontact, $accountnumber, $created, $modtime) = 
+       $sth->fetchrow_array) { 
+    $row = "$address\t$location\t$name\t$contact\t$billingcontact\t$accountnumber\t+NETWK-DORM\t$created\t$modtime\n";
+    $row =~ s/\0//g;
+    print DAT $row;
+    $count++;
+}
+
+# +NETWK-FSILG
+$sth = $dbh->prepare("SELECT m.address, m.location, m.name, m.contact, " .
+                     "m.billing_contact, m.account_number, m.created, " .
+		     "m.modtime FROM machine m, subnet s WHERE m.status = 1 " .
+                     "AND m.snet_id = s.snet_id AND " .
+                     "s.status = 8 AND m.address != 'unassigned' " .
+                     "ORDER BY m.address")
+    || exit $MR_DBMS_ERR;
+
+$sth->execute || exit $MR_DBMS_ERR;
+
+while (($address, $location, $name, $contact, $billingcontact, $accountnumber, $created, $modtime) = 
+       $sth->fetchrow_array) { 
+    $row = "$address\t$location\t$name\t$contact\t$billingcontact\t$accountnumber\t+NETWK-FSILG\t$created\t$modtime\n";
+    $row =~ s/\0//g;
+    print DAT $row;
+    $count++;
+}
+
+# +NETWK-OCS
 $sth = $dbh->prepare("SELECT m.address, m.location, m.name, m.contact, " .
-		     "m.account_number, m.created, m.modtime FROM " .
-		     "machine m, subnet s WHERE m.status = 1 " .
+		     "m.billing_contact, m.account_number, m.created, "  .
+		     "m.modtime FROM machine m, subnet s WHERE m.status = 1 " .
 		     "AND m.snet_id = s.snet_id AND " .
-		     "(s.status = 4 OR s.status = 5 OR s.status = 6) " .
+		     "s.status = 6 AND s.name LIKE '%-DHREG' " .
+		     "AND m.address != 'unassigned' ORDER BY m.address")
+    || exit $MR_DBMS_ERR;
+
+$sth->execute || exit $MR_DBMS_ERR;
+
+while (($address, $location, $name, $contact, $billingcontact, $accountnumber, $created, $modtime) =
+       $sth->fetchrow_array) {
+    $row = "$address\t$location\t$name\t$contact\t$billingcontact\t$accountnumber\t+NETWK-OCS\t$created\t$modtime\n";
+    $row =~ s/\0//g;
+    print DAT $row;
+    $count++;
+}
+
+# +NETWK-0
+$sth = $dbh->prepare("SELECT m.address, m.location, m.name, m.contact, " .
+		     "m.billing_contact, m.account_number, m.created, " .
+		     "m.modtime FROM machine m, subnet s WHERE m.status = 1 " .
+		     "AND m.snet_id = s.snet_id AND " .  
+		     "(s.status = 4 OR s.status = 6) AND " .
+		     "s.name NOT LIKE '%-DHREG' " .
 		     "AND m.address != 'unassigned' ORDER BY m.address") 
     || exit $MR_DBMS_ERR;
 
 $sth->execute || exit $MR_DBMS_ERR;
 
-while (($address, $location, $name, $contact, $accountnumber, $created, $modtime) =
+while (($address, $location, $name, $contact, $billingcontact, $accountnumber, $created, $modtime) =
        $sth->fetchrow_array) {
-    $row = "$address\t$location\t$name\t$contact\t$accountnumber\t+NETWK-0\t$created\t$modtime\n";
+    $row = "$address\t$location\t$name\t$contact\t$billingcontact\t$accountnumber\t+NETWK-0\t$created\t$modtime\n";
     $row =~ s/\0//g;
     print DAT $row;
     $count++;