Port config drive API to v3 Part 1
This changeset only copies the v2 files (implementation and test) into the appropriate v3 directories unchanged. The copy as-is will not be loaded by either the v2 or v3 extension loaders. The second changeset will then make the changes required for it to work as a v3 extension. This is being done in order to make reviewing of extension porting easier as gerrit will display only what is actually changed for v3 rather than entirely new files Partially implements blueprint nova-v3-api Change-Id: I9a4b31ef06bbf05c25b4a5e96f5cee2ce4d80d2f
This commit is contained in:
		
							
								
								
									
										84
									
								
								nova/api/openstack/compute/plugins/v3/config_drive.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										84
									
								
								nova/api/openstack/compute/plugins/v3/config_drive.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,84 @@
 | 
			
		||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
 | 
			
		||||
 | 
			
		||||
# Copyright 2012 OpenStack Foundation
 | 
			
		||||
# 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.
 | 
			
		||||
 | 
			
		||||
"""Config Drive extension."""
 | 
			
		||||
 | 
			
		||||
from nova.api.openstack.compute import servers
 | 
			
		||||
from nova.api.openstack import extensions
 | 
			
		||||
from nova.api.openstack import wsgi
 | 
			
		||||
from nova.api.openstack import xmlutil
 | 
			
		||||
 | 
			
		||||
authorize = extensions.soft_extension_authorizer('compute', 'config_drive')
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ServerConfigDriveTemplate(xmlutil.TemplateBuilder):
 | 
			
		||||
    def construct(self):
 | 
			
		||||
        root = xmlutil.TemplateElement('server')
 | 
			
		||||
        root.set('config_drive', 'config_drive')
 | 
			
		||||
        return xmlutil.SlaveTemplate(root, 1)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ServersConfigDriveTemplate(xmlutil.TemplateBuilder):
 | 
			
		||||
    def construct(self):
 | 
			
		||||
        root = xmlutil.TemplateElement('servers')
 | 
			
		||||
        elem = xmlutil.SubTemplateElement(root, 'server', selector='servers')
 | 
			
		||||
        elem.set('config_drive', 'config_drive')
 | 
			
		||||
        return xmlutil.SlaveTemplate(root, 1)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Controller(servers.Controller):
 | 
			
		||||
 | 
			
		||||
    def _add_config_drive(self, req, servers):
 | 
			
		||||
        for server in servers:
 | 
			
		||||
            db_server = req.get_db_instance(server['id'])
 | 
			
		||||
            # server['id'] is guaranteed to be in the cache due to
 | 
			
		||||
            # the core API adding it in its 'show'/'detail' methods.
 | 
			
		||||
            server['config_drive'] = db_server['config_drive']
 | 
			
		||||
 | 
			
		||||
    def _show(self, req, resp_obj):
 | 
			
		||||
        if 'server' in resp_obj.obj:
 | 
			
		||||
            resp_obj.attach(xml=ServerConfigDriveTemplate())
 | 
			
		||||
            server = resp_obj.obj['server']
 | 
			
		||||
            self._add_config_drive(req, [server])
 | 
			
		||||
 | 
			
		||||
    @wsgi.extends
 | 
			
		||||
    def show(self, req, resp_obj, id):
 | 
			
		||||
        context = req.environ['nova.context']
 | 
			
		||||
        if authorize(context):
 | 
			
		||||
            self._show(req, resp_obj)
 | 
			
		||||
 | 
			
		||||
    @wsgi.extends
 | 
			
		||||
    def detail(self, req, resp_obj):
 | 
			
		||||
        context = req.environ['nova.context']
 | 
			
		||||
        if 'servers' in resp_obj.obj and authorize(context):
 | 
			
		||||
            resp_obj.attach(xml=ServersConfigDriveTemplate())
 | 
			
		||||
            servers = resp_obj.obj['servers']
 | 
			
		||||
            self._add_config_drive(req, servers)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class Config_drive(extensions.ExtensionDescriptor):
 | 
			
		||||
    """Config Drive Extension."""
 | 
			
		||||
 | 
			
		||||
    name = "ConfigDrive"
 | 
			
		||||
    alias = "os-config-drive"
 | 
			
		||||
    namespace = "http://docs.openstack.org/compute/ext/config_drive/api/v1.1"
 | 
			
		||||
    updated = "2012-07-16T00:00:00+00:00"
 | 
			
		||||
 | 
			
		||||
    def get_controller_extensions(self):
 | 
			
		||||
        controller = Controller(self.ext_mgr)
 | 
			
		||||
        extension = extensions.ControllerExtension(self, 'servers', controller)
 | 
			
		||||
        return [extension]
 | 
			
		||||
@@ -0,0 +1,57 @@
 | 
			
		||||
# Copyright 2012 OpenStack Foundation
 | 
			
		||||
# 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 webob
 | 
			
		||||
 | 
			
		||||
from nova.api.openstack.compute.contrib import config_drive
 | 
			
		||||
from nova import db
 | 
			
		||||
from nova.openstack.common import jsonutils
 | 
			
		||||
from nova import test
 | 
			
		||||
from nova.tests.api.openstack import fakes
 | 
			
		||||
import nova.tests.image.fake
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ConfigDriveTest(test.TestCase):
 | 
			
		||||
 | 
			
		||||
    def setUp(self):
 | 
			
		||||
        super(ConfigDriveTest, self).setUp()
 | 
			
		||||
        self.Controller = config_drive.Controller()
 | 
			
		||||
        fakes.stub_out_networking(self.stubs)
 | 
			
		||||
        fakes.stub_out_rate_limiting(self.stubs)
 | 
			
		||||
        nova.tests.image.fake.stub_out_image_service(self.stubs)
 | 
			
		||||
        self.flags(
 | 
			
		||||
            osapi_compute_extension=[
 | 
			
		||||
                'nova.api.openstack.compute.contrib.select_extensions'],
 | 
			
		||||
            osapi_compute_ext_list=['Config_drive'])
 | 
			
		||||
 | 
			
		||||
    def test_show(self):
 | 
			
		||||
        self.stubs.Set(db, 'instance_get',
 | 
			
		||||
                        fakes.fake_instance_get())
 | 
			
		||||
        req = webob.Request.blank('/v2/fake/servers/1')
 | 
			
		||||
        req.headers['Content-Type'] = 'application/json'
 | 
			
		||||
        response = req.get_response(fakes.wsgi_app(init_only=('servers',)))
 | 
			
		||||
        self.assertEquals(response.status_int, 200)
 | 
			
		||||
        res_dict = jsonutils.loads(response.body)
 | 
			
		||||
        self.assertTrue('config_drive' in res_dict['server'])
 | 
			
		||||
 | 
			
		||||
    def test_detail_servers(self):
 | 
			
		||||
        self.stubs.Set(db, 'instance_get_all_by_filters',
 | 
			
		||||
                       fakes.fake_instance_get_all_by_filters())
 | 
			
		||||
        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail')
 | 
			
		||||
        res = req.get_response(fakes.wsgi_app(init_only=('servers,')))
 | 
			
		||||
        server_dicts = jsonutils.loads(res.body)['servers']
 | 
			
		||||
        self.assertNotEqual(len(server_dicts), 0)
 | 
			
		||||
        for server_dict in server_dicts:
 | 
			
		||||
            self.assertTrue('config_drive' in server_dict)
 | 
			
		||||
		Reference in New Issue
	
	Block a user