Merge lp:~cloudbuilders/nova/os-admin-flavors into lp:~hudson-openstack/nova/trunk

[Jake Dahn]

Unmerged revisions

1473. By Jake Dahn on 2011-08-22

removing the ability to purge (hard delete) flavors, it is really not necessary.

1472. By Jake Dahn on 2011-08-20

adding admin flavors to extension test

1471. By Anthony Young on 2011-08-20

make tests pass

1470. By Jake Dahn on 2011-08-20

adding another test

1469. By Jake Dahn on 2011-08-20

pep8 fixes

1468. By Jake Dahn on 2011-08-20

adding admin api extension for adding and creating flavors, and WIP tests

=== added file 'nova/api/openstack/contrib/admin_flavors.py'
--- nova/api/openstack/contrib/admin_flavors.py	1970-01-01 00:00:00 +0000
+++ nova/api/openstack/contrib/admin_flavors.py	2011-08-22 18:39:25 +0000
@@ -0,0 +1,103 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import urlparse
+import webob
+
+from nova import exception
+from nova.compute import instance_types
+from nova.api.openstack import extensions
+from nova.api.openstack import views
+from webob import exc
+
+
+class AdminFlavorsController(object):
+
+    def create(self, req, body):
+        """ Create Flavor """
+
+        name = body['flavor'].get('name')
+        memory_mb = body['flavor'].get('memory_mb')
+        vcpus = body['flavor'].get('vcpus')
+        local_gb = body['flavor'].get('local_gb')
+        flavorid = body['flavor'].get('flavorid')
+        swap = body['flavor'].get('swap')
+        rxtx_quota = body['flavor'].get('rxtx_quota')
+        rxtx_cap = body['flavor'].get('rxtx_cap')
+
+        try:
+            flavor = instance_types.create(name, memory_mb, vcpus,
+                                       local_gb, flavorid,
+                                       swap, rxtx_quota, rxtx_cap)
+            builder = self._get_view_builder(req)
+            values = builder.build(body['flavor'], is_detail=True)
+            return dict(flavor=values)
+        except exception.AdminRequired:
+            return webob.Response(status_int=403)
+
+    def delete(self, req, id):
+        flavor = instance_types.get_instance_type_by_flavor_id(id)
+        instasnce_types.destroy(flavor['name'])
+
+        return exc.HTTPAccepted()
+
+    def _get_view_builder(self, req):
+
+        class ViewBuilder(views.flavors.ViewBuilderV11):
+
+            def __init__(self, base_url):
+                self.base_url = base_url
+
+            def _build_simple(self, flavor_obj):
+                simple = {
+                    "id": flavor_obj["flavorid"],
+                    "name": flavor_obj["name"],
+                    "ram": flavor_obj["memory_mb"],
+                    "disk": flavor_obj["local_gb"],
+                    "vcpus": flavor_obj["vcpus"],
+                }
+                return simple
+
+        base_url = req.application_url
+        return ViewBuilder(base_url)
+
+
+class Admin_flavors(extensions.ExtensionDescriptor):
+
+    def get_name(self):
+        return "Admin_flavors"
+
+    def get_alias(self):
+        return "os-admin-flavors"
+
+    def get_description(self):
+        return "Flavors management for admins"
+
+    def get_namespace(self):
+        return "http://docs.openstack.org/ext/os-flavors-admin/api/v1.1"
+
+    def get_updated(self):
+        return "2011-08-08T00:00:00+00:00"
+
+    def get_resources(self):
+        resources = []
+
+        res = extensions.ResourceExtension('os-admin-flavors',
+                                            AdminFlavorsController())
+        resources.append(res)
+
+        return resources

