6e981156c8
This change moves the check on network interface to driver_factory.py and moves node creation from API to conductor side. A new exception InterfaceNotFoundInEntrypoint (similar to DriverNotFoundInEntrypoint) was introduced for the case when invalid interface is requested either during creation or during updating. The current approach already duplicates the check in two places. With the driver composition in place it will not be quite possible: different conductors may have different interfaces enabled as long as no hardware type ends up with different interfaces on different conductors. Also when calculating the defaults, we'll need access to a real hardware type object, which may not be possible on API side. Also there is a demand for driver-side validations on creation (e.g. detecting duplicating IPMI addresses), which also requires creation to happen on conductor side. Such features, however, are out of scope for this change. A side effect of this change is that objects.Node.network_interface is now defined the same way as other interfaces (i.e. nullable string). Also added more clean ups to base unit test class, as otherwise newly added tests randomly break other tests. Change-Id: Id1da20ccd5bb50e61a82449ef3d2ffce91822d71 Partial-Bug: #1524745
198 lines
8.7 KiB
Python
198 lines
8.7 KiB
Python
# coding=utf-8
|
|
#
|
|
#
|
|
# 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 testtools import matchers
|
|
|
|
from ironic.common import context
|
|
from ironic.common import exception
|
|
from ironic import objects
|
|
from ironic.tests.unit.db import base
|
|
from ironic.tests.unit.db import utils
|
|
from ironic.tests.unit.objects import utils as obj_utils
|
|
|
|
|
|
class TestNodeObject(base.DbTestCase):
|
|
|
|
def setUp(self):
|
|
super(TestNodeObject, self).setUp()
|
|
self.ctxt = context.get_admin_context()
|
|
self.fake_node = utils.get_test_node()
|
|
self.node = obj_utils.get_test_node(self.ctxt, **self.fake_node)
|
|
|
|
def test_get_by_id(self):
|
|
node_id = self.fake_node['id']
|
|
with mock.patch.object(self.dbapi, 'get_node_by_id',
|
|
autospec=True) as mock_get_node:
|
|
mock_get_node.return_value = self.fake_node
|
|
|
|
node = objects.Node.get(self.context, node_id)
|
|
|
|
mock_get_node.assert_called_once_with(node_id)
|
|
self.assertEqual(self.context, node._context)
|
|
|
|
def test_get_by_uuid(self):
|
|
uuid = self.fake_node['uuid']
|
|
with mock.patch.object(self.dbapi, 'get_node_by_uuid',
|
|
autospec=True) as mock_get_node:
|
|
mock_get_node.return_value = self.fake_node
|
|
|
|
node = objects.Node.get(self.context, uuid)
|
|
|
|
mock_get_node.assert_called_once_with(uuid)
|
|
self.assertEqual(self.context, node._context)
|
|
|
|
def test_get_bad_id_and_uuid(self):
|
|
self.assertRaises(exception.InvalidIdentity,
|
|
objects.Node.get, self.context, 'not-a-uuid')
|
|
|
|
def test_get_by_port_addresses(self):
|
|
with mock.patch.object(self.dbapi, 'get_node_by_port_addresses',
|
|
autospec=True) as mock_get_node:
|
|
mock_get_node.return_value = self.fake_node
|
|
|
|
node = objects.Node.get_by_port_addresses(self.context,
|
|
['aa:bb:cc:dd:ee:ff'])
|
|
|
|
mock_get_node.assert_called_once_with(['aa:bb:cc:dd:ee:ff'])
|
|
self.assertEqual(self.context, node._context)
|
|
|
|
def test_save(self):
|
|
uuid = self.fake_node['uuid']
|
|
with mock.patch.object(self.dbapi, 'get_node_by_uuid',
|
|
autospec=True) as mock_get_node:
|
|
mock_get_node.return_value = self.fake_node
|
|
with mock.patch.object(self.dbapi, 'update_node',
|
|
autospec=True) as mock_update_node:
|
|
|
|
n = objects.Node.get(self.context, uuid)
|
|
self.assertEqual({"private_state": "secret value"},
|
|
n.driver_internal_info)
|
|
n.properties = {"fake": "property"}
|
|
n.driver = "fake-driver"
|
|
n.save()
|
|
|
|
mock_get_node.assert_called_once_with(uuid)
|
|
mock_update_node.assert_called_once_with(
|
|
uuid, {'properties': {"fake": "property"},
|
|
'driver': 'fake-driver',
|
|
'driver_internal_info': {}})
|
|
self.assertEqual(self.context, n._context)
|
|
self.assertEqual({}, n.driver_internal_info)
|
|
|
|
def test_refresh(self):
|
|
uuid = self.fake_node['uuid']
|
|
returns = [dict(self.fake_node, properties={"fake": "first"}),
|
|
dict(self.fake_node, properties={"fake": "second"})]
|
|
expected = [mock.call(uuid), mock.call(uuid)]
|
|
with mock.patch.object(self.dbapi, 'get_node_by_uuid',
|
|
side_effect=returns,
|
|
autospec=True) as mock_get_node:
|
|
n = objects.Node.get(self.context, uuid)
|
|
self.assertEqual({"fake": "first"}, n.properties)
|
|
n.refresh()
|
|
self.assertEqual({"fake": "second"}, n.properties)
|
|
self.assertEqual(expected, mock_get_node.call_args_list)
|
|
self.assertEqual(self.context, n._context)
|
|
|
|
def test_list(self):
|
|
with mock.patch.object(self.dbapi, 'get_node_list',
|
|
autospec=True) as mock_get_list:
|
|
mock_get_list.return_value = [self.fake_node]
|
|
nodes = objects.Node.list(self.context)
|
|
self.assertThat(nodes, matchers.HasLength(1))
|
|
self.assertIsInstance(nodes[0], objects.Node)
|
|
self.assertEqual(self.context, nodes[0]._context)
|
|
|
|
def test_reserve(self):
|
|
with mock.patch.object(self.dbapi, 'reserve_node',
|
|
autospec=True) as mock_reserve:
|
|
mock_reserve.return_value = self.fake_node
|
|
node_id = self.fake_node['id']
|
|
fake_tag = 'fake-tag'
|
|
node = objects.Node.reserve(self.context, fake_tag, node_id)
|
|
self.assertIsInstance(node, objects.Node)
|
|
mock_reserve.assert_called_once_with(fake_tag, node_id)
|
|
self.assertEqual(self.context, node._context)
|
|
|
|
def test_reserve_node_not_found(self):
|
|
with mock.patch.object(self.dbapi, 'reserve_node',
|
|
autospec=True) as mock_reserve:
|
|
node_id = 'non-existent'
|
|
mock_reserve.side_effect = exception.NodeNotFound(node=node_id)
|
|
self.assertRaises(exception.NodeNotFound,
|
|
objects.Node.reserve, self.context, 'fake-tag',
|
|
node_id)
|
|
|
|
def test_release(self):
|
|
with mock.patch.object(self.dbapi, 'release_node',
|
|
autospec=True) as mock_release:
|
|
node_id = self.fake_node['id']
|
|
fake_tag = 'fake-tag'
|
|
objects.Node.release(self.context, fake_tag, node_id)
|
|
mock_release.assert_called_once_with(fake_tag, node_id)
|
|
|
|
def test_release_node_not_found(self):
|
|
with mock.patch.object(self.dbapi, 'release_node',
|
|
autospec=True) as mock_release:
|
|
node_id = 'non-existent'
|
|
mock_release.side_effect = exception.NodeNotFound(node=node_id)
|
|
self.assertRaises(exception.NodeNotFound,
|
|
objects.Node.release, self.context,
|
|
'fake-tag', node_id)
|
|
|
|
def test_touch_provisioning(self):
|
|
with mock.patch.object(self.dbapi, 'get_node_by_uuid',
|
|
autospec=True) as mock_get_node:
|
|
mock_get_node.return_value = self.fake_node
|
|
with mock.patch.object(self.dbapi, 'touch_node_provisioning',
|
|
autospec=True) as mock_touch:
|
|
node = objects.Node.get(self.context, self.fake_node['uuid'])
|
|
node.touch_provisioning()
|
|
mock_touch.assert_called_once_with(node.id)
|
|
|
|
def test_create_with_invalid_properties(self):
|
|
node = objects.Node(self.context, **self.fake_node)
|
|
node.properties = {"local_gb": "5G"}
|
|
self.assertRaises(exception.InvalidParameterValue, node.create)
|
|
|
|
def test_update_with_invalid_properties(self):
|
|
uuid = self.fake_node['uuid']
|
|
with mock.patch.object(self.dbapi, 'get_node_by_uuid',
|
|
autospec=True) as mock_get_node:
|
|
mock_get_node.return_value = self.fake_node
|
|
node = objects.Node.get(self.context, uuid)
|
|
node.properties = {"local_gb": "5G", "memory_mb": "5",
|
|
'cpus': '-1', 'cpu_arch': 'x86_64'}
|
|
self.assertRaisesRegex(exception.InvalidParameterValue,
|
|
".*local_gb=5G, cpus=-1$", node.save)
|
|
mock_get_node.assert_called_once_with(uuid)
|
|
|
|
def test__validate_property_values_success(self):
|
|
uuid = self.fake_node['uuid']
|
|
with mock.patch.object(self.dbapi, 'get_node_by_uuid',
|
|
autospec=True) as mock_get_node:
|
|
mock_get_node.return_value = self.fake_node
|
|
node = objects.Node.get(self.context, uuid)
|
|
values = self.fake_node
|
|
expect = {
|
|
'cpu_arch': 'x86_64',
|
|
"cpus": '8',
|
|
"local_gb": '10',
|
|
"memory_mb": '4096',
|
|
}
|
|
node._validate_property_values(values['properties'])
|
|
self.assertEqual(expect, values['properties'])
|