openstack
/
python-tripleoclient
Code Issues Proposed changes

Remove tripleoclient.baremetal wrapper 

The Ironic client now supports the OSC plugin interface directly, so
this wrapper is no longer needed. Removing it will allow us to specify
which Ironic API version to use via the standard mechanisms.

Change-Id: If92855c307ecd389fbe6050e426d0ced959a9665
Depends-On: Icdbd28c487351af6d67205837aa536aedb31b41a
This commit is contained in:
Miles Gould 2016-01-08 15:48:31 +00:00
parent cff4ff4e38
commit 000f67a4c7
12 changed files with 57 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -10,7 +10,7 @@ passlib>=1.6
python-ironic-inspector-client>=1.3.0 python-ironic-inspector-client>=1.3.0
# os-cloud-config>=0.3.1 # os-cloud-config>=0.3.1
python-heatclient>=0.6.0 python-heatclient>=0.6.0
python-ironicclient>=0.8.0 python-ironicclient>=1.1.0 # Apache-2.0
python-openstackclient>=2.0.0 python-openstackclient>=2.0.0
six>=1.9.0 six>=1.9.0

26
tripleoclient/plugin.py
View File

@ -17,7 +17,6 @@
import logging import logging
from ironicclient import client as ironic_client
from openstackclient.common import utils from openstackclient.common import utils
@ -64,33 +63,8 @@ class ClientWrapper(object):
def __init__(self, instance): def __init__(self, instance):
self._instance = instance self._instance = instance
self._baremetal = None
self._orchestration = None self._orchestration = None
@property
def baremetal(self):
"""Returns an baremetal service client"""
# TODO(d0ugal): When the ironicclient has it's own OSC plugin, the
# following client handling code should be removed in favor of the
# upstream version.
if self._baremetal is not None:
return self._baremetal
endpoint = self._instance.get_endpoint_for_service_type(
"baremetal",
region_name=self._instance._region_name,
)
token = self._instance.auth.get_token(self._instance.session)
self._baremetal = ironic_client.get_client(
1, os_auth_token=token, ironic_url=endpoint,
ca_file=self._instance._cli_options.os_cacert)
return self._baremetal
@property @property
def orchestration(self): def orchestration(self):
"""Returns an orchestration service client""" """Returns an orchestration service client"""

15
tripleoclient/tests/test_plugin.py
View File

@ -21,22 +21,19 @@ import mock
class TestPlugin(base.TestCase): class TestPlugin(base.TestCase):
@mock.patch('ironicclient.client.get_client') def test_make_client(self):
def test_make_client(self, ironic_get_client):
clientmgr = mock.MagicMock() clientmgr = mock.MagicMock()
clientmgr._api_version.__getitem__.return_value = '1' clientmgr._api_version.__getitem__.return_value = '1'
clientmgr.get_endpoint_for_service_type.return_value = fakes.AUTH_URL clientmgr.get_endpoint_for_service_type.return_value = fakes.AUTH_URL
client = plugin.make_client(clientmgr) client = plugin.make_client(clientmgr)
# The client should have a baremetal property. Accessing it should # The client should have an orchestration property. Accessing it should
# fetch it from the clientmanager: # fetch it from the clientmanager:
baremetal = client.baremetal
orchestration = client.orchestration orchestration = client.orchestration
# The second access should return the same clients: # The second access should return the same client:
self.assertIs(client.baremetal, baremetal)
self.assertIs(client.orchestration, orchestration) self.assertIs(client.orchestration, orchestration)
# And the functions should only be called per property: # And the functions should only be called when the client is created:
self.assertEqual(clientmgr.get_endpoint_for_service_type.call_count, 2) self.assertEqual(clientmgr.get_endpoint_for_service_type.call_count, 1)
self.assertEqual(clientmgr.auth.get_token.call_count, 2) self.assertEqual(clientmgr.auth.get_token.call_count, 1)

13
tripleoclient/tests/v1/baremetal/fakes.py
View File

@ -67,22 +67,11 @@ class FakeBaremetalNodeClient(object):
for uuid in (sorted(self.states.keys()))] for uuid in (sorted(self.states.keys()))]
class FakeClientWrapper(object):
def __init__(self):
self._instance = mock.Mock()
self._baremetal = mock.Mock()
@property
def baremetal(self):
return self._baremetal
class TestBaremetal(utils.TestCommand): class TestBaremetal(utils.TestCommand):
def setUp(self): def setUp(self):
super(TestBaremetal, self).setUp() super(TestBaremetal, self).setUp()
self.app.client_manager.auth_ref = mock.Mock(auth_token="TOKEN") self.app.client_manager.auth_ref = mock.Mock(auth_token="TOKEN")
self.app.client_manager.tripleoclient = FakeClientWrapper() self.app.client_manager.baremetal = mock.Mock()
self.app.client_manager.image = mock.Mock() self.app.client_manager.image = mock.Mock()

