ef5aa8a818
This patch sets the stage for modifying the behavior of nova show which currently gives a 500 when the cell in which the instance lives is down. The new behavior will return a partial construct consisting of uuid, project_id, created_at from instance_mappings table and user_id, flavor, image_ref and availability_zone info from request_specs table. Note that the rest of the keys will be missing. This behavior will be enabled by passing a new enough microversion, handling for which is introduced later in this series. Related to blueprint handling-down-cell Change-Id: Iaea1cb4ed93bb98f451de4f993106d7891ca3682
194 lines
7.2 KiB
Python
194 lines
7.2 KiB
Python
# Copyright 2011 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
|
|
import webob
|
|
|
|
from nova.api.openstack.compute import multinic as multinic_v21
|
|
from nova import compute
|
|
from nova import exception
|
|
from nova import objects
|
|
from nova import test
|
|
from nova.tests.unit.api.openstack import fakes
|
|
|
|
|
|
UUID = '70f6db34-de8d-4fbd-aafb-4065bdfa6114'
|
|
last_add_fixed_ip = (None, None)
|
|
last_remove_fixed_ip = (None, None)
|
|
|
|
|
|
def compute_api_add_fixed_ip(self, context, instance, network_id):
|
|
global last_add_fixed_ip
|
|
|
|
last_add_fixed_ip = (instance['uuid'], network_id)
|
|
|
|
|
|
def compute_api_remove_fixed_ip(self, context, instance, address):
|
|
global last_remove_fixed_ip
|
|
|
|
last_remove_fixed_ip = (instance['uuid'], address)
|
|
|
|
|
|
def compute_api_get(self, context, instance_id, expected_attrs=None,
|
|
cell_down_support=False):
|
|
instance = objects.Instance()
|
|
instance.uuid = instance_id
|
|
instance.id = 1
|
|
instance.vm_state = 'fake'
|
|
instance.task_state = 'fake'
|
|
instance.obj_reset_changes()
|
|
return instance
|
|
|
|
|
|
class FixedIpTestV21(test.NoDBTestCase):
|
|
controller_class = multinic_v21
|
|
validation_error = exception.ValidationError
|
|
|
|
def setUp(self):
|
|
super(FixedIpTestV21, self).setUp()
|
|
fakes.stub_out_networking(self)
|
|
self.stub_out('nova.compute.api.API.add_fixed_ip',
|
|
compute_api_add_fixed_ip)
|
|
self.stub_out('nova.compute.api.API.remove_fixed_ip',
|
|
compute_api_remove_fixed_ip)
|
|
self.stub_out('nova.compute.api.API.get', compute_api_get)
|
|
self.controller = self.controller_class.MultinicController()
|
|
self.fake_req = fakes.HTTPRequest.blank('')
|
|
|
|
def test_add_fixed_ip(self):
|
|
global last_add_fixed_ip
|
|
last_add_fixed_ip = (None, None)
|
|
|
|
body = dict(addFixedIp=dict(networkId='test_net'))
|
|
self.controller._add_fixed_ip(self.fake_req, UUID, body=body)
|
|
self.assertEqual(last_add_fixed_ip, (UUID, 'test_net'))
|
|
|
|
def _test_add_fixed_ip_bad_request(self, body):
|
|
self.assertRaises(self.validation_error,
|
|
self.controller._add_fixed_ip,
|
|
self.fake_req,
|
|
UUID, body=body)
|
|
|
|
def test_add_fixed_ip_empty_network_id(self):
|
|
body = {'addFixedIp': {'network_id': ''}}
|
|
self._test_add_fixed_ip_bad_request(body)
|
|
|
|
def test_add_fixed_ip_network_id_bigger_than_36(self):
|
|
body = {'addFixedIp': {'network_id': 'a' * 37}}
|
|
self._test_add_fixed_ip_bad_request(body)
|
|
|
|
def test_add_fixed_ip_no_network(self):
|
|
global last_add_fixed_ip
|
|
last_add_fixed_ip = (None, None)
|
|
|
|
body = dict(addFixedIp=dict())
|
|
self._test_add_fixed_ip_bad_request(body)
|
|
self.assertEqual(last_add_fixed_ip, (None, None))
|
|
|
|
@mock.patch.object(compute.api.API, 'add_fixed_ip')
|
|
def test_add_fixed_ip_no_more_ips_available(self, mock_add_fixed_ip):
|
|
mock_add_fixed_ip.side_effect = exception.NoMoreFixedIps(net='netid')
|
|
|
|
body = dict(addFixedIp=dict(networkId='test_net'))
|
|
self.assertRaises(webob.exc.HTTPBadRequest,
|
|
self.controller._add_fixed_ip,
|
|
self.fake_req,
|
|
UUID, body=body)
|
|
|
|
def test_remove_fixed_ip(self):
|
|
global last_remove_fixed_ip
|
|
last_remove_fixed_ip = (None, None)
|
|
|
|
body = dict(removeFixedIp=dict(address='10.10.10.1'))
|
|
self.controller._remove_fixed_ip(self.fake_req, UUID, body=body)
|
|
self.assertEqual(last_remove_fixed_ip, (UUID, '10.10.10.1'))
|
|
|
|
def test_remove_fixed_ip_no_address(self):
|
|
global last_remove_fixed_ip
|
|
last_remove_fixed_ip = (None, None)
|
|
|
|
body = dict(removeFixedIp=dict())
|
|
self.assertRaises(self.validation_error,
|
|
self.controller._remove_fixed_ip,
|
|
self.fake_req,
|
|
UUID, body=body)
|
|
self.assertEqual(last_remove_fixed_ip, (None, None))
|
|
|
|
def test_remove_fixed_ip_invalid_address(self):
|
|
body = {'removeFixedIp': {'address': ''}}
|
|
self.assertRaises(self.validation_error,
|
|
self.controller._remove_fixed_ip,
|
|
self.fake_req,
|
|
UUID, body=body)
|
|
|
|
@mock.patch.object(compute.api.API, 'remove_fixed_ip',
|
|
side_effect=exception.FixedIpNotFoundForSpecificInstance(
|
|
instance_uuid=UUID, ip='10.10.10.1'))
|
|
def test_remove_fixed_ip_not_found(self, _remove_fixed_ip):
|
|
|
|
body = {'removeFixedIp': {'address': '10.10.10.1'}}
|
|
self.assertRaises(webob.exc.HTTPBadRequest,
|
|
self.controller._remove_fixed_ip,
|
|
self.fake_req,
|
|
UUID, body=body)
|
|
|
|
|
|
class MultinicPolicyEnforcementV21(test.NoDBTestCase):
|
|
|
|
def setUp(self):
|
|
super(MultinicPolicyEnforcementV21, self).setUp()
|
|
self.controller = multinic_v21.MultinicController()
|
|
self.req = fakes.HTTPRequest.blank('')
|
|
|
|
def test_add_fixed_ip_policy_failed(self):
|
|
rule_name = "os_compute_api:os-multinic"
|
|
self.policy.set_rules({rule_name: "project:non_fake"})
|
|
exc = self.assertRaises(
|
|
exception.PolicyNotAuthorized,
|
|
self.controller._add_fixed_ip, self.req, fakes.FAKE_UUID,
|
|
body={'addFixedIp': {'networkId': fakes.FAKE_UUID}})
|
|
self.assertEqual(
|
|
"Policy doesn't allow %s to be performed." % rule_name,
|
|
exc.format_message())
|
|
|
|
def test_remove_fixed_ip_policy_failed(self):
|
|
rule_name = "os_compute_api:os-multinic"
|
|
self.policy.set_rules({rule_name: "project:non_fake"})
|
|
exc = self.assertRaises(
|
|
exception.PolicyNotAuthorized,
|
|
self.controller._remove_fixed_ip, self.req, fakes.FAKE_UUID,
|
|
body={'removeFixedIp': {'address': "10.0.0.1"}})
|
|
self.assertEqual(
|
|
"Policy doesn't allow %s to be performed." % rule_name,
|
|
exc.format_message())
|
|
|
|
|
|
class MultinicAPIDeprecationTest(test.NoDBTestCase):
|
|
|
|
def setUp(self):
|
|
super(MultinicAPIDeprecationTest, self).setUp()
|
|
self.controller = multinic_v21.MultinicController()
|
|
self.req = fakes.HTTPRequest.blank('', version='2.44')
|
|
|
|
def test_add_fixed_ip_not_found(self):
|
|
body = dict(addFixedIp=dict(networkId='test_net'))
|
|
self.assertRaises(exception.VersionNotFoundForAPIMethod,
|
|
self.controller._add_fixed_ip, self.req, UUID, body=body)
|
|
|
|
def test_remove_fixed_ip__not_found(self):
|
|
body = dict(removeFixedIp=dict(address='10.10.10.1'))
|
|
self.assertRaises(exception.VersionNotFoundForAPIMethod,
|
|
self.controller._remove_fixed_ip, self.req, UUID, body=body)
|