From ac518ed8c57a588aaf78055f866b7e50dbf94680 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Wed, 2 May 2018 10:35:00 +0300 Subject: [PATCH] Fix EntityInUse exception message EntityInUse exception message gets the entity-in-use ID, and not the entrty-using ID, so the error message was wrong. For example the old message could be: listener is using this l7policy while it should be: listener is using l7policy Change-Id: I81f1bebb20c04546dbb8d0cf56b8cb8dcdfc2107 --- neutron_lbaas/extensions/loadbalancerv2.py | 2 +- neutron_lbaas/services/loadbalancer/plugin.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/neutron_lbaas/extensions/loadbalancerv2.py b/neutron_lbaas/extensions/loadbalancerv2.py index d57b26738..7c056d823 100644 --- a/neutron_lbaas/extensions/loadbalancerv2.py +++ b/neutron_lbaas/extensions/loadbalancerv2.py @@ -58,7 +58,7 @@ class DelayOrTimeoutInvalid(nexception.BadRequest): class EntityInUse(nexception.InUse): - message = _("%(entity_using)s %(id)s is using this %(entity_in_use)s") + message = _("%(entity_using)s is using %(entity_in_use)s %(id)s") class OnePoolPerListener(nexception.InUse): diff --git a/neutron_lbaas/services/loadbalancer/plugin.py b/neutron_lbaas/services/loadbalancer/plugin.py index 9e4607001..75e47f3ce 100644 --- a/neutron_lbaas/services/loadbalancer/plugin.py +++ b/neutron_lbaas/services/loadbalancer/plugin.py @@ -443,14 +443,14 @@ class LoadBalancerPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2, old_lb = self.db.get_loadbalancer(context, id) if old_lb.listeners: raise loadbalancerv2.EntityInUse( - entity_using=models.Listener.NAME, + entity_using=models.LoadBalancer.NAME, id=old_lb.listeners[0].id, - entity_in_use=models.LoadBalancer.NAME) + entity_in_use=models.Listener.NAME) if old_lb.pools: raise loadbalancerv2.EntityInUse( - entity_using=models.PoolV2.NAME, + entity_using=models.LoadBalancer.NAME, id=old_lb.pools[0].id, - entity_in_use=models.LoadBalancer.NAME) + entity_in_use=models.PoolV2.NAME) self.db.test_and_set_status(context, models.LoadBalancer, id, n_constants.PENDING_DELETE) driver = self._get_driver_for_provider(old_lb.provider.provider_name) @@ -746,9 +746,9 @@ class LoadBalancerPluginv2(loadbalancerv2.LoadBalancerPluginBaseV2, old_pool = self.db.get_pool(context, id) if old_pool.healthmonitor: raise loadbalancerv2.EntityInUse( - entity_using=models.HealthMonitorV2.NAME, + entity_using=models.PoolV2.NAME, id=old_pool.healthmonitor.id, - entity_in_use=models.PoolV2.NAME) + entity_in_use=models.HealthMonitorV2.NAME) self.db.test_and_set_status(context, models.PoolV2, id, n_constants.PENDING_DELETE) db_pool = self.db.get_pool(context, id)