54
tripleoclient/tests/v1/baremetal/test_baremetal.py
View File

@ -370,7 +370,7 @@ pxe_ssh,192.168.122.1,root,"KEY2",00:7c:ef:3d:eb:60""")
'mac': ['00:0b:d0:69:7e:58'] 'mac': ['00:0b:d0:69:7e:58']
} }
], ],
client=self.app.client_manager.tripleoclient.baremetal, client=self.app.client_manager.baremetal,
keystone_client=None) keystone_client=None)
@mock.patch('os_cloud_config.nodes.register_all_nodes', autospec=True) @mock.patch('os_cloud_config.nodes.register_all_nodes', autospec=True)
@ -405,7 +405,7 @@ pxe_ssh,192.168.122.1,root,"KEY2",00:7c:ef:3d:eb:60""")
'mac': ['00:0b:d0:69:7e:58'] 'mac': ['00:0b:d0:69:7e:58']
} }
], ],
client=self.app.client_manager.tripleoclient.baremetal, client=self.app.client_manager.baremetal,
keystone_client=None) keystone_client=None)
@mock.patch('os_cloud_config.nodes.register_all_nodes', autospec=True) @mock.patch('os_cloud_config.nodes.register_all_nodes', autospec=True)
@ -439,7 +439,7 @@ pxe_ssh,192.168.122.1,root,"KEY2",00:7c:ef:3d:eb:60""")
'mac': ['00:7c:ef:3d:eb:60'] 'mac': ['00:7c:ef:3d:eb:60']
} }
], ],
client=self.app.client_manager.tripleoclient.baremetal, client=self.app.client_manager.baremetal,
keystone_client=None) keystone_client=None)
@ -455,7 +455,7 @@ class TestStartBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True) @mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True)
@mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True) @mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True)
def test_introspect_bulk_one(self, inspection_mock, get_status_mock): def test_introspect_bulk_one(self, inspection_mock, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
client.node = fakes.FakeBaremetalNodeClient( client.node = fakes.FakeBaremetalNodeClient(
states={"ABCDEFGH": "available"}, states={"ABCDEFGH": "available"},
transitions={ transitions={
@ -479,7 +479,7 @@ class TestStartBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True) @mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True)
def test_introspect_bulk_failed(self, introspect_mock, get_status_mock): def test_introspect_bulk_failed(self, introspect_mock, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
client.node = fakes.FakeBaremetalNodeClient( client.node = fakes.FakeBaremetalNodeClient(
states={"ABCDEFGH": "available", "IJKLMNOP": "available"}, states={"ABCDEFGH": "available", "IJKLMNOP": "available"},
transitions={ transitions={
@ -510,7 +510,7 @@ class TestStartBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True) @mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True)
@mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True) @mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True)
def test_introspect_bulk(self, introspect_mock, get_status_mock): def test_introspect_bulk(self, introspect_mock, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
client.node = fakes.FakeBaremetalNodeClient( client.node = fakes.FakeBaremetalNodeClient(
states={ states={
"ABC": "available", "ABC": "available",
@ -558,7 +558,7 @@ class TestStartBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True) @mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True)
@mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True) @mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True)
def test_introspect_bulk_timeout(self, introspect_mock, get_status_mock): def test_introspect_bulk_timeout(self, introspect_mock, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
client.node = fakes.FakeBaremetalNodeClient( client.node = fakes.FakeBaremetalNodeClient(
states={ states={
"ABC": "available", "ABC": "available",
@ -591,7 +591,7 @@ class TestStartBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True) @mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True)
def test_introspect_bulk_transition_fails(self, introspect_mock, def test_introspect_bulk_transition_fails(self, introspect_mock,
get_status_mock): get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
client.node = fakes.FakeBaremetalNodeClient( client.node = fakes.FakeBaremetalNodeClient(
states={ states={
"ABC": "available", "ABC": "available",
@ -636,7 +636,7 @@ class TestStatusBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True) @mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True)
def test_status_bulk_one(self, get_status_mock): def test_status_bulk_one(self, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
client.node.list.return_value = [ client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH") mock.Mock(uuid="ABCDEFGH")
] ]
@ -658,7 +658,7 @@ class TestStatusBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True) @mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True)
def test_status_bulk(self, get_status_mock): def test_status_bulk(self, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
client.node.list.return_value = [ client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH"), mock.Mock(uuid="ABCDEFGH"),
mock.Mock(uuid="IJKLMNOP"), mock.Mock(uuid="IJKLMNOP"),
@ -719,7 +719,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
nodes = [mock.Mock(uuid='foo', driver='drac'), nodes = [mock.Mock(uuid='foo', driver='drac'),
mock.Mock(uuid='bar', driver='ilo'), mock.Mock(uuid='bar', driver='ilo'),
mock.Mock(uuid='baz', driver='drac')] mock.Mock(uuid='baz', driver='drac')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = nodes bm_client.node.list.return_value = nodes
argslist = ['--delete-existing-raid-volumes'] argslist = ['--delete-existing-raid-volumes']
@ -761,7 +761,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
nodes = [mock.Mock(uuid='foo', driver='drac'), nodes = [mock.Mock(uuid='foo', driver='drac'),
mock.Mock(uuid='bar', driver='ilo'), mock.Mock(uuid='bar', driver='ilo'),
mock.Mock(uuid='baz', driver='drac')] mock.Mock(uuid='baz', driver='drac')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = nodes bm_client.node.list.return_value = nodes
parsed_args = self.check_parser(self.cmd, [], []) parsed_args = self.check_parser(self.cmd, [], [])
@ -784,7 +784,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0) return_value=0)
def test__configure_bios(self, mock_sleep_time): def test__configure_bios(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')] nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
self.cmd.bm_client = bm_client self.cmd.bm_client = bm_client
self.cmd._configure_bios(nodes) self.cmd._configure_bios(nodes)
@ -797,7 +797,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0) return_value=0)
def test__configure_root_raid_volumes(self, mock_sleep_time): def test__configure_root_raid_volumes(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')] nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
self.cmd.bm_client = bm_client self.cmd.bm_client = bm_client
self.cmd._configure_root_raid_volumes(nodes) self.cmd._configure_root_raid_volumes(nodes)
@ -813,7 +813,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0) return_value=0)
def test__configure_nonroot_raid_volumes(self, mock_sleep_time): def test__configure_nonroot_raid_volumes(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')] nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
self.cmd.bm_client = bm_client self.cmd.bm_client = bm_client
self.cmd._configure_nonroot_raid_volumes(nodes) self.cmd._configure_nonroot_raid_volumes(nodes)
@ -829,7 +829,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0) return_value=0)
def test__wait_for_drac_config_jobs(self, mock_sleep_time): def test__wait_for_drac_config_jobs(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')] nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.vendor_passthru.side_effect = [ bm_client.node.vendor_passthru.side_effect = [
mock.Mock(unfinished_jobs={'percent_complete': '34', mock.Mock(unfinished_jobs={'percent_complete': '34',
'id': 'JID_343938731947', 'id': 'JID_343938731947',
@ -850,7 +850,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0) return_value=0)
def test__wait_for_drac_config_jobs_times_out(self, mock_sleep_time): def test__wait_for_drac_config_jobs_times_out(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')] nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.vendor_passthru.return_value = mock.Mock( bm_client.node.vendor_passthru.return_value = mock.Mock(
unfinished_jobs={'percent_complete': '34', unfinished_jobs={'percent_complete': '34',
'id': 'JID_343938731947', 'id': 'JID_343938731947',
@ -867,7 +867,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
def test__delete_raid_volumes(self, mock_sleep_time): def test__delete_raid_volumes(self, mock_sleep_time):
node_with_raid_volume = mock.Mock(uuid='foo') node_with_raid_volume = mock.Mock(uuid='foo')
nodes = [node_with_raid_volume, mock.Mock(uuid='bar')] nodes = [node_with_raid_volume, mock.Mock(uuid='bar')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.vendor_passthru.side_effect = [ bm_client.node.vendor_passthru.side_effect = [
mock.Mock(virtual_disks=[ mock.Mock(virtual_disks=[
{'controller': 'RAID.Integrated.1-1', {'controller': 'RAID.Integrated.1-1',
@ -896,7 +896,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
def test__change_power_state(self): def test__change_power_state(self):
nodes = [mock.Mock(uuid='foo')] nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
self.cmd.bm_client = bm_client self.cmd.bm_client = bm_client
self.cmd._change_power_state(nodes, 'reboot') self.cmd._change_power_state(nodes, 'reboot')
@ -909,7 +909,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
def test__run_introspection(self, mock_wait_for_node_introspection, def test__run_introspection(self, mock_wait_for_node_introspection,
mock_introspect): mock_introspect):
nodes = [mock.Mock(uuid='foo')] nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
self.cmd.bm_client = bm_client self.cmd.bm_client = bm_client
self.cmd.inspector_url = None self.cmd.inspector_url = None
@ -933,7 +933,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot(self, find_resource_mock): def test_configure_boot(self, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID") find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = [ bm_client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH"), mock.Mock(uuid="ABCDEFGH"),
mock.Mock(uuid="IJKLMNOP"), mock.Mock(uuid="IJKLMNOP"),
@ -981,7 +981,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_with_suffix(self, find_resource_mock): def test_configure_boot_with_suffix(self, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID") find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = [ bm_client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH"), mock.Mock(uuid="ABCDEFGH"),
mock.Mock(uuid="IJKLMNOP"), mock.Mock(uuid="IJKLMNOP"),
@ -1037,7 +1037,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_in_transition(self, _, find_resource_mock): def test_configure_boot_in_transition(self, _, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID") find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = [mock.Mock(uuid="ABCDEFGH", bm_client.node.list.return_value = [mock.Mock(uuid="ABCDEFGH",
power_state=None), power_state=None),
] ]
@ -1065,7 +1065,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_timeout(self, _, find_resource_mock): def test_configure_boot_timeout(self, _, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID") find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = [mock.Mock(uuid="ABCDEFGH", bm_client.node.list.return_value = [mock.Mock(uuid="ABCDEFGH",
power_state=None), power_state=None),
] ]
@ -1080,7 +1080,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_skip_maintenance(self, find_resource_mock): def test_configure_boot_skip_maintenance(self, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID") find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = [ bm_client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH", maintenance=False), mock.Mock(uuid="ABCDEFGH", maintenance=False),
] ]
@ -1099,7 +1099,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_existing_properties(self, find_resource_mock): def test_configure_boot_existing_properties(self, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID") find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = [ bm_client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH"), mock.Mock(uuid="ABCDEFGH"),
mock.Mock(uuid="IJKLMNOP"), mock.Mock(uuid="IJKLMNOP"),
@ -1180,7 +1180,7 @@ class TestShowNodeCapabilities(fakes.TestBaremetal):
def test_success(self): def test_success(self):
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
bm_client.node.list.return_value = [ bm_client.node.list.return_value = [
mock.Mock(uuid='UUID1'), mock.Mock(uuid='UUID1'),

6
tripleoclient/tests/v1/overcloud_deploy/fakes.py
View File

@ -48,16 +48,11 @@ class FakeClientWrapper(object):
def __init__(self): def __init__(self):
self._instance = mock.Mock() self._instance = mock.Mock()
self._orchestration = mock.Mock() self._orchestration = mock.Mock()
self._baremetal = mock.Mock()
@property @property
def orchestration(self): def orchestration(self):
return self._orchestration return self._orchestration
@property
def baremetal(self):
return self._baremetal
class TestDeployOvercloud(utils.TestCommand): class TestDeployOvercloud(utils.TestCommand):
@ -66,6 +61,7 @@ class TestDeployOvercloud(utils.TestCommand):
self.app.client_manager.auth_ref = mock.Mock(auth_token="TOKEN") self.app.client_manager.auth_ref = mock.Mock(auth_token="TOKEN")
self.app.client_manager.tripleoclient = FakeClientWrapper() self.app.client_manager.tripleoclient = FakeClientWrapper()
self.app.client_manager.baremetal = mock.Mock()
self.app.client_manager.network = mock.Mock() self.app.client_manager.network = mock.Mock()
self.app.client_manager.compute = mock.Mock() self.app.client_manager.compute = mock.Mock()
self.app.client_manager.identity = mock.Mock() self.app.client_manager.identity = mock.Mock()

8
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -136,7 +136,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
baremetal = clients.tripleoclient.baremetal baremetal = clients.baremetal
baremetal.node.list.return_value = range(10) baremetal.node.list.return_value = range(10)
expected_parameters = { expected_parameters = {
@ -298,7 +298,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
baremetal = clients.tripleoclient.baremetal baremetal = clients.baremetal
baremetal.node.list.return_value = range(10) baremetal.node.list.return_value = range(10)
expected_parameters = { expected_parameters = {
@ -463,7 +463,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
baremetal = clients.tripleoclient.baremetal baremetal = clients.baremetal
baremetal.node.list.return_value = range(10) baremetal.node.list.return_value = range(10)
with mock.patch('tempfile.mkstemp') as mkstemp: with mock.patch('tempfile.mkstemp') as mkstemp:
@ -715,7 +715,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
baremetal = clients.tripleoclient.baremetal baremetal = clients.baremetal
baremetal.node.list.return_value = range(10) baremetal.node.list.return_value = range(10)
result = self.cmd.take_action(parsed_args) result = self.cmd.take_action(parsed_args)

2
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy_validators.py
View File

@ -36,7 +36,7 @@ class TestDeployValidators(fakes.TestDeployOvercloud):
def __init__(self, uuid): def __init__(self, uuid):
self.uuid = uuid self.uuid = uuid
bm_client = fakes.FakeClientWrapper().baremetal bm_client = self.app.client_manager.baremetal
mock_node = mock.Mock() mock_node = mock.Mock()
bm_client.attach_mock(mock_node, 'node') bm_client.attach_mock(mock_node, 'node')

10
tripleoclient/tests/v1/test_overcloud_profiles.py
View File

@ -27,6 +27,7 @@ class TestMatchProfiles(test_plugin.TestPluginV1):
super(TestMatchProfiles, self).setUp() super(TestMatchProfiles, self).setUp()
self.cmd = overcloud_profiles.MatchProfiles(self.app, None) self.cmd = overcloud_profiles.MatchProfiles(self.app, None)
self.app.client_manager.tripleoclient = mock.Mock() self.app.client_manager.tripleoclient = mock.Mock()
self.app.client_manager.baremetal = mock.Mock()
self.app.client_manager.compute = mock.Mock() self.app.client_manager.compute = mock.Mock()
self.flavors = [ self.flavors = [
test_utils.FakeFlavor('compute'), test_utils.FakeFlavor('compute'),
@ -49,7 +50,7 @@ class TestMatchProfiles(test_plugin.TestPluginV1):
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
mock_assign.assert_called_once_with( mock_assign.assert_called_once_with(
self.app.client_manager.tripleoclient.baremetal, self.app.client_manager.baremetal,
{'compute': (self.flavors[0], 3), {'compute': (self.flavors[0], 3),
'control': (self.flavors[1], 1)}, 'control': (self.flavors[1], 1)},
assign_profiles=True, dry_run=False) assign_profiles=True, dry_run=False)
@ -69,7 +70,7 @@ class TestMatchProfiles(test_plugin.TestPluginV1):
self.cmd.take_action, parsed_args) self.cmd.take_action, parsed_args)
mock_assign.assert_called_once_with( mock_assign.assert_called_once_with(
self.app.client_manager.tripleoclient.baremetal, self.app.client_manager.baremetal,
{'compute': (self.flavors[0], 3), {'compute': (self.flavors[0], 3),
'control': (self.flavors[1], 1)}, 'control': (self.flavors[1], 1)},
assign_profiles=True, dry_run=False) assign_profiles=True, dry_run=False)
@ -89,7 +90,7 @@ class TestMatchProfiles(test_plugin.TestPluginV1):
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
mock_assign.assert_called_once_with( mock_assign.assert_called_once_with(
self.app.client_manager.tripleoclient.baremetal, self.app.client_manager.baremetal,
{'compute': (self.flavors[0], 3), {'compute': (self.flavors[0], 3),
'control': (self.flavors[1], 1)}, 'control': (self.flavors[1], 1)},
assign_profiles=True, dry_run=True) assign_profiles=True, dry_run=True)
@ -100,6 +101,7 @@ class TestListProfiles(test_plugin.TestPluginV1):
super(TestListProfiles, self).setUp() super(TestListProfiles, self).setUp()
self.cmd = overcloud_profiles.ListProfiles(self.app, None) self.cmd = overcloud_profiles.ListProfiles(self.app, None)
self.app.client_manager.tripleoclient = mock.Mock() self.app.client_manager.tripleoclient = mock.Mock()
self.app.client_manager.baremetal = mock.Mock()
self.nodes = [ self.nodes = [
mock.Mock(uuid='uuid1', provision_state='active', mock.Mock(uuid='uuid1', provision_state='active',
properties={}), properties={}),
@ -112,7 +114,7 @@ class TestListProfiles(test_plugin.TestPluginV1):
properties={'capabilities': 'profile:compute,' properties={'capabilities': 'profile:compute,'
'compute_profile:0'}), 'compute_profile:0'}),
] ]
self.bm_client = self.app.client_manager.tripleoclient.baremetal self.bm_client = self.app.client_manager.baremetal
self.bm_client.node.list.return_value = self.nodes self.bm_client.node.list.return_value = self.nodes
def test_list(self): def test_list(self):

13
tripleoclient/v1/baremetal.py
View File

@ -177,7 +177,7 @@ class ImportBaremetal(command.Command):
nodes.register_all_nodes( nodes.register_all_nodes(
parsed_args.service_host, parsed_args.service_host,
nodes_json, nodes_json,
client=self.app.client_manager.tripleoclient.baremetal, client=self.app.client_manager.baremetal,
keystone_client=self.app.client_manager.identity) keystone_client=self.app.client_manager.identity)
@ -205,7 +205,7 @@ class StartBaremetalIntrospectionBulk(IntrospectionParser, command.Command):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args) self.log.debug("take_action(%s)" % parsed_args)
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
auth_token = self.app.client_manager.auth_ref.auth_token auth_token = self.app.client_manager.auth_ref.auth_token
node_uuids = [] node_uuids = []
@ -274,7 +274,7 @@ class StatusBaremetalIntrospectionBulk(IntrospectionParser, lister.Lister):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args) self.log.debug("take_action(%s)" % parsed_args)
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
auth_token = self.app.client_manager.auth_ref.auth_token auth_token = self.app.client_manager.auth_ref.auth_token
statuses = [] statuses = []
@ -421,8 +421,7 @@ class ConfigureReadyState(IntrospectionParser, command.Command):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args) self.log.debug("take_action(%s)" % parsed_args)
self.bm_client = ( self.bm_client = self.app.client_manager.baremetal
self.app.client_manager.tripleoclient.baremetal)
self.inspector_url = parsed_args.inspector_url self.inspector_url = parsed_args.inspector_url
drac_nodes = [node for node in self.bm_client.node.list(detail=True) drac_nodes = [node for node in self.bm_client.node.list(detail=True)
if 'drac' in node.driver] if 'drac' in node.driver]
@ -466,7 +465,7 @@ class ConfigureBaremetalBoot(command.Command):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args) self.log.debug("take_action(%s)" % parsed_args)
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
image_client = self.app.client_manager.image image_client = self.app.client_manager.image
@ -549,7 +548,7 @@ class ShowNodeCapabilities(lister.Lister):
log = logging.getLogger(__name__ + ".ShowNodeProfile") log = logging.getLogger(__name__ + ".ShowNodeProfile")
def take_action(self, parsed_args): def take_action(self, parsed_args):
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
rows = [] rows = []
for node in bm_client.node.list(): for node in bm_client.node.list():
node_detail = bm_client.node.get(node.uuid) node_detail = bm_client.node.get(node.uuid)

4
tripleoclient/v1/overcloud_deploy.py
View File

@ -329,7 +329,7 @@ class DeployOvercloud(command.Command):
parsed_args, network_client, stack) parsed_args, network_client, stack)
utils.check_nodes_count( utils.check_nodes_count(
self.app.client_manager.tripleoclient.baremetal, self.app.client_manager.baremetal,
stack, stack,
parameters, parameters,
{ {
@ -539,7 +539,7 @@ class DeployOvercloud(command.Command):
self.predeploy_warnings = 0 self.predeploy_warnings = 0
self.log.debug("Starting _pre_verify_capabilities") self.log.debug("Starting _pre_verify_capabilities")
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
self._check_boot_images() self._check_boot_images()

4
tripleoclient/v1/overcloud_profiles.py
View File

@ -40,7 +40,7 @@ class MatchProfiles(command.Command):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args) self.log.debug("take_action(%s)" % parsed_args)
bm_client = self.app.client_manager.tripleoclient.baremetal bm_client = self.app.client_manager.baremetal
flavors = self._collect_flavors(parsed_args) flavors = self._collect_flavors(parsed_args)
@ -93,7 +93,7 @@ class ListProfiles(lister.Lister):
def take_action(self, parsed_args): def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args) self.log.debug("take_action(%s)" % parsed_args)
client = self.app.client_manager.tripleoclient.baremetal client = self.app.client_manager.baremetal
result = [] result = []