
Handling of provisioning images has changed on the Tuskar side; this fix brings Tukskar-UI in line with these changes. * There used to be separate images for all the deployment roles. This is no longer the case and all the roles now use the same image, 'overcloud-full'. As the result, the way the relationship between images and roles is displayed on the Provisioning Images page needs to be updated. * Related to the previous point, test data needed updating to reflect that. * Images associated with roles are now saved by name in the Tuskar plan. This fix ensures that the UI saves and retrieves images by name and not by UUID, like it used to do. Change-Id: I11b73fcaed45200dfbdb72dc3ab9a27afb67a31d
162 lines
5.6 KiB
Python
162 lines
5.6 KiB
Python
#
|
|
# 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.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
import mock
|
|
|
|
from novaclient.v2 import servers
|
|
|
|
from tuskar_ui import api
|
|
import tuskar_ui.api.node
|
|
from tuskar_ui.test import helpers as test
|
|
|
|
|
|
def mock_ironicclient(node=None, nodes=()):
|
|
return mock.patch(
|
|
'tuskar_ui.api.node.ironicclient',
|
|
return_value=mock.MagicMock(node=mock.MagicMock(**{
|
|
'create.return_value': node,
|
|
'get.return_value': node,
|
|
'get_by_instance_uuid.return_value': node,
|
|
'find.return_value': node,
|
|
'list.return_value': nodes,
|
|
'delete.return_value': None,
|
|
})),
|
|
)
|
|
|
|
|
|
class NodeAPITests(test.APITestCase):
|
|
def test_node_create(self):
|
|
node = tuskar_ui.api.node.Node(self.ironicclient_nodes.first())
|
|
|
|
with mock_ironicclient(node=node):
|
|
ret_val = api.node.Node.create(
|
|
self.request,
|
|
node.driver_info['ipmi_address'],
|
|
'i386',
|
|
node.cpus,
|
|
node.memory_mb,
|
|
node.local_gb,
|
|
['aa:aa:aa:aa:aa:aa'],
|
|
ipmi_username='admin',
|
|
ipmi_password='password')
|
|
|
|
self.assertIsInstance(ret_val, api.node.Node)
|
|
|
|
def test_node_get(self):
|
|
node = self.ironicclient_nodes.first()
|
|
instance = self.novaclient_servers.first()
|
|
|
|
with mock_ironicclient(node=node), mock.patch(
|
|
'openstack_dashboard.api.nova.server_list',
|
|
return_value=([instance], False),
|
|
), mock.patch(
|
|
'openstack_dashboard.api.nova.server_get',
|
|
return_value=instance,
|
|
):
|
|
ret_val = api.node.Node.get(self.request, node.uuid)
|
|
ret_instance = ret_val.instance
|
|
|
|
self.assertIsInstance(ret_val, api.node.Node)
|
|
self.assertIsInstance(ret_instance, servers.Server)
|
|
|
|
def test_node_get_by_instance_uuid(self):
|
|
instance = self.novaclient_servers.first()
|
|
node = self.ironicclient_nodes.first()
|
|
nodes = self.ironicclient_nodes.list()
|
|
|
|
with mock_ironicclient(
|
|
node=node,
|
|
nodes=nodes,
|
|
), mock.patch(
|
|
'openstack_dashboard.api.nova.server_get',
|
|
return_value=instance,
|
|
), mock.patch(
|
|
'openstack_dashboard.api.nova.server_list',
|
|
return_value=([instance], False),
|
|
):
|
|
ret_val = api.node.Node.get_by_instance_uuid(self.request,
|
|
node.instance_uuid)
|
|
ret_instance = ret_val.instance
|
|
self.assertIsInstance(ret_val, api.node.Node)
|
|
self.assertIsInstance(ret_instance, servers.Server)
|
|
|
|
def test_node_list(self):
|
|
instances = self.novaclient_servers.list()
|
|
node = self.ironicclient_nodes.first()
|
|
nodes = self.ironicclient_nodes.list()
|
|
|
|
with mock_ironicclient(
|
|
node=node,
|
|
nodes=nodes
|
|
), mock.patch(
|
|
'openstack_dashboard.api.nova.server_list',
|
|
return_value=(instances, None),
|
|
), mock.patch(
|
|
'openstack_dashboard.api.nova.server_get',
|
|
return_value=instances[0],
|
|
):
|
|
ret_val = api.node.Node.list(self.request)
|
|
|
|
for node in ret_val:
|
|
self.assertIsInstance(node, api.node.Node)
|
|
self.assertEqual(9, len(ret_val))
|
|
|
|
def test_node_delete(self):
|
|
node = self.ironicclient_nodes.first()
|
|
with mock_ironicclient(node=node):
|
|
api.node.Node.delete(self.request, node.uuid)
|
|
|
|
def test_node_set_maintenance(self):
|
|
node = self.ironicclient_nodes.first()
|
|
with mock_ironicclient(node=node):
|
|
api.node.Node.set_maintenance(self.request, node.uuid, False)
|
|
|
|
def test_node_set_power_state(self):
|
|
node = self.ironicclient_nodes.first()
|
|
with mock_ironicclient(node=node):
|
|
api.node.Node.set_power_state(self.request, node.uuid, 'on')
|
|
|
|
def test_node_instance(self):
|
|
node = self.ironicclient_nodes.first()
|
|
instance = self.novaclient_servers.first()
|
|
|
|
with mock.patch(
|
|
'openstack_dashboard.api.nova.server_get',
|
|
return_value=instance,
|
|
), mock.patch(
|
|
'openstack_dashboard.api.nova.server_list',
|
|
return_value=([instance], False),
|
|
):
|
|
ret_val = api.node.Node(node).instance
|
|
self.assertIsInstance(ret_val, servers.Server)
|
|
|
|
def test_node_image_name(self):
|
|
node = self.ironicclient_nodes.first()
|
|
instance = self.novaclient_servers.first()
|
|
image = self.glanceclient_images.first()
|
|
|
|
with mock.patch(
|
|
'openstack_dashboard.api.nova.server_get',
|
|
return_value=instance,
|
|
), mock.patch(
|
|
'openstack_dashboard.api.glance.image_get',
|
|
return_value=image,
|
|
), mock.patch(
|
|
'openstack_dashboard.api.nova.server_list',
|
|
return_value=([instance], False),
|
|
):
|
|
ret_val = api.node.Node(node).image_name
|
|
self.assertEqual(ret_val, 'overcloud-full')
|