Merge branch 'master' of github.com:tech-server/tgmanage

3 files changed, 91 insertions, 73 deletions

diff --git a/tools/generate-rowdns.pl b/tools/generate-rowdns.pl
index 1cc2b8d..075cae0 100755
--- a/tools/generate-rowdns.pl
+++ b/tools/generate-rowdns.pl
@@ -5,6 +5,10 @@ BEGIN {
         require "include/config.pm";
 }
 
+use JSON -support_by_pp;
+use LWP 5.64;
+use LWP::UserAgent;
+use Net::SSL; # needed, else LWP goes into emo-mode
 use Net::IP;
 use NetAddr::IP;
 use Getopt::Long;
@@ -18,75 +22,81 @@ if (@ARGV > 0) {
 }
 
 # Use this to generate nsupdate for all edge switches
-# Expects joined input from switches.txt and patchlist.txt
-## paste -d' ' switches.txt <(cut -d' ' -f3- patchlist.txt) > working-area/switches-patchlist.txt
 
-print "server $nms::config::pri_v4\n";
+# fetch PI API content
+sub get_url{
+        my $url = shift;
 
-while (<STDIN>){
-	# e73-4 151.216.160.64/26 2a02:ed02:160b::/64 151.216.181.141/26 2a02:ed02:181c::141/64 1734 distro6 @ports
-	my ( $swname, $client_v4, $client_v6, $sw_v4, $sw_v6, $vlan, $distro, @ports ) = split;
-	
-	(my $v4gw = NetAddr::IP->new($client_v4)->first()) =~ s/\/[0-9]{1,2}//;
-	(my $v6gw = NetAddr::IP->new($client_v6)->first()) =~ s/\/[0-9]{1,2}//;
+	$ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0; # just to be sure :-D
+	my $ua = LWP::UserAgent->new;
+	my $req = HTTP::Request->new(GET => $url);
+	$req->authorization_basic($nms::config::nmsapi_user, $nms::config::nmsapi_pass);
+
+	return $ua->request($req)->content();
+}
+
+my $json_obj = new JSON;
+my $json_content = get_url($nms::config::nmsapi_url . "/api/read/switches-management");
+if($json_content){
+	my $json = $json_obj->allow_nonref->utf8->relaxed->escape_slash->loose->allow_singlequote->allow_barekey->decode($json_content);
 	
-	(my $v4mgmt = $sw_v4) =~ s/\/[0-9]{1,2}//;
-	(my $v6mgmt = $sw_v6) =~ s/\/[0-9]{1,2}//;
+	print "server $nms::config::pri_v4\n";
 	
-	my $fqdn = $swname . "." . $nms::config::tgname . ".gathering.org.";
-	my $sw_fqdn = "sw." . $fqdn;
-	my $gw_fqdn = "gw." . $fqdn;
-	my $text_info = $distro . ", vlan $vlan, " . join(' + ', @ports);
+	foreach my $switch (values %{$json->{switches}}){
+		next unless ($switch->{subnet4}); # require at least IPv4 client subnet
+		next unless ($switch->{sysname} =~ m/^e[0-9]+?\-/); # only rows
+		
+		(my $v4mgmt = $switch->{mgmt_v4_addr}) =~ s/\/[0-9]{1,2}//;
+		(my $v6mgmt = $switch->{mgmt_v6_addr}) =~ s/\/[0-9]{1,2}//;
+		(my $v4gw = NetAddr::IP->new($switch->{subnet4})->first()) =~ s/\/[0-9]{1,2}//;
+		(my $v6gw = NetAddr::IP->new($switch->{subnet6})->first()) =~ s/\/[0-9]{1,2}//;
+		
+		my $fqdn = $switch->{sysname} . "." . $nms::config::tgname . ".gathering.org.";
+		my $sw_fqdn = "sw." . $fqdn;
+		my $gw_fqdn = "gw." . $fqdn;
 	
-	# A and AAAA-record to the switch
-	if($delete){
-		print "update delete $sw_fqdn \t IN A\n";
-		print "update delete $sw_fqdn \t IN AAAA\n";
-	} else {
-		print "update add $sw_fqdn \t 3600 IN A \t $v4mgmt\n";
-		print "update add $sw_fqdn \t 3600 IN AAAA \t $v6mgmt\n";
-	}
-	print "send\n";
-
-	# PTR to the switch
-	if($delete){
-		print "update delete " . Net::IP->new($v4mgmt)->reverse_ip() . " \t IN PTR\n";
+		# A and AAAA-record to the switch
+		if($delete){
+			print "update delete $sw_fqdn \t IN A\n";
+			print "update delete $sw_fqdn \t IN AAAA\n";
+		} else {
+			print "update add $sw_fqdn \t 3600 IN A \t $v4mgmt\n";
+			print "update add $sw_fqdn \t 3600 IN AAAA \t $v6mgmt\n";
+		}
 		print "send\n";
-		print "update delete " . Net::IP->new($v6mgmt)->reverse_ip() . " \t IN PTR\n";
-	} else {
-		print "update add " . Net::IP->new($v4mgmt)->reverse_ip() . " \t 3600 IN PTR \t $sw_fqdn\n";
-		print "send\n";
-		print "update add " . Net::IP->new($v6mgmt)->reverse_ip() . " \t 3600 IN PTR \t $sw_fqdn\n";
-	}
-	print "send\n";
 
-	# TXT-record with details
-	if($delete){
-		print "update delete $sw_fqdn \t IN TXT\n";
-	} else {
-		print "update add $sw_fqdn \t 3600 IN TXT \t \"" . $text_info . "\"\n";
-	}
-	print "send\n";
-
-	# A and AAAA-record to the gateway/router
-	if($delete){
-		print "update delete $gw_fqdn \t IN A\n";
-		print "update delete $gw_fqdn \t IN AAAA\n";
-	} else {
-	        print "update add $gw_fqdn \t 3600 IN A \t $v4gw\n";
-	        print "update add $gw_fqdn \t 3600 IN AAAA \t $v6gw\n";
-	}
-	print "send\n";
-
-	# PTR to the gateway/router
-	if($delete){
-		print "update delete " . Net::IP->new($v4gw)->reverse_ip() . " \t IN PTR\n";
+		# PTR to the switch
+		if($delete){
+			print "update delete " . Net::IP->new($v4mgmt)->reverse_ip() . " \t IN PTR\n" if $v4mgmt;
+			print "send\n" if $v4mgmt;
+			print "update delete " . Net::IP->new($v6mgmt)->reverse_ip() . " \t IN PTR\n" if $v6mgmt
+		} else {
+			print "update add " . Net::IP->new($v4mgmt)->reverse_ip() . " \t 3600 IN PTR \t $sw_fqdn\n" if $v4mgmt;
+			print "send\n" if $v4mgmt;
+			print "update add " . Net::IP->new($v6mgmt)->reverse_ip() . " \t 3600 IN PTR \t $sw_fqdn\n" if $v6mgmt;
+		}
 		print "send\n";
-		print "update delete " . Net::IP->new($v6gw)->reverse_ip() . " \t IN PTR\n";
-	} else {
-	        print "update add " . Net::IP->new($v4gw)->reverse_ip() . " \t 3600 IN PTR \t $gw_fqdn\n";
+
+		# A and AAAA-record to the gateway/router
+		if($delete){
+			print "update delete $gw_fqdn \t IN A\n";
+			print "update delete $gw_fqdn \t IN AAAA\n";
+		} else {
+		        print "update add $gw_fqdn \t 3600 IN A \t $v4gw\n" if $v4gw;
+		        print "update add $gw_fqdn \t 3600 IN AAAA \t $v6gw\n" if $v6gw;
+		}
 		print "send\n";
-	        print "update add " . Net::IP->new($v6gw)->reverse_ip() . " \t 3600 IN PTR \t $gw_fqdn\n";
+
+		# PTR to the gateway/router
+		if($delete){
+			print "update delete " . Net::IP->new($v4gw)->reverse_ip() . " \t IN PTR\n" if $v4gw;
+			print "send\n" if $v4gw;
+			print "update delete " . Net::IP->new($v6gw)->reverse_ip() . " \t IN PTR\n" if $v6gw;
+		} else {
+		        print "update add " . Net::IP->new($v4gw)->reverse_ip() . " \t 3600 IN PTR \t $gw_fqdn\n" if $v4gw;
+			print "send\n" if $v4gw;
+		        print "update add " . Net::IP->new($v6gw)->reverse_ip() . " \t 3600 IN PTR \t $gw_fqdn\n" if $v6gw;
+		}
+	        print "send\n";
 	}
-        print "send\n";
-}
+}
\ No newline at end of file
diff --git a/web/nms.gathering.org/index.html b/web/nms.gathering.org/index.html
index c919f2c..a10d1dc 100644
--- a/web/nms.gathering.org/index.html
+++ b/web/nms.gathering.org/index.html
@@ -26,16 +26,19 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
       <![endif]-->
       <style type="text/css">
-	canvas {
-	  -webkit-touch-callout: none;
-	  -webkit-user-select: none;
-	  -khtml-user-select: none;
-	  -moz-user-select: none;
-	  -ms-user-select: none;
-	  user-select: none;
-	  outline: none;
-	  -webkit-tap-highlight-color: rgba(255, 255, 255, 0); /* mobile webkit */
-	}   
+				canvas {
+					-webkit-touch-callout: none;
+					-webkit-user-select: none;
+					-khtml-user-select: none;
+					-moz-user-select: none;
+					-ms-user-select: none;
+					user-select: none;
+					outline: none;
+					-webkit-tap-highlight-color: rgba(255, 255, 255, 0); /* mobile webkit */
+				}
+				tr.mgmt_v4_addr {
+					font-weight: 700;
+				}
       </style>
   </head>
 
diff --git a/web/nms.gathering.org/js/nms-info-box.js b/web/nms.gathering.org/js/nms-info-box.js
index 0b90d49..304a8d9 100644
--- a/web/nms.gathering.org/js/nms-info-box.js
+++ b/web/nms.gathering.org/js/nms-info-box.js
@@ -209,7 +209,7 @@ nmsInfoBox._windowTypes.switchInfo = {
 		}
 	},
   getTitle: function() {
-    return '<button type="button" class="edit btn btn-xs btn-warning" onclick="nmsInfoBox._windowTypes.switchInfo.showEdit(\'' + this.sw + '\');">Edit</button> <button type="button" class="comments btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showComments(\'' + this.sw + '\');">Comments</button> <button type="button" class="edit btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showSNMP(\'ports\');">Ports</button> <button type="button" class="edit btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showSNMP(\'misc\');">Misc</button> ' + this.sw + '';
+    return '<h4>' + this.sw + '</h4><button type="button" class="edit btn btn-xs btn-warning" onclick="nmsInfoBox._windowTypes.switchInfo.showEdit(\'' + this.sw + '\');">Edit</button> <button type="button" class="comments btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showComments(\'' + this.sw + '\');">Comments</button> <button type="button" class="edit btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showSNMP(\'ports\');">Ports</button> <button type="button" class="edit btn btn-xs btn-default" onclick="nmsInfoBox._windowTypes.switchInfo.showSNMP(\'misc\');">Misc</button>';
   },
   getContent: function() {
     return this.content;
@@ -344,6 +344,10 @@ nmsInfoBox._windowTypes.switchInfo = {
       dataType: "text",
       data:myData,
       success: function (data, textStatus, jqXHR) {
+        var result = JSON.parse(data);
+        if(result.switches_updated.length > 0) { // FIXME unresolved variable switches_addded
+          nmsInfoBox.hide();
+        }
         nmsData.invalidate("switches");
         nmsData.invalidate("smanagement");
       }
@@ -383,6 +387,7 @@ nmsInfoBox._makeTable = function(content, caption) {
 	}
 	for (var v in content) { 
 		tr = table.insertRow(-1);
+		tr.className = content[v][0].toLowerCase();
 		td1 = tr.insertCell(0);
 		td2 = tr.insertCell(1);
 		td1.innerHTML = content[v][0];