From d741328543ad6059bef56adb59f4c94781eaedcd Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Mon, 10 Sep 2012 12:15:02 -0700 Subject: Fix flavor deletion when there is a deleted flavor If there is a deleted flavor with the same ID as an undeleted flavor, the flavormanage delete code attempts to delete it again, which fails. This patch makes sure to pass read_deleted='no' when the flavor is retrieved for deletion so we get the undeleted flavor. Includes a failing test to make sure the value is passed properly. Fixes bug 1048678 Change-Id: If6a20de2526b7ba90ada4a40317a98f79b2141dc --- nova/api/openstack/compute/contrib/flavormanage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py index a7e313c9c..69d5d6ed9 100644 --- a/nova/api/openstack/compute/contrib/flavormanage.py +++ b/nova/api/openstack/compute/contrib/flavormanage.py @@ -42,7 +42,8 @@ class FlavorManageController(wsgi.Controller): authorize(context) try: - flavor = instance_types.get_instance_type_by_flavor_id(id) + flavor = instance_types.get_instance_type_by_flavor_id( + id, read_deleted="no") except exception.NotFound, e: raise webob.exc.HTTPNotFound(explanation=str(e)) -- cgit