=== added file 'nova/tests/api/openstack/contrib/test_admin_flavors.py'
--- nova/tests/api/openstack/contrib/test_admin_flavors.py	1970-01-01 00:00:00 +0000
+++ nova/tests/api/openstack/contrib/test_admin_flavors.py	2011-08-22 18:39:25 +0000
@@ -0,0 +1,101 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import json
+import webob
+
+from nova import context
+from nova import test
+from nova.compute import instance_types
+from nova.tests.api.openstack import fakes
+from webob import exc
+
+from nova.api.openstack.contrib.admin_flavors import AdminFlavorsController
+
+
+def stub_flavor(flavor_id):
+    return {'flavor': {'name': flavor_id, 'memory_mb': 512, 'vcpus': 2,
+                       'local_gb': 1, 'flavorid': 23, 'swap': 0,
+                       'rxtx_quota': 0, 'rxtx_cap': 0}}
+
+
+def get_instance_type_by_flavor_id(instance_type_id):
+    return {'rxtx_quota': 0, 'local_gb': 20, 'name': 'm1.small',
+            'deleted': False, 'created_at': None, 'updated_at': None,
+            'memory_mb': 2048, 'vcpus': 1, 'rxtx_cap': 0,
+            'flavorid': 23, 'swap': 0, 'extra_specs': {},
+            'deleted_at': None, 'id': 5}
+
+
+def purge_instance_type(instance_type_id):
+    pass
+
+
+def destroy_instance_type(instance_type_id):
+    pass
+
+
+class AdminFlavorTest(test.TestCase):
+
+    def setUp(self):
+        super(AdminFlavorTest, self).setUp()
+        self.controller = AdminFlavorsController()
+        self.admin_context = context.RequestContext('admin',
+                                                    'admin',
+                                                    is_admin=True)
+        self.stubs.Set(instance_types, "destroy", destroy_instance_type)
+        self.stubs.Set(instance_types, "purge", purge_instance_type)
+        self.stubs.Set(instance_types, "get_instance_type_by_flavor_id",
+                       get_instance_type_by_flavor_id)
+
+    def test_create_flavor(self):
+        expected = {'flavor': {'name': 'test_flavor',
+                    'links': [
+                        {'href': 'http://localhost/v1.1/flavors/23',
+                         'rel': 'self'},
+                        {'href': 'http://localhost/flavors/23',
+                         'rel': 'bookmark'}],
+                    'ram': 512,
+                    'vcpus': 2,
+                    'disk': 1,
+                    'id': 23}}
+
+        req = webob.Request.blank('/v1.1/os-admin-flavors')
+        req.method = 'POST'
+        req.body = json.dumps(stub_flavor('test_flavor'))
+        req.headers['Content-Type'] = 'application/json'
+        res = req.get_response(fakes.wsgi_app(
+                               fake_auth_context=self.admin_context))
+
+        self.assertEqual(res.status_int, 200)
+        self.assertEqual(json.loads(res.body), expected)
+
+    def test_delete_flavor_by_purge(self):
+        req = webob.Request.blank('/v1.1/os-admin-flavors/23?purge=True')
+        req.method = 'DELETE'
+        req.headers['Content-Type'] = 'application/json'
+        res = req.get_response(fakes.wsgi_app(
+                               fake_auth_context=self.admin_context))
+        self.assertEqual(res.status_int, 202)
+
+    def test_delete_flavor_by_destroy(self):
+        req = webob.Request.blank('/v1.1/os-admin-flavors/23')
+        req.method = 'DELETE'
+        req.headers['Content-Type'] = 'application/json'
+        res = req.get_response(fakes.wsgi_app(
+                               fake_auth_context=self.admin_context))
+        self.assertEqual(res.status_int, 202)

=== modified file 'nova/tests/api/openstack/test_extensions.py'
--- nova/tests/api/openstack/test_extensions.py	2011-08-19 01:22:24 +0000
+++ nova/tests/api/openstack/test_extensions.py	2011-08-22 18:39:25 +0000
@@ -85,6 +85,7 @@
         ext_path = os.path.join(os.path.dirname(__file__), "extensions")
         self.flags(osapi_extensions_path=ext_path)
         self.ext_list = [
+            "Admin_flavors",
             "FlavorExtraSpecs",
             "Floating_ips",
             "Fox In Socks",