Merge pull request F5Networks#1317 from jlongstaf/bug.orphan-errors

Bug.orphan errors
jlongstaf · Jun 18, 2018 · 1a8f272 · 1a8f272
2 parents f427120 + f9ea609
commit 1a8f272
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/f5_openstack_agent/__init__.py b/f5_openstack_agent/__init__.py
@@ -1 +1 @@
-__version__ = "9.6.0"
+__version__ = "9.6.1"
diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/agent_manager.py b/f5_openstack_agent/lbaasv2/drivers/bigip/agent_manager.py
@@ -686,7 +686,7 @@ def validate_service(self, lb_id):
                 LOG.debug("Found service definition for '{}', state is ACTIVE"
                           " move on.".format(lb_id))
         except f5_ex.InvalidNetworkType as exc:
-            LOG.warning(exc.msg)
+            LOG.warning(exc.message)
         except f5_ex.F5NeutronException as exc:
             LOG.error("NeutronException: %s" % exc.msg)
         except Exception as exc:
@@ -810,7 +810,6 @@ def clean_orphaned_objects_and_save_device_config(self):
                 pools = self.lbdriver.get_all_deployed_pools()
                 if pools:
                     self.purge_orphaned_pools(pools)
-                    self.purge_orphaned_nodes(pools)
 
                 # Ask the BIG-IP for all deployed monitors not associated
                 # to a pool

diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/icontrol_driver.py b/f5_openstack_agent/lbaasv2/drivers/bigip/icontrol_driver.py
@@ -2199,7 +2199,7 @@ def update_operating_status(self, service):
                     self.network_builder._annotate_service_route_domains(
                         service)
                 except f5ex.InvalidNetworkType as exc:
-                    LOG.warning(exc.msg)
+                    LOG.warning(exc.message)
                     return
 
             # get currrent member status

diff --git a/f5_openstack_agent/lbaasv2/drivers/bigip/network_service.py b/f5_openstack_agent/lbaasv2/drivers/bigip/network_service.py
@@ -179,7 +179,7 @@ def prep_service_networking(self, service, traffic_group):
                           "with route domain ID.")
                 self._annotate_service_route_domains(service)
             except f5_ex.InvalidNetworkType as exc:
-                LOG.warning(exc.msg)
+                LOG.warning(exc.message)
             except Exception as err:
                 LOG.exception(err)
                 raise f5_ex.RouteDomainCreationException(