pvl.hosts.interfaces: remove junos-specifics
authorTero Marttila <terom@paivola.fi>
Mon, 09 Mar 2015 21:17:06 +0200
changeset 736 75938aa0390b
parent 735 008cfe47b194
child 737 6ba76ac0bc72
pvl.hosts.interfaces: remove junos-specifics
pvl/hosts/interface.py
--- a/pvl/hosts/interface.py	Mon Mar 09 19:48:19 2015 +0200
+++ b/pvl/hosts/interface.py	Mon Mar 09 21:17:06 2015 +0200
@@ -4,7 +4,7 @@
 def parse_interfaces(interfaces):
     for interface, value in interfaces.iteritems():
         if not isinstance(value, dict):
-            yield (interface, 0), ipaddress.ip_interface(value)
+            yield (interface, None), ipaddress.ip_interface(value)
         else:
             for unit, ip in value.iteritems():
                 yield (interface, int(unit)), ipaddress.ip_interface(value)
@@ -20,12 +20,6 @@
     def __init__ (self, interfaces):
         self.interfaces = interfaces
 
-    def iter_interfaces (self):
-        for (iface, unit), ip in self.interfaces.iteritems():
-            family = {4: 'inet', 6: 'inet6' }[ip.version]
-
-            yield iface, unit, family, ip
-
     def addresses (self):
         for (iface, unit), ip in self.interfaces.iteritems():
             # XXX: ipaddr