openstack
/
neutron-lbaas
Code Issues Proposed changes

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 <l7-policy-id> is using this l7policy

while it should be:
listener is using l7policy <l7-policy-id>

Change-Id: I81f1bebb20c04546dbb8d0cf56b8cb8dcdfc2107
This commit is contained in:
Adit Sarfaty 2018-05-02 10:35:00 +03:00
parent 6af0eac974
commit ac518ed8c5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron_lbaas/extensions/loadbalancerv2.py
View File

@ -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):

12
neutron_lbaas/services/loadbalancer/plugin.py
View File

@ -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)