Changeset 394

Timestamp:

02/19/10 13:10:34 (15 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Basic support for network node references: Add, view, edit nodes and

referencess

Probably excludes a bunch of real use-cases for various reasons

Location:

branches/stable

Files:

• assign.html (modified) (1 diff)
• cgi-bin/IPDB.pm (modified) (4 diffs)
• cgi-bin/ipdb.psql (modified) (1 diff)
• cgi-bin/main.cgi (modified) (6 diffs)
• cgi-bin/newnode.cgi (added)
• confirm.html (modified) (1 diff)
• editDisplay.html (modified) (1 diff)
• fb-assign.html (modified) (1 diff)
• ipdb.css (modified) (1 diff)
• newnode.html (added)

branches/stable/assign.html

@@ -24 +24 @@
 </tr><tr class="color1">
 <td>Route from/through:&nbsp;</td><td>
-<select name="pop"><option selected>-</option>
+<select name="pop"><option selected value=>-</option>
 $$POPLIST$$
 </select>
 </td>
-</tr><tr class="color2">
+</tr>
+<tr class="hack"><td>Wifi tower/Fibre demarc</td><td>
+<select name="node"><option selected>-</option>
+$$NODELIST$$
+</select>
+&nbsp;<a href="javascript:popNotes('/ip/newnode.html')">Add new location</a>
+</td></tr>
+<tr class="color2">
 <td>Route/allocate from this master:&nbsp;</td><td>$$MASTERLIST$$
 Allow automatic allocation from private IP ranges:<input type=checkbox name=allowpriv>

branches/stable/cgi-bin/IPDB.pm

@@ -292 +292 @@
 # Returns a success code and optional error message.
 sub allocateBlock {
-  my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid,$privdata) = @_;
+  my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid,$privdata,$nodeid) = @_;
 
   my $cidr = new NetAddr::IP $_[1];
@@ -333 +333 @@
         " where ip='$cidr'");
       $sth->execute;
+# node hack
+      if ($nodeid && $nodeid ne '') {
+        $sth = $dbh->prepare("INSERT INTO noderef (block,node_id) VALUES (?,?)");
+        $sth->execute("$cidr",$nodeid);
+      }
+# end node hack
       $dbh->commit;
     };
@@ -393 +399 @@
         } # routing vs non-routing netblock
 
+# node hack
+      if ($nodeid && $nodeid ne '') {
+        $sth = $dbh->prepare("INSERT INTO noderef (block,node_id) VALUES (?,?)");
+        $sth->execute("$cidr",$nodeid);
+      }
+# end node hack
         $dbh->commit;
       }; # end of eval
@@ -497 +509 @@
         } # done with netblock alloctype != rm
 
+# node hack
+      if ($nodeid && $nodeid ne '') {
+        $sth = $dbh->prepare("INSERT INTO noderef (block,node_id) VALUES (?,?)");
+        $sth->execute("$cidr",$nodeid);
+      }
+# end node hack
         $dbh->commit;
       }; # end eval

branches/stable/cgi-bin/ipdb.psql

@@ -212 +212 @@
 );
 
+-- Network nodes - allows finding customers affected by a broken <x> quickly
+CREATE TABLE noderef (
+    block inet NOT NULL PRIMARY KEY,
+    node_id integer
+);
+
+CREATE TABLE nodes (
+    node_id serial NOT NULL PRIMARY KEY,
+    node_type character varying(2),
+    node_name character varying(40),
+    node_ip inet
+);

branches/stable/cgi-bin/main.cgi

@@ -614 +614 @@
   }
   $html =~ s|\$\$ALLCITIES\$\$|$cities|g;
+
+## node hack
+  $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
+  $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"<br>\n";
+  my $nodes = '';
+  while (my ($nid,$nname) = $sth->fetchrow_array()) {
+    $nodes .= "<option value='$nid'>$nname</option>\n";
+  }
+  $html =~ s/\$\$NODELIST\$\$/$nodes/;
+## end node hack
 
   my $i = 0;
@@ -780 +790 @@
   close HTML;
 
+## node hack
+  if ($webvar{node} && $webvar{node} ne '-') {
+    $sth = $ip_dbh->prepare("SELECT node_name FROM nodes WHERE node_id=?");
+    $sth->execute($webvar{node});
+    my ($nodename) = $sth->fetchrow_array();
+    $html =~ s/\$\$NODENAME\$\$/$nodename/;
+    $html =~ s/\$\$NODEID\$\$/$webvar{node}/;
+  } else {
+    $html =~ s/\$\$NODENAME\$\$//;
+    $html =~ s/\$\$NODEID\$\$//;
+  }
+## end node hack
+
 ### gotta fix this in final
   # Stick in customer info as necessary - if it's blank, it just ends
@@ -849 +872 @@
   my ($code,$msg) = allocateBlock($ip_dbh, $webvar{fullcidr}, $webvar{alloc_from},
         $webvar{custid}, $webvar{alloctype}, $webvar{city}, $webvar{desc}, $webvar{notes},
-        $webvar{circid}, $webvar{privdata});
+        $webvar{circid}, $webvar{privdata}, $webvar{node});
 
   if ($code eq 'OK') {
@@ -1031 +1054 @@
       $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}<input type=hidden name=alloctype value="$data[2]">/g;
     }
+## node hack
+  $sth = $ip_dbh->prepare("SELECT node_id FROM noderef WHERE block='$webvar{block}'");
+  $sth->execute;
+  my ($nodeid) = $sth->fetchrow_array();
+  if ($nodeid) {
+    $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
+    $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"<br>\n";
+    my $nodes = "<select name=node>\n";
+    while (my ($nid,$nname) = $sth->fetchrow_array()) {
+      $nodes .= "<option".($nodeid == $nid ? ' selected' : '')." value='$nid'>$nname</option>\n";
+    }
+    $nodes .= "</select>\n";
+    $html =~ s/\$\$NODE\$\$/$nodes/;
+  } else {
+    if ($data[2] eq 'fr' || $data[2] eq 'bi') {
+      $sth = $ip_dbh->prepare("SELECT node_id, node_name FROM nodes ORDER BY node_type,node_id");
+      $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"<br>\n";
+      my $nodes = "<select name=node>\n<option value=>--</option>\n";
+      while (my ($nid,$nname) = $sth->fetchrow_array()) {
+        $nodes .= "<option value='$nid'>$nname</option>\n";
+      }
+      $nodes .= "</select>\n";
+      $html =~ s/\$\$NODE\$\$/$nodes/;
+    } else {
+      $html =~ s|\$\$NODE\$\$|N/A|;
+    }
+  }
+## end node hack
     $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g;
     $html =~ s/\$\$CITY\$\$/<input type=text name=city value="$data[3]">/g;
@@ -1037 +1088 @@
     $html =~ s|\$\$NOTES\$\$|<textarea rows="8" cols="64" name="notes" class="regular">$data[6]</textarea>|g;
   } else {
+## node hack
+    if ($data[2] eq 'fr' || $data[2] eq 'bi') {
+      $sth = $ip_dbh->prepare("SELECT node_name FROM nodes INNER JOIN noderef".
+        " ON nodes.node_id=noderef.node_id WHERE noderef.block='$webvar{block}'");
+      $sth->execute() or print "DEBUG: failed retrieval from nodes: ".$sth->errstr,"<br>\n";
+      my ($node) = $sth->fetchrow_array;
+      $html =~ s/\$\$NODE\$\$/$node/;
+    } else {
+      $html =~ s|\$\$NODE\$\$|N/A|;
+    }
+## end node hack
     $html =~ s/\$\$CUSTID\$\$/$data[1]/g;
     $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g;
@@ -1135 +1197 @@
     $sth = $ip_dbh->prepare($sql);
     $sth->execute;
+## node hack
+    if ($webvar{node}) {
+      $ip_dbh->do("DELETE FROM noderef WHERE block='$webvar{block}'");
+      $sth = $ip_dbh->prepare("INSERT INTO noderef (block,node_id) VALUES (?,?)");
+      $sth->execute($webvar{block},$webvar{node});
+    }
+## end node hack
     $ip_dbh->commit;
   };

branches/stable/confirm.html

@@ -10 +10 @@
 </tr><tr class="color1">
 <td>City:&nbsp;</td><td>&nbsp;$$CITY$$<input type="hidden" name="city" value="$$CITY$$"></td>
+</tr><tr class="hack">
+<td>Demarc switch/wifi tower:&nbsp;</td><td>&nbsp;$$NODENAME$$<input type="hidden" name="node" value="$$NODEID$$"></td>
 </tr><tr class="color2">
 <td>Allocation type:&nbsp;</td><td>&nbsp;$$TYPEFULL$$</td>

branches/stable/editDisplay.html

@@ -11 +11 @@
 
 <tr class="color1"><td class=heading>Type:</td><td class=regular>$$TYPESELECT$$</td></tr>
+
+<tr class="hack"><td class=heading>Demarc/tower:</td><td class=regular>$$NODE$$</td></tr>
 
 <tr class="color2"><td class=heading>CustID:</td><td class="regular">$$CUSTID$$</td></tr>

branches/stable/fb-assign.html

@@ -18 +18 @@
 </tr><tr class="color2">
 <td>Customer ID:&nbsp;</td><td><input type="text" name="custid" size="15" maxlength="15"> (Only required for Customer allocations)</td>
-</tr><tr class="color1">
+</tr>
+<tr class="hack"><td>Wifi tower/Fibre demarc</td><td>
+<select name="node"><option selected>-</option>
+$$NODELIST$$
+</select>
+&nbsp;<a href="javascript:popNotes('/ip/newnode.html')">Add new location</a>
+</td></tr>
+<tr class="color1">
 <td valign="top">Description/Name:&nbsp;</td><td><input name="desc" size=40></td>
 </tr><tr class="color2">

branches/stable/ipdb.css

@@ -33 +33 @@
 tr.color2 {
         background-color: #A8C4D0;
+        font-family: Verdana, Arial, Helvetica, sans-serif;
+        font-size: 90%;
+}
+
+tr.hack {
+        background-color: #E4EEE8;
         font-family: Verdana, Arial, Helvetica, sans-serif;
         font-size: 90%;