Merge "Fix improper prompt when update RC with existed one's name."

nova/api/openstack/placement/handlers/resource_class.py

@@ -183,7 +183,7 @@ def update_resource_class(req):
     except exception.ResourceClassExists:
         raise webob.exc.HTTPConflict(
             _('Resource class already exists: %(name)s') %
-            {'name': name},
+            {'name': rc.name},
             json_formatter=util.json_error_formatter)
     except exception.ResourceClassCannotUpdateStandard:
         raise webob.exc.HTTPBadRequest(

nova/tests/functional/api/openstack/placement/gabbits/resource-classes.yaml

@@ -151,6 +151,7 @@ tests:
   status: 409
   response_strings:
       - Resource class already exists
+      - $ENVIRON['CUSTOM_RES_CLASS']
 
 - name: update custom resource class
   PUT: /resource_classes/$ENVIRON['CUSTOM_RES_CLASS']