Merge pull request #1360 from F5Networks/cherry-pick-9.6-03a6f0e

Cherry pick 03a6f0e to 9.6-stable
F5Networks · Oct 26, 2018 · 3351451 · 3351451
2 parents 6f279cf + 8361df8
commit 3351451
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/exceptions.py b/f5_openstack_agent/lbaasv2/drivers/bigip/exceptions.py
@@ -438,7 +438,7 @@ def __check_debug(self):
                     line = fh.readline()
                     print('line', line)
                     debug_re = \
-                        re.compile('debug\s*=\s*([Tt]rue|[Ff]alse|[01])')
+                        re.compile(r'debug\s*=\s*([Tt]rue|[Ff]alse|[01])')
                     while line:
                         match = debug_re.search(line)
                         if match:  # there should only be one!

diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/lbaas_driver.py b/f5_openstack_agent/lbaasv2/drivers/bigip/lbaas_driver.py
@@ -53,36 +53,36 @@ def flush_cache(self):
 
     def backend_integrity(self):
         """Return True, if the agent is be considered viable for services."""
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def backup_configuration(self):
         """Persist backend configuratoins."""
         raise NotImplementedError()
 
     def generate_capacity_score(self, capacity_policy):
         """Generate the capacity score of connected devices."""
-        raise NotImplemented
+        raise NotImplementedError()
 
     def update_operating_status(self):
         """Update pool member operational status from devices to controller."""
-        raise NotImplemented
+        raise NotImplementedError()
 
     def recover_errored_devices(self):
         """Trigger attempt to reconnect any errored devices."""
-        raise NotImplemented
+        raise NotImplementedError()
 
     def get_stats(self, service):
         """Get Stats for a loadbalancer Service."""
         raise NotImplementedError()
 
     def get_all_deployed_loadbalancers(self, purge_orphaned_folders=True):
         """Get all Loadbalancers defined on devices."""
-        raise NotImplemented
+        raise NotImplementedError()
 
     def purge_orphaned_loadbalancer(self, tenant_id, loadbalancer_id,
                                     hostnames):
         """Remove all loadbalancers without references in Neutron."""
-        raise NotImplemented
+        raise NotImplementedError()
 
     def service_exists(self, service):
         """Check If LBaaS Service is Defined on Driver Target."""

diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_icontrol_driver_opts.py b/f5_openstack_agent/lbaasv2/drivers/bigip/test/test_icontrol_driver_opts.py
@@ -30,7 +30,7 @@
 
 def test_opts_type():
     """Check that all opts are a oslo_config.cfg.* object"""
-    type_check = re.compile('oslo_config\.cfg\.(\w+Opt)')
+    type_check = re.compile(r'oslo_config\.cfg\.(\w+Opt)')
     for opt in opts:
         match = type_check.search(str(opt))
         assert match, str("{} is not recognized as a oslo_config.cfg.*"