diff options
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/__init__.py | 5 | ||||
| -rw-r--r-- | nova/api/openstack/contrib/flavorextraspecs.py (renamed from nova/api/openstack/flavor_extra_specs.py) | 33 |
2 files changed, 27 insertions, 11 deletions
diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 857a5431b..859cac669 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -178,8 +178,3 @@ class APIRouterV11(APIRouter): controller=server_metadata.create_resource(), parent_resource=dict(member_name='server', collection_name='servers')) - - mapper.resource("flavor_extra_specs", "extra", - controller=flavor_extra_specs.create_resource(), - parent_resource=dict(member_name='flavor', - collection_name='flavors')) diff --git a/nova/api/openstack/flavor_extra_specs.py b/nova/api/openstack/contrib/flavorextraspecs.py index 6a6d2f7a1..24c5da7b2 100644 --- a/nova/api/openstack/flavor_extra_specs.py +++ b/nova/api/openstack/contrib/flavorextraspecs.py @@ -15,15 +15,18 @@ # License for the specific language governing permissions and limitations # under the License. +""" The instance type extra specs extension""" + from webob import exc from nova import db from nova import quota +from nova.api.openstack import extensions from nova.api.openstack import faults from nova.api.openstack import wsgi -class Controller(object): +class FlavorExtraSpecsController(object): """ The flavor extra specs API controller for the Openstack API """ def _get_extra_specs(self, context, flavor_id): @@ -93,10 +96,28 @@ class Controller(object): raise exc.HTTPBadRequest(explanation=error.message) raise error +class Flavorextraspecs(extensions.ExtensionDescriptor): + def get_name(self): + return "FlavorExtraSpecs" + + def get_alias(self): + return "flavor-extra-specs" + + def get_description(self): + return "Instance type (flavor) extra specs" + + def get_namespace(self): + return \ + "http://docs.openstack.org/ext/flavor-extra-specs/api/v1.1" + + def get_updated(self): + return "2011-06-23T00:00:00+00:00" + + def get_resources(self): + resources = [] -def create_resource(): - serializers = { - 'application/xml': wsgi.XMLDictSerializer(xmlns=wsgi.XMLNS_V11), - } + res = extensions.ResourceExtension('flavor-extra-specs', + FlavorExtraSpecsController()) + resources.append(res) - return wsgi.Resource(Controller(), serializers=serializers) + return resources |