r4341 new feature: Cisco NX-OS v4, v5 LLDP gateway

nxos4ReadLLDPStatus: new gwrxlator function
new dictionaty items 'NX-OS 5.0' and 'NX-OS 5.1'

diff --git a/ChangeLog b/ChangeLog
index e6d9e6736dfce2c7f238caf9a2c6c48f26d2e91a..ff544dd8645ef3a1ad10fa0d4fb2029dfa134c39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
        update: ability to delete a file entity from the Edit tab of the File page
        update: 802.1q: links to switchports allowing the vlan added in page Vlan info
        update: new object types: power supply chassis, power supply (#409)
+       new feature: Cisco NX-OS v4, v5 LLDP gateway
 0.19.1 2011-02-22
        update: UI: rack lists are now reduced by common tags with object on Rackspace tab (FILTER_RACKLIST_BY_TAGS config var)
        update: 802.1q: If switch has IP interface in some VLAN linked to IP subnet, this VLAN is not pruned from switch's uplink

diff --git a/gateways/deviceconfig/nxos4.connector b/gateways/deviceconfig/nxos4.connector
index 767f7b7ee8021b3a83f98fc88645858655b48687..aa4265b21a3093c2d84de6ce3a1fe280f094f2b4 100755 (executable)
--- a/gateways/deviceconfig/nxos4.connector
+++ b/gateways/deviceconfig/nxos4.connector
@@ -82,6 +82,14 @@ if ($command eq "getmaclist") {
     print WORKFILE @r, "\n\n";;
     exit(0);
 }
+if ($command eq "getlldpstatus") {
+    open(WORKFILE, ">$workfile") || die "$workfile: $!";
+    $session->cmd ('terminal length 0');
+    $session->cmd ('terminal no monitor');
+    my @r = $session->cmd ('show lldp neighbors detail');
+    print WORKFILE @r, "\n\n";;
+    exit(0);
+}
 if ($command eq "deploy") {
     open(WORKFILE, "<$workfile") || die "$workfile: $!";
     while (<WORKFILE>) {

diff --git a/wwwroot/inc/deviceconfig.php b/wwwroot/inc/deviceconfig.php
index a91d4ea4beef9442b1f94643068ca5f4d62b9263..92664432aa72706dc2d7ab6e98cd765060221d54 100644 (file)
--- a/wwwroot/inc/deviceconfig.php
+++ b/wwwroot/inc/deviceconfig.php
@@ -174,6 +174,46 @@ function vrp55ReadLLDPStatus ($input)
        return $ret;
 }
 
+function nxos4ReadLLDPStatus ($input)
+{
+       $ret = array();
+       $current = array();
+       $if_name = NULL;
+       foreach (explode ("\n", $input) as $line)
+       {
+               $line = trim ($line);
+               if ($line == '')
+               {
+                       if (isset ($if_name) and isset ($current['port']) and isset ($current['device']))
+                               $ret[$if_name][] = $current;
+                       $current = array();
+                       $if_name = NULL;
+               }
+               else
+               {
+                       $pair = explode (': ', $line);
+                       if (count ($pair) == 2 and isset ($pair[1]))
+                       {
+                               list ($key, $value) = $pair;
+                               $value = trim ($value, "\x06\x10\x13");
+                               switch ($key)
+                               {
+                                       case 'Port id':
+                                               $current['port'] = ios12ShortenIfName ($value);
+                                               break;
+                                       case 'System Name':
+                                               $current['device'] = $value;
+                                               break;
+                                       case 'Local Port id':
+                                               $if_name = ios12ShortenIfName ($value);
+                                               break;
+                               }
+                       }
+               }
+       }
+       return $ret;
+}
+
 function vrp53ReadHNDPStatus ($input)
 {
        $ret = array();

diff --git a/wwwroot/inc/dictionary.php b/wwwroot/inc/dictionary.php
index 4ecafabc474ca4818bf4b4654280199515cd6763..d965a9801042c768bd3f118c813b01407b8c5c38 100644 (file)
--- a/wwwroot/inc/dictionary.php
+++ b/wwwroot/inc/dictionary.php
@@ -1489,6 +1489,8 @@ $dictionary = array
        1407 => array ('chapter_id' => 35, 'dict_value' => 'D-Link%GPASS%DPS-500'),
        1408 => array ('chapter_id' => 35, 'dict_value' => 'D-Link%GPASS%DPS-510'),
        1409 => array ('chapter_id' => 35, 'dict_value' => 'D-Link%GPASS%DPS-600'),
+       1410 => array ('chapter_id' => 14, 'dict_value' => 'Cisco NX-OS 5.0'),
+       1411 => array ('chapter_id' => 14, 'dict_value' => 'Cisco NX-OS 5.1'),
 //                                     ^
 //                                     ^
 // add new dictionary entries up here  ^
@@ -1552,7 +1554,7 @@ $dictionary = array
        1557 => array ('chapter_id' => 32, 'dict_value' => 'VMware%GPASS%Distributed vSwitch'),
        1558 => array ('chapter_id' => 32, 'dict_value' => 'Cisco%GPASS%Nexus 1000V'),
        1559 => array ('chapter_id' => 33, 'dict_value' => 'NS-OS 4.0'),
-// NOTICE: do not add new dictionary entries here, add them to the gap above (~1395)!
+// NOTICE: do not add new dictionary entries here, add them to the gap above (~1411)!
 );
 
 ?>