openstack
/
placement
Code Issues Proposed changes

Remove NOTEs about _RE_INV_IN_USE 

The nova report client used to scrape the error message text to
determine whether a 409 represented an "inventory in use" scenario. As
of the dependency, it properly uses the error code instead. This change
removes notes that reference the now-dead regular expression.

Depends-On: https://review.openstack.org/568639
Change-Id: Id56a975481f360a6ddacb64c424c1c9bf49449cc
This commit is contained in:
Eric Fried 2019-02-11 17:20:37 -06:00 committed by Chris Dent
parent 01246b0183
commit 39871109ca
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
placement/exception.py
View File

@ -112,8 +112,6 @@ class InvalidInventoryCapacityReservedCanBeTotal(InvalidInventoryCapacity):
# An exception with this name is used on both sides of the placement/
# nova interaction.
class InventoryInUse(InvalidInventory):
# NOTE(mriedem): This message cannot change without impacting the
# nova.scheduler.client.report._RE_INV_IN_USE regex.
msg_fmt = _("Inventory for '%(resource_classes)s' on "
"resource provider '%(resource_provider)s' in use.")

2
placement/handlers/inventory.py
View File

@ -402,8 +402,6 @@ def delete_inventories(req):
% {'rp_uuid': resource_provider.uuid},
comment=errors.CONCURRENT_UPDATE)
except exception.InventoryInUse as ex:
# NOTE(mriedem): This message cannot change without impacting the
# nova.scheduler.client.report._RE_INV_IN_USE regex.
raise webob.exc.HTTPConflict(ex.format_message(),
comment=errors.INVENTORY_INUSE)