1 files changed, 0 insertions, 587 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_consoles.py b/nova/tests/api/openstack/compute/contrib/test_consoles.py
deleted file mode 100644
index 1faff0d78c..0000000000
--- a/nova/tests/api/openstack/compute/contrib/test_consoles.py
+++ /dev/null
@@ -1,587 +0,0 @@
-# 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 mock
-from oslo.serialization import jsonutils
-import webob
-
-from nova.compute import api as compute_api
-from nova import exception
-from nova import test
-from nova.tests.api.openstack import fakes
-
-
-def fake_get_vnc_console(self, _context, _instance, _console_type):
-    return {'url': 'http://fake'}
-
-
-def fake_get_spice_console(self, _context, _instance, _console_type):
-    return {'url': 'http://fake'}
-
-
-def fake_get_rdp_console(self, _context, _instance, _console_type):
-    return {'url': 'http://fake'}
-
-
-def fake_get_serial_console(self, _context, _instance, _console_type):
-    return {'url': 'http://fake'}
-
-
-def fake_get_vnc_console_invalid_type(self, _context,
-                                      _instance, _console_type):
-    raise exception.ConsoleTypeInvalid(console_type=_console_type)
-
-
-def fake_get_spice_console_invalid_type(self, _context,
-                                      _instance, _console_type):
-    raise exception.ConsoleTypeInvalid(console_type=_console_type)
-
-
-def fake_get_rdp_console_invalid_type(self, _context,
-                                      _instance, _console_type):
-    raise exception.ConsoleTypeInvalid(console_type=_console_type)
-
-
-def fake_get_vnc_console_type_unavailable(self, _context,
-                                          _instance, _console_type):
-    raise exception.ConsoleTypeUnavailable(console_type=_console_type)
-
-
-def fake_get_spice_console_type_unavailable(self, _context,
-                                            _instance, _console_type):
-    raise exception.ConsoleTypeUnavailable(console_type=_console_type)
-
-
-def fake_get_rdp_console_type_unavailable(self, _context,
-                                            _instance, _console_type):
-    raise exception.ConsoleTypeUnavailable(console_type=_console_type)
-
-
-def fake_get_vnc_console_not_ready(self, _context, instance, _console_type):
-    raise exception.InstanceNotReady(instance_id=instance["uuid"])
-
-
-def fake_get_spice_console_not_ready(self, _context, instance, _console_type):
-    raise exception.InstanceNotReady(instance_id=instance["uuid"])
-
-
-def fake_get_rdp_console_not_ready(self, _context, instance, _console_type):
-    raise exception.InstanceNotReady(instance_id=instance["uuid"])
-
-
-def fake_get_vnc_console_not_found(self, _context, instance, _console_type):
-    raise exception.InstanceNotFound(instance_id=instance["uuid"])
-
-
-def fake_get_spice_console_not_found(self, _context, instance, _console_type):
-    raise exception.InstanceNotFound(instance_id=instance["uuid"])
-
-
-def fake_get_rdp_console_not_found(self, _context, instance, _console_type):
-    raise exception.InstanceNotFound(instance_id=instance["uuid"])
-
-
-def fake_get(self, context, instance_uuid, want_objects=False,
-             expected_attrs=None):
-    return {'uuid': instance_uuid}
-
-
-def fake_get_not_found(self, context, instance_uuid, want_objects=False,
-                       expected_attrs=None):
-    raise exception.InstanceNotFound(instance_id=instance_uuid)
-
-
-class ConsolesExtensionTestV21(test.NoDBTestCase):
-    url = '/v2/fake/servers/1/action'
-
-    def _setup_wsgi(self):
-        self.app = fakes.wsgi_app_v21(init_only=('servers',
-                                                 'os-remote-consoles'))
-
-    def setUp(self):
-        super(ConsolesExtensionTestV21, self).setUp()
-        self.stubs.Set(compute_api.API, 'get_vnc_console',
-                       fake_get_vnc_console)
-        self.stubs.Set(compute_api.API, 'get_spice_console',
-                       fake_get_spice_console)
-        self.stubs.Set(compute_api.API, 'get_rdp_console',
-                       fake_get_rdp_console)
-        self.stubs.Set(compute_api.API, 'get_serial_console',
-                       fake_get_serial_console)
-        self.stubs.Set(compute_api.API, 'get', fake_get)
-        self._setup_wsgi()
-
-    def test_get_vnc_console(self):
-        body = {'os-getVNCConsole': {'type': 'novnc'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        output = jsonutils.loads(res.body)
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(output,
-            {u'console': {u'url': u'http://fake', u'type': u'novnc'}})
-
-    def test_get_vnc_console_not_ready(self):
-        self.stubs.Set(compute_api.API, 'get_vnc_console',
-                       fake_get_vnc_console_not_ready)
-        body = {'os-getVNCConsole': {'type': 'novnc'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        jsonutils.loads(res.body)
-        self.assertEqual(res.status_int, 409)
-
-    def test_get_vnc_console_no_type(self):
-        self.stubs.Set(compute_api.API, 'get_vnc_console',
-                       fake_get_vnc_console_invalid_type)
-        body = {'os-getVNCConsole': {}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-
-    def test_get_vnc_console_no_instance(self):
-        self.stubs.Set(compute_api.API, 'get', fake_get_not_found)
-        body = {'os-getVNCConsole': {'type': 'novnc'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 404)
-
-    def test_get_vnc_console_no_instance_on_console_get(self):
-        self.stubs.Set(compute_api.API, 'get_vnc_console',
-                       fake_get_vnc_console_not_found)
-        body = {'os-getVNCConsole': {'type': 'novnc'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 404)
-
-    def test_get_vnc_console_invalid_type(self):
-        body = {'os-getVNCConsole': {'type': 'invalid'}}
-        self.stubs.Set(compute_api.API, 'get_vnc_console',
-                       fake_get_vnc_console_invalid_type)
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-
-    def test_get_vnc_console_type_unavailable(self):
-        body = {'os-getVNCConsole': {'type': 'unavailable'}}
-        self.stubs.Set(compute_api.API, 'get_vnc_console',
-                       fake_get_vnc_console_type_unavailable)
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(400, res.status_int)
-
-    def test_get_vnc_console_not_implemented(self):
-        self.stubs.Set(compute_api.API, 'get_vnc_console',
-                       fakes.fake_not_implemented)
-
-        body = {'os-getVNCConsole': {'type': 'novnc'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 501)
-
-    def test_get_spice_console(self):
-        body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        output = jsonutils.loads(res.body)
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(output,
-            {u'console': {u'url': u'http://fake', u'type': u'spice-html5'}})
-
-    def test_get_spice_console_not_ready(self):
-        self.stubs.Set(compute_api.API, 'get_spice_console',
-                       fake_get_spice_console_not_ready)
-        body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        jsonutils.loads(res.body)
-        self.assertEqual(res.status_int, 409)
-
-    def test_get_spice_console_no_type(self):
-        self.stubs.Set(compute_api.API, 'get_spice_console',
-                       fake_get_spice_console_invalid_type)
-        body = {'os-getSPICEConsole': {}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-
-    def test_get_spice_console_no_instance(self):
-        self.stubs.Set(compute_api.API, 'get', fake_get_not_found)
-        body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 404)
-
-    def test_get_spice_console_no_instance_on_console_get(self):
-        self.stubs.Set(compute_api.API, 'get_spice_console',
-                       fake_get_spice_console_not_found)
-        body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 404)
-
-    def test_get_spice_console_invalid_type(self):
-        body = {'os-getSPICEConsole': {'type': 'invalid'}}
-        self.stubs.Set(compute_api.API, 'get_spice_console',
-                       fake_get_spice_console_invalid_type)
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-
-    def test_get_spice_console_not_implemented(self):
-        body = {'os-getSPICEConsole': {'type': 'spice-html5'}}
-        self.stubs.Set(compute_api.API, 'get_spice_console',
-                       fakes.fake_not_implemented)
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 501)
-
-    def test_get_spice_console_type_unavailable(self):
-        body = {'os-getSPICEConsole': {'type': 'unavailable'}}
-        self.stubs.Set(compute_api.API, 'get_spice_console',
-                       fake_get_spice_console_type_unavailable)
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(400, res.status_int)
-
-    def test_get_rdp_console(self):
-        body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        output = jsonutils.loads(res.body)
-        self.assertEqual(res.status_int, 200)
-        self.assertEqual(output,
-            {u'console': {u'url': u'http://fake', u'type': u'rdp-html5'}})
-
-    def test_get_rdp_console_not_ready(self):
-        self.stubs.Set(compute_api.API, 'get_rdp_console',
-                       fake_get_rdp_console_not_ready)
-        body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        jsonutils.loads(res.body)
-        self.assertEqual(res.status_int, 409)
-
-    def test_get_rdp_console_no_type(self):
-        self.stubs.Set(compute_api.API, 'get_rdp_console',
-                       fake_get_rdp_console_invalid_type)
-        body = {'os-getRDPConsole': {}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-
-    def test_get_rdp_console_no_instance(self):
-        self.stubs.Set(compute_api.API, 'get', fake_get_not_found)
-        body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 404)
-
-    def test_get_rdp_console_no_instance_on_console_get(self):
-        self.stubs.Set(compute_api.API, 'get_rdp_console',
-                       fake_get_rdp_console_not_found)
-        body = {'os-getRDPConsole': {'type': 'rdp-html5'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 404)
-
-    def test_get_rdp_console_invalid_type(self):
-        body = {'os-getRDPConsole': {'type': 'invalid'}}
-        self.stubs.Set(compute_api.API, 'get_rdp_console',
-                       fake_get_rdp_console_invalid_type)
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-
-    def test_get_rdp_console_type_unavailable(self):
-        body = {'os-getRDPConsole': {'type': 'unavailable'}}
-        self.stubs.Set(compute_api.API, 'get_rdp_console',
-                       fake_get_rdp_console_type_unavailable)
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(400, res.status_int)
-
-    def test_get_vnc_console_with_undefined_param(self):
-        body = {'os-getVNCConsole': {'type': 'novnc', 'undefined': 'foo'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-        res = req.get_response(self.app)
-        self.assertEqual(400, res.status_int)
-
-    def test_get_spice_console_with_undefined_param(self):
-        body = {'os-getSPICEConsole': {'type': 'spice-html5',
-                                      'undefined': 'foo'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-        res = req.get_response(self.app)
-        self.assertEqual(400, res.status_int)
-
-    def test_get_rdp_console_with_undefined_param(self):
-        body = {'os-getRDPConsole': {'type': 'rdp-html5', 'undefined': 'foo'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-        res = req.get_response(self.app)
-        self.assertEqual(400, res.status_int)
-
-
-class ConsolesExtensionTestV2(ConsolesExtensionTestV21):
-
-    def _setup_wsgi(self):
-        self.flags(
-            osapi_compute_extension=[
-                'nova.api.openstack.compute.contrib.select_extensions'],
-            osapi_compute_ext_list=['Consoles'])
-        self.app = fakes.wsgi_app(init_only=('servers',))
-
-    def test_get_vnc_console_with_undefined_param(self):
-        pass
-
-    def test_get_spice_console_with_undefined_param(self):
-        pass
-
-    def test_get_rdp_console_with_undefined_param(self):
-        pass
-
-    def test_get_serial_console(self):
-        body = {'os-getSerialConsole': {'type': 'serial'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        output = jsonutils.loads(res.body)
-        self.assertEqual(200, res.status_int)
-        self.assertEqual({u'console': {u'url': u'http://fake',
-                                       u'type': u'serial'}},
-                         output)
-
-    @mock.patch.object(compute_api.API, 'get_serial_console')
-    def test_get_serial_console_not_enable(self, get_serial_console):
-        get_serial_console.side_effect = exception.ConsoleTypeUnavailable(
-            console_type="serial")
-
-        body = {'os-getSerialConsole': {'type': 'serial'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-        self.assertTrue(get_serial_console.called)
-
-    @mock.patch.object(compute_api.API, 'get_serial_console')
-    def test_get_serial_console_invalid_type(self, get_serial_console):
-        get_serial_console.side_effect = (
-            exception.ConsoleTypeInvalid(console_type='invalid'))
-
-        body = {'os-getSerialConsole': {'type': 'invalid'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-        self.assertTrue(get_serial_console.called)
-
-    @mock.patch.object(compute_api.API, 'get_serial_console')
-    def test_get_serial_console_no_type(self, get_serial_console):
-        get_serial_console.side_effect = (
-            exception.ConsoleTypeInvalid(console_type=''))
-
-        body = {'os-getSerialConsole': {}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-        self.assertTrue(get_serial_console.called)
-
-    @mock.patch.object(compute_api.API, 'get_serial_console')
-    def test_get_serial_console_no_instance(self, get_serial_console):
-        get_serial_console.side_effect = (
-            exception.InstanceNotFound(instance_id='xxx'))
-
-        body = {'os-getSerialConsole': {'type': 'serial'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 404)
-        self.assertTrue(get_serial_console.called)
-
-    @mock.patch.object(compute_api.API, 'get_serial_console')
-    def test_get_serial_console_instance_not_ready(self, get_serial_console):
-        get_serial_console.side_effect = (
-            exception.InstanceNotReady(instance_id='xxx'))
-
-        body = {'os-getSerialConsole': {'type': 'serial'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 409)
-        self.assertTrue(get_serial_console.called)
-
-    @mock.patch.object(compute_api.API, 'get_serial_console')
-    def test_get_serial_console_socket_exhausted(self, get_serial_console):
-        get_serial_console.side_effect = (
-            exception.SocketPortRangeExhaustedException(
-                host='127.0.0.1'))
-
-        body = {'os-getSerialConsole': {'type': 'serial'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 500)
-        self.assertTrue(get_serial_console.called)
-
-    @mock.patch.object(compute_api.API, 'get_serial_console')
-    def test_get_serial_console_image_nport_invalid(self, get_serial_console):
-        get_serial_console.side_effect = (
-            exception.ImageSerialPortNumberInvalid(
-                num_ports='x', property="hw_serial_port_count"))
-
-        body = {'os-getSerialConsole': {'type': 'serial'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-        self.assertTrue(get_serial_console.called)
-
-    @mock.patch.object(compute_api.API, 'get_serial_console')
-    def test_get_serial_console_image_nport_exceed(self, get_serial_console):
-        get_serial_console.side_effect = (
-            exception.ImageSerialPortNumberExceedFlavorValue())
-
-        body = {'os-getSerialConsole': {'type': 'serial'}}
-        req = webob.Request.blank(self.url)
-        req.method = "POST"
-        req.body = jsonutils.dumps(body)
-        req.headers["content-type"] = "application/json"
-
-        res = req.get_response(self.app)
-        self.assertEqual(res.status_int, 400)
-        self.assertTrue(get_serial_console.called)