]> xenbits.xensource.com Git - osstest/openstack-nova.git/commitdiff
Remove AdminRequired usage in flavor
authorjichenjc <jichenjc@cn.ibm.com>
Sun, 27 Nov 2016 20:10:32 +0000 (04:10 +0800)
committerjichenjc <jichenjc@cn.ibm.com>
Mon, 28 Nov 2016 13:03:44 +0000 (21:03 +0800)
'AdminRequired' become useless due to the wrok about removing
DB layer hardcode permission check since
https://review.openstack.org/#/c/160269/

we won't raise this kind of exception so no need to catch them
now.

Change-Id: Iab9c24d39b6b63dcaa4cb2aef750196650ff18f5

nova/api/openstack/compute/flavor_access.py

index dc8bf2ef86e4d5c806ee5a39bbafb4bf14e2793d..aa8c0f053aac924dd4e08d6a3e874c133f4e3452 100644 (file)
@@ -111,8 +111,6 @@ class FlavorActionController(wsgi.Controller):
             raise webob.exc.HTTPNotFound(explanation=e.format_message())
         except exception.FlavorAccessExists as err:
             raise webob.exc.HTTPConflict(explanation=err.format_message())
-        except exception.AdminRequired as e:
-            raise webob.exc.HTTPForbidden(explanation=e.format_message())
         return _marshall_flavor_access(flavor)
 
     @extensions.expected_errors((400, 403, 404))
@@ -132,8 +130,6 @@ class FlavorActionController(wsgi.Controller):
         except (exception.FlavorAccessNotFound,
                 exception.FlavorNotFound) as e:
             raise webob.exc.HTTPNotFound(explanation=e.format_message())
-        except exception.AdminRequired as e:
-            raise webob.exc.HTTPForbidden(explanation=e.format_message())
         return _marshall_flavor_access(flavor)