Merge pull request #259 from stephanerobert/remove_logical_marker_from_interface

Remove logical interface marking

Author: fbouliane

netman/adapters/switches/juniper/qfx_copper.py

@@ -59,12 +59,12 @@ def parse_mac_address_table(self, mac_table):
             interface = first_text(vlan_path.xpath("l2ng-l2-mac-logical-interface"))
             vlan = int(first_text(vlan_path.xpath("l2ng-l2-vlan-id")))
             mac_address = first_text(vlan_path.xpath("l2ng-l2-mac-address"))
-            type = self._parse_interface_type(interface)
+            interface, type = self._parse_interface_type(interface)
             mac.append(MacAddress(vlan, mac_address, interface, type))
         return mac
 
     def _parse_interface_type(self, interface):
         if interface.startswith("ae"):
-            return "Agregated"
+            return interface.strip('.0'), "Agregated"
         else:
-            return "Physical"
+            return interface.strip('.0'), "Physical"

netman/adapters/switches/juniper/standard.py

@@ -227,12 +227,12 @@ def parse_mac_address_table(self, mac_table):
             if interface not in rejected_interface_names:
                 mac_address = first_text(mac_table.xpath("mac-address"))
                 vlan = int(first_text(mac_table.xpath("mac-vlan-tag")))
-                type = self._parse_interface_type(interface)
+                interface, type = self._parse_interface_type(interface)
                 mac.append(MacAddress(vlan, mac_address, interface, type))
         return mac
 
     def _parse_interface_type(self, interface):
         if interface.startswith("ae"):
-            return "Agregated"
+            return interface.strip('.0'), "Agregated"
         else:
-            return "Physical"
+            return interface.strip('.0'), "Physical"

tests/adapters/switches/juniper_qfx_copper_test.py

@@ -709,15 +709,15 @@ def test_get_mac_addresses(self):
 
         for mac_address in mac_addresses:
             if mac_address.mac_address == '00:11:c6:01:53:a7':
-                assert_that(mac_address.interface, is_('ae47.0'))
+                assert_that(mac_address.interface, is_('ae47'))
                 assert_that(mac_address.vlan, is_(4063))
                 assert_that(mac_address.type, is_('Agregated'))
             elif mac_address.mac_address == '00:11:90:3d:33:58':
-                assert_that(mac_address.interface, is_('xe-0/0/6.0'))
+                assert_that(mac_address.interface, is_('xe-0/0/6'))
                 assert_that(mac_address.vlan, is_(4080))
                 assert_that(mac_address.type, is_('Physical'))
             elif mac_address.mac_address == '00:11:b7:b4:74:2c':
-                assert_that(mac_address.interface, is_('ae47.0'))
+                assert_that(mac_address.interface, is_('ae47'))
                 assert_that(mac_address.vlan, is_(4063))
                 assert_that(mac_address.type, is_('Agregated'))
             else:

tests/adapters/switches/juniper_test.py

@@ -6701,11 +6701,11 @@ def test_get_mac_addresses(self):
 
         for mac_address in mac_addresses:
             if mac_address.mac_address == '02:e0:52:36:38:01':
-                assert_that(mac_address.interface, is_('ae19.0'))
+                assert_that(mac_address.interface, is_('ae19'))
                 assert_that(mac_address.vlan, is_(3991))
                 assert_that(mac_address.type, is_('Agregated'))
             elif mac_address.mac_address == '52:d1:aa:9a:b2:2b':
-                assert_that(mac_address.interface, is_('ge-1/0/13.0'))
+                assert_that(mac_address.interface, is_('ge-1/0/13'))
                 assert_that(mac_address.vlan, is_(3991))
                 assert_that(mac_address.type, is_('Physical'))
             else: