Merge pull request #983 from zhaoqin-github/flake8

Fix flake8 E741 and W605 error

Author: zhaoqin-github

f5lbaasdriver/utils/remote_add_environment.py

@@ -62,9 +62,9 @@ def setup_env_oncontroller(diff_env):
         # Stop neutron server / f5_plugin
         execute(lambda: run('sudo systemctl stop neutron-server'))
         # Edit agent configuration to use new environment
-        sedtempl = '''sed -i "s/^\(environment_prefix = \)\(.*\)$/\\1%s/"''' +\
-                   ''' /etc/neutron/services/f5/f5-openstack-agent.ini'''
-        sedstring = 'sudo ' + sedtempl % diff_env
+        sedtmpl = r'''sed -i "s/^\(environment_prefix = \)\(.*\)$/\\1%s/"''' +\
+                  r''' /etc/neutron/services/f5/f5-openstack-agent.ini'''
+        sedstring = 'sudo ' + sedtmpl % diff_env
         execute(lambda: run(sedstring))
         # Add diff env to neutron_lbaas.conf and installed Python package
         add_string = 'sudo add_f5agent_environment %s' % diff_env

f5lbaasdriver/v2/bigip/service_builder.py

@@ -459,7 +459,7 @@ def _get_l7policies(self, context, loadbalancer, listeners):
         """Get l7 policies filtered by listeners."""
         l7policies = []
         if listeners:
-            listener_ids = [l['id'] for l in listeners]
+            listener_ids = [listener['id'] for listener in listeners]
 
             def get_db_policies():
                 if cfg.CONF.f5_driver_perf_mode in (1, 3):
@@ -500,8 +500,8 @@ def _get_l7policy_rules(self, context, loadbalancer, l7policies):
 
                 def get_db_rules():
                     if cfg.CONF.f5_driver_perf_mode in (1, 3):
-                        for l in loadbalancer.listeners:
-                            for policy in l.l7_policies:
+                        for listener in loadbalancer.listeners:
+                            for policy in listener.l7_policies:
                                 if policy.id == pol_id:
                                     return policy.rules
                     else:

f5lbaasdriver/v2/bigip/test/test_service_builder.py

@@ -136,7 +136,7 @@ def test_get_l7policies_filter(listeners):
     driver = mock.MagicMock()
 
     # construct an equivalent filter to what service_builder should use
-    filters = {'listener_id': [l['id'] for l in listeners]}
+    filters = {'listener_id': [listener['id'] for listener in listeners]}
 
     service_builder = LBaaSv2ServiceBuilder(driver)
     service_builder._get_l7policies(context, lb, listeners)