pvl.snmp.vlan: fixup names() and vlan_ports()
authorTero Marttila <terom@paivola.fi>
Tue, 18 Mar 2014 21:24:18 +0200
changeset 396 dea2635763e6
parent 395 9de553b50128
child 397 8455f42d8926
pvl.snmp.vlan: fixup names() and vlan_ports()
pvl/snmp/vlan.py
--- a/pvl/snmp/vlan.py	Tue Mar 18 14:02:26 2014 +0200
+++ b/pvl/snmp/vlan.py	Tue Mar 18 21:24:18 2014 +0200
@@ -57,10 +57,22 @@
             return int(value)
 
     def names (self) :
+        """
+                (vlan, name)
+        """
+
         for idx, data in self.table(DOT1Q_VLAN_STATIC_NAME) :
-            yield str(data[DOT1Q_VLAN_STATIC_NAME])
+            vlan, = idx
 
-    def vlans (self) :
+            yield int(vlan), str(data[DOT1Q_VLAN_STATIC_NAME])
+
+    def vlan_ports (self) :
+        """
+            Get per-vlan port configs.
+
+                (vlan, (tagged, untagged))
+        """
+
         for idx, data in self.table(DOT1Q_VLAN_CURRENT_EGRESS_PORTS, DOT1Q_VLAN_CURRENT_UNTAGGED_PORTS) :
             time, vlan = idx