VLAN aware VMs: pep8 fix ups

Change-Id: Ia8b2e2b8ea90830fbdbc60d8a3b64afe693224db

Author: markgoddard

networking_generic_switch/devices/__init__.py

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

networking_generic_switch/devices/netmiko_devices/__init__.py

@@ -256,7 +256,8 @@ def del_network(self, segmentation_id, network_id):
         return self.send_commands_to_device(cmds)
 
     @check_output('plug port trunk')
-    def plug_port_to_network_trunk(self, port, segmentation_id, trunk_details=None, vtr=False):
+    def plug_port_to_network_trunk(self, port, segmentation_id,
+                                   trunk_details=None, vtr=False):
         cmd_set = []
         vts = self.ngs_config.get('vlan_translation_supported', False)
         # NOTE(vsaienko) Always use vlan translation if it is supported.
@@ -265,9 +266,9 @@ def plug_port_to_network_trunk(self, port, segmentation_id, trunk_details=None,
                 port, segmentation_id, trunk_details))
         else:
             if vtr:
-                msg = _("Cannot bind_port VLAN aware port as switch %s "
-                        "doesn't support VLAN translation. "
-                        "But it is required.") % self.config['ip']
+                msg = ("Cannot bind_port VLAN aware port as switch %s "
+                       "doesn't support VLAN translation. "
+                       "But it is required.") % self.config['ip']
                 raise exc.GenericSwitchNotSupported(error=msg)
             else:
                 cmd_set.extend(
@@ -410,7 +411,9 @@ def check_output(self, output, operation):
                     config=device_utils.sanitise_config(self.config),
                     error=msg)
 
-    def get_trunk_port_cmds_no_vlan_translation(self, port_id, segmentation_id, trunk_details):
+    def get_trunk_port_cmds_no_vlan_translation(self, port_id,
+                                                segmentation_id,
+                                                trunk_details):
         cmd_set = []
         cmd_set.extend(
             self._format_commands(self.SET_NATIVE_VLAN,
@@ -423,5 +426,6 @@ def get_trunk_port_cmds_no_vlan_translation(self, port_id, segmentation_id, trun
                     segmentation_id=sub_port['segmentation_id']))
         return cmd_set
 
-    def get_trunk_port_cmds_vlan_translation(self, port_id, segmentation_id, trunk_details):
+    def get_trunk_port_cmds_vlan_translation(self, port_id, segmentation_id,
+                                             trunk_details):
         pass

networking_generic_switch/generic_switch_mech.py

@@ -18,7 +18,6 @@
 from neutron_lib.api.definitions import portbindings
 from neutron_lib.callbacks import resources
 from neutron_lib.plugins.ml2 import api
-from neutron_lib.plugins import directory
 from oslo_log import log as logging
 
 from networking_generic_switch import config as gsw_conf
@@ -476,25 +475,26 @@ def bind_port(self, context):
                         vtr = self._is_vlan_translation_required(trunk_details)
                         switch.plug_port_to_network_trunk(
                             port_id, segmentation_id, trunk_details, vtr)
-                    elif is_802_3ad and hasattr(switch, 'plug_bond_to_network'):
+                    elif (is_802_3ad
+                          and hasattr(switch, 'plug_bond_to_network')):
                         switch.plug_bond_to_network(port_id, segmentation_id)
                     else:
                         switch.plug_port_to_network(
                             port_id, segmentation_id)
                 except ngs_exc.GenericSwitchNotSupported as e:
                     LOG.warning("Operation is not supported by "
-                                    "networking-generic-switch. %(err)s)",
+                                "networking-generic-switch. %(err)s)",
                                 {'err': e})
                     raise e
                 except Exception as e:
-                        LOG.error("Failed to bind port %(port_id)s in "
-                                      "segment %(segment_id)s on device "
-                                      "%(device)s due to error %(err)s",
-                                  {'port_id': port['id'],
-                                   'device': switch_info,
-                                   'segment_id': segmentation_id,
-                                   'err': e})
-                        raise e
+                    LOG.error("Failed to bind port %(port_id)s in "
+                              "segment %(segment_id)s on device "
+                              "%(device)s due to error %(err)s",
+                              {'port_id': port['id'],
+                               'device': switch_info,
+                               'segment_id': segmentation_id,
+                               'err': e})
+                    raise e
                 # END
                 LOG.info("Successfully bound port %(port_id)s in segment "
                          "%(segment_id)s on device %(device)s",

networking_generic_switch/tests/unit/netmiko/test_dell.py

@@ -28,7 +28,6 @@ def _make_switch_device(self, extra_cfg={}):
         device_cfg.update(extra_cfg)
         return dell.DellOS10(device_cfg)
 
-
     def test_get_trunk_port_cmds_no_vlan_translation(self):
         mock_context = mock.create_autospec(driver_context.PortContext)
         self.switch.ngs_config['vlan_translation_supported'] = True

networking_generic_switch/tests/unit/netmiko/test_netmiko_base.py

@@ -15,11 +15,10 @@
 import re
 from unittest import mock
 
-from neutron.plugins.ml2 import driver_context
-
 import fixtures
 import netmiko
 import netmiko.base_connection
+from neutron.plugins.ml2 import driver_context
 from oslo_config import fixture as config_fixture
 import paramiko
 import tenacity
@@ -417,8 +416,10 @@ def test_bind_port_trunk_no_vts(self, t_mock, nt_mock, sctd_mock,
                                 'trunk_details': {'sub_ports':
                                                   [{'segmentation_id': 123}]}}
         trunk_details = {'sub_ports': [{'segmentation_id': 123}]}
-        self.switch.plug_port_to_network_trunk('2222', None, trunk_details, vtr=False)
-        nt_mock.assert_called_once_with('2222', None, {'sub_ports': [{'segmentation_id': 123}]})
+        self.switch.plug_port_to_network_trunk('2222', None, trunk_details,
+                                               vtr=False)
+        nt_mock.assert_called_once_with(
+            '2222', None, {'sub_ports': [{'segmentation_id': 123}]})
         self.assertFalse(t_mock.called)
 
     @mock.patch.object(netmiko_devices.netmiko, 'ConnectHandler')
@@ -448,8 +449,10 @@ def test_bind_port_trunk_vts(self, t_mock, nt_mock, sctd_mock,
                                 'trunk_details': {'sub_ports':
                                                   [{'segmentation_id': 123}]}}
         trunk_details = {'sub_ports': [{'segmentation_id': 123}]}
-        self.switch.plug_port_to_network_trunk('2222', None, trunk_details, vtr=False)
-        t_mock.assert_called_once_with('2222', None, {'sub_ports': [{'segmentation_id': 123}]})
+        self.switch.plug_port_to_network_trunk('2222', None,
+                                               trunk_details, vtr=False)
+        t_mock.assert_called_once_with(
+            '2222', None, {'sub_ports': [{'segmentation_id': 123}]})
         self.assertFalse(nt_mock.called)
 
     @mock.patch.object(netmiko_devices.netmiko, 'ConnectHandler')
@@ -462,11 +465,11 @@ def test_bind_port_trunk_vts(self, t_mock, nt_mock, sctd_mock,
     def test_bind_port_trunk_no_vts_raise(self, t_mock, nt_mock, sctd_mock,
                                           nm_mock):
         connect_mock = mock.Mock()
-        mock_context = mock.create_autospec(driver_context.PortContext)
         nm_mock.return_value = connect_mock
         self.switch.ngs_config['vlan_translation_supported'] = False
         trunk_details = {'sub_ports': [{'segmentation_id': 123}]}
         self.assertRaises(exc.GenericSwitchNotSupported,
-                          self.switch.plug_port_to_network_trunk, '2222', None, trunk_details, vtr=True)
+                          self.switch.plug_port_to_network_trunk, '2222', None,
+                          trunk_details, vtr=True)
         self.assertFalse(t_mock.called)
         self.assertFalse(nt_mock.called)

networking_generic_switch/tests/unit/test_generic_switch_mech.py

@@ -19,7 +19,6 @@
 from neutron.db import provisioning_blocks
 from neutron.plugins.ml2 import driver_context
 from neutron_lib.callbacks import resources
-from neutron_lib.plugins import directory
 
 from networking_generic_switch import exceptions
 from networking_generic_switch import generic_switch_mech as gsm
@@ -836,7 +835,6 @@ def test_bind_port_trunk(self, m_apc, m_list, m_vlan):
                                       resources.PORT,
                                       'GENERICSWITCH')
 
-
     @mock.patch.object(provisioning_blocks, 'add_provisioning_component')
     def test_bind_portgroup(self, m_apc, m_list):
         driver = gsm.GenericSwitchDriver()