openstack
/
python-tripleoclient
Code Issues Proposed changes

Turn the baremetal client reference into a property 

Use a property instead of a function. This is more in line with how the
clients are referenced with openstackclient, thereby making it easier
to switch to the Ironic OSC plugin in the future.

Change-Id: I0b4d35f0af6136dd1bce6c6d4202caa52f4c042e
This commit is contained in:
Brad P. Crochet 2015-10-07 09:38:11 -04:00
parent 90bf132049
commit f3af5c5c1c
8 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleoclient/plugin.py
View File

@ -67,6 +67,7 @@ class ClientWrapper(object):
self._baremetal = None
self._orchestration = None
@property
def baremetal(self):
"""Returns an baremetal service client"""

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

@ -23,6 +23,7 @@ class FakeClientWrapper(object):
self._instance = mock.Mock()
self._baremetal = mock.Mock()
@property
def baremetal(self):
return self._baremetal

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

@ -368,7 +368,7 @@ pxe_ssh,192.168.122.1,root,"KEY2",00:7c:ef:3d:eb:60""")
'mac': ['00:0b:d0:69:7e:58']
}
],
client=self.app.client_manager.tripleoclient.baremetal(),
client=self.app.client_manager.tripleoclient.baremetal,
keystone_client=None)
@mock.patch('os_cloud_config.nodes.register_all_nodes', autospec=True)
@ -403,7 +403,7 @@ pxe_ssh,192.168.122.1,root,"KEY2",00:7c:ef:3d:eb:60""")
'mac': ['00:0b:d0:69:7e:58']
}
],
client=self.app.client_manager.tripleoclient.baremetal(),
client=self.app.client_manager.tripleoclient.baremetal,
keystone_client=None)
@mock.patch('os_cloud_config.nodes.register_all_nodes', autospec=True)
@ -437,7 +437,7 @@ pxe_ssh,192.168.122.1,root,"KEY2",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.tripleoclient.baremetal,
keystone_client=None)
@ -454,7 +454,7 @@ class TestStartBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'introspect', autospec=True)
def test_introspect_bulk_one(self, inspection_mock, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal()
client = self.app.client_manager.tripleoclient.baremetal
client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH", provision_state="manageable")
]
@ -479,7 +479,7 @@ class TestStartBaremetalIntrospectionBulk(fakes.TestBaremetal):
get_status_mock.return_value = {'finished': True, 'error': None}
client = self.app.client_manager.tripleoclient.baremetal()
client = self.app.client_manager.tripleoclient.baremetal
client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH", provision_state="available"),
mock.Mock(uuid="IJKLMNOP", provision_state="manageable"),
@ -526,7 +526,7 @@ class TestStatusBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True)
def test_status_bulk_one(self, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal()
client = self.app.client_manager.tripleoclient.baremetal
client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH")
]
@ -548,7 +548,7 @@ class TestStatusBaremetalIntrospectionBulk(fakes.TestBaremetal):
@mock.patch.object(baremetal.inspector_client, 'get_status', autospec=True)
def test_status_bulk(self, get_status_mock):
client = self.app.client_manager.tripleoclient.baremetal()
client = self.app.client_manager.tripleoclient.baremetal
client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH"),
mock.Mock(uuid="IJKLMNOP"),
@ -609,7 +609,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
nodes = [mock.Mock(uuid='foo', driver='drac'),
mock.Mock(uuid='bar', driver='ilo'),
mock.Mock(uuid='baz', driver='drac')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = nodes
argslist = ['--delete-existing-raid-volumes']
@ -651,7 +651,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
nodes = [mock.Mock(uuid='foo', driver='drac'),
mock.Mock(uuid='bar', driver='ilo'),
mock.Mock(uuid='baz', driver='drac')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = nodes
parsed_args = self.check_parser(self.cmd, [], [])
@ -674,7 +674,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0)
def test__configure_bios(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
self.cmd.bm_client = bm_client
self.cmd._configure_bios(nodes)
@ -687,7 +687,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0)
def test__configure_root_raid_volumes(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
self.cmd.bm_client = bm_client
self.cmd._configure_root_raid_volumes(nodes)
@ -703,7 +703,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0)
def test__configure_nonroot_raid_volumes(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
self.cmd.bm_client = bm_client
self.cmd._configure_nonroot_raid_volumes(nodes)
@ -719,7 +719,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0)
def test__wait_for_drac_config_jobs(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.vendor_passthru.side_effect = [
mock.Mock(unfinished_jobs={'percent_complete': '34',
'id': 'JID_343938731947',
@ -740,7 +740,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
return_value=0)
def test__wait_for_drac_config_jobs_times_out(self, mock_sleep_time):
nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.vendor_passthru.return_value = mock.Mock(
unfinished_jobs={'percent_complete': '34',
'id': 'JID_343938731947',
@ -757,7 +757,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
def test__delete_raid_volumes(self, mock_sleep_time):
node_with_raid_volume = mock.Mock(uuid='foo')
nodes = [node_with_raid_volume, mock.Mock(uuid='bar')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.vendor_passthru.side_effect = [
mock.Mock(virtual_disks=[
{'controller': 'RAID.Integrated.1-1',
@ -786,7 +786,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
def test__change_power_state(self):
nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
self.cmd.bm_client = bm_client
self.cmd._change_power_state(nodes, 'reboot')
@ -799,7 +799,7 @@ class TestConfigureReadyState(fakes.TestBaremetal):
def test__run_introspection(self, mock_wait_for_node_introspection,
mock_introspect):
nodes = [mock.Mock(uuid='foo')]
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
self.cmd.bm_client = bm_client
self.cmd.inspector_url = None
@ -823,7 +823,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot(self, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH"),
mock.Mock(uuid="IJKLMNOP"),
@ -871,7 +871,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_with_suffix(self, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH"),
mock.Mock(uuid="IJKLMNOP"),
@ -927,7 +927,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_in_transition(self, _, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = [mock.Mock(uuid="ABCDEFGH",
power_state=None),
]
@ -955,7 +955,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_timeout(self, _, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = [mock.Mock(uuid="ABCDEFGH",
power_state=None),
]
@ -970,7 +970,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_skip_maintenance(self, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH", maintenance=False),
]
@ -989,7 +989,7 @@ class TestConfigureBaremetalBoot(fakes.TestBaremetal):
def test_configure_boot_existing_properties(self, find_resource_mock):
find_resource_mock.return_value = mock.Mock(id="IDIDID")
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = [
mock.Mock(uuid="ABCDEFGH"),
mock.Mock(uuid="IJKLMNOP"),
@ -1070,7 +1070,7 @@ class TestShowNodeCapabilities(fakes.TestBaremetal):
def test_success(self):
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
bm_client.node.list.return_value = [
mock.Mock(uuid='UUID1'),

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

@ -54,6 +54,7 @@ class FakeClientWrapper(object):
def orchestration(self):
return self._orchestration
@property
def baremetal(self):
return self._baremetal

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

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

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):
self.uuid = uuid
bm_client = fakes.FakeClientWrapper().baremetal()
bm_client = fakes.FakeClientWrapper().baremetal
mock_node = mock.Mock()
bm_client.attach_mock(mock_node, 'node')

14
tripleoclient/v1/baremetal.py
View File

@ -177,7 +177,7 @@ class ImportBaremetal(command.Command):
nodes.register_all_nodes(
parsed_args.service_host,
nodes_json,
client=self.app.client_manager.tripleoclient.baremetal(),
client=self.app.client_manager.tripleoclient.baremetal,
keystone_client=self.app.client_manager.identity)
@ -205,7 +205,7 @@ class StartBaremetalIntrospectionBulk(IntrospectionParser, command.Command):
def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args)
client = self.app.client_manager.tripleoclient.baremetal()
client = self.app.client_manager.tripleoclient.baremetal
auth_token = self.app.client_manager.auth_ref.auth_token
node_uuids = []
@ -250,7 +250,7 @@ class StartBaremetalIntrospectionBulk(IntrospectionParser, command.Command):
has_errors = True
clients = self.app.client_manager
baremetal_client = clients.tripleoclient.baremetal()
baremetal_client = clients.tripleoclient.baremetal
print("Setting manageable nodes to available...")
self.log.debug("Moving manageable nodes to available state.")
@ -275,7 +275,7 @@ class StatusBaremetalIntrospectionBulk(IntrospectionParser, lister.Lister):
def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args)
client = self.app.client_manager.tripleoclient.baremetal()
client = self.app.client_manager.tripleoclient.baremetal
auth_token = self.app.client_manager.auth_ref.auth_token
statuses = []
@ -423,7 +423,7 @@ class ConfigureReadyState(IntrospectionParser, command.Command):
self.log.debug("take_action(%s)" % parsed_args)
self.bm_client = (
self.app.client_manager.tripleoclient.baremetal())
self.app.client_manager.tripleoclient.baremetal)
self.inspector_url = parsed_args.inspector_url
drac_nodes = [node for node in self.bm_client.node.list(detail=True)
if 'drac' in node.driver]
@ -467,7 +467,7 @@ class ConfigureBaremetalBoot(command.Command):
def take_action(self, parsed_args):
self.log.debug("take_action(%s)" % parsed_args)
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
image_client = self.app.client_manager.image
@ -550,7 +550,7 @@ class ShowNodeCapabilities(lister.Lister):
log = logging.getLogger(__name__ + ".ShowNodeProfile")
def take_action(self, parsed_args):
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
rows = []
for node in bm_client.node.list():
node_detail = bm_client.node.get(node.uuid)

6
tripleoclient/v1/overcloud_deploy.py
View File

@ -351,7 +351,7 @@ class DeployOvercloud(command.Command):
parsed_args, network_client, stack)
utils.check_nodes_count(
self.app.client_manager.tripleoclient.baremetal(),
self.app.client_manager.tripleoclient.baremetal,
stack,
parameters,
{
@ -544,7 +544,7 @@ class DeployOvercloud(command.Command):
self.predeploy_warnings = 0
self.log.debug("Starting _pre_verify_capabilities")
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
self._check_boot_images()
@ -640,7 +640,7 @@ class DeployOvercloud(command.Command):
def _collect_node_profiles(self):
"""Gather a map of profile -> [node_uuid] for ironic boot profiles"""
bm_client = self.app.client_manager.tripleoclient.baremetal()
bm_client = self.app.client_manager.tripleoclient.baremetal
# map of profile capability -> [node_uuid, ...]
profile_map = collections.defaultdict(list)