fixup! Add vlan aware VMs support

(cherry picked from commit d940956)
(cherry picked from commit e57a5c5)
(cherry picked from commit 0ae4296)

networking_generic_switch/devices/__init__.py

@@ -174,7 +174,6 @@ def add_network(self, segmentation_id, network_id):
     def del_network(self, segmentation_id, network_id):
         pass
 
-    @abc.abstractmethod
     def plug_port_to_network_trunk(self, port_id, segmentation_id, trunk_details=None, vtr=False):
         pass
 

networking_generic_switch/devices/netmiko_devices/dell.py

@@ -72,6 +72,8 @@ class DellOS10(netmiko_devices.NetmikoSwitch):
 
     SET_NATIVE_VLAN = (
         'interface {port}',
+        # Clean all the old trunked vlans by switching to access mode first
+        'switchport mode access',
         'switchport mode trunk',
         'switchport access vlan {segmentation_id}',
     )

networking_generic_switch/tests/unit/netmiko/test_dell.py

@@ -59,7 +59,8 @@ def test_get_trunk_port_cmds_no_vlan_translation(self):
         ]
         res = self.switch.get_trunk_port_cmds_no_vlan_translation(
             '2222', 777, trunk_details)
-        self.assertEqual(['interface 2222', 'switchport mode trunk',
+        self.assertEqual(['interface 2222', 'switchport mode access',
+                          'switchport mode trunk',
                           'switchport access vlan 777',
                           'interface 2222',
                           'switchport trunk allowed vlan 130'],