openstack/tripleo-common
Code Issues Proposed changes

Remove the underscore from the base action client methods

Browse Source 
The underscore typically designates these methods as private, but
they are intended to be used by any/all of the subclasses. This
change clarifies the API.

Change-Id: I4dc95a0e1f84570b184f8b75f51a2c1456909fb9
This commit is contained in:
Dougal Matthews
2016-11-28 13:09:38 +00:00
parent 540a80a715
commit 9d3d03436a
18 changed files with 123 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tripleo_common/actions/baremetal.py
View File

@@ -54,8 +54,8 @@ class RegisterOrUpdateNodes(base.TripleOAction):
caps.setdefault('boot_option', self.instance_boot_option)
node['capabilities'] = nodes.dict_to_capabilities(caps)
baremetal_client = self._get_baremetal_client()
image_client = self._get_image_client()
baremetal_client = self.get_baremetal_client()
image_client = self.get_image_client()
try:
return nodes.register_all_nodes(
@@ -89,8 +89,8 @@ class ConfigureBootAction(base.TripleOAction):
self.instance_boot_option = instance_boot_option
def run(self):
baremetal_client = self._get_baremetal_client()
image_client = self._get_image_client()
baremetal_client = self.get_baremetal_client()
image_client = self.get_image_client()
try:
image_ids = {'kernel': None, 'ramdisk': None}
@@ -158,7 +158,7 @@ class ConfigureRootDeviceAction(base.TripleOAction):
if not self.root_device:
return
baremetal_client = self._get_baremetal_client()
baremetal_client = self.get_baremetal_client()
node = baremetal_client.node.get(self.node_uuid)
self._apply_root_device_strategy(
node, self.root_device, self.minimum_size, self.overwrite)
@@ -178,7 +178,7 @@ class ConfigureRootDeviceAction(base.TripleOAction):
node.uuid)
return
inspector_client = self._get_baremetal_introspection_client()
inspector_client = self.get_baremetal_introspection_client()
try:
data = inspector_client.get_data(node.uuid)
except ironic_inspector_client.ClientError:
@@ -244,7 +244,7 @@ class ConfigureRootDeviceAction(base.TripleOAction):
# This -1 is what we always do to account for partitioning
new_size -= 1
bm_client = self._get_baremetal_client()
bm_client = self.get_baremetal_client()
bm_client.node.update(
node.uuid,
[{'op': 'add', 'path': '/properties/root_device', 'value': hint},
@@ -273,7 +273,7 @@ class UpdateNodeCapability(base.TripleOAction):
self.value = value
def run(self):
baremetal_client = self._get_baremetal_client()
baremetal_client = self.get_baremetal_client()
try:
return nodes.update_node_capability(

14
tripleo_common/actions/base.py
View File

@@ -29,7 +29,7 @@ class TripleOAction(base.Action):
def __init__(self):
super(TripleOAction, self).__init__()
def _get_object_client(self):
def get_object_client(self):
ctx = context.ctx()
obj_ep = keystone_utils.get_endpoint_for_project('swift')
@@ -43,7 +43,7 @@ class TripleOAction(base.Action):
return swift_client.Connection(**kwargs)
def _get_baremetal_client(self):
def get_baremetal_client(self):
ctx = context.ctx()
ironic_endpoint = keystone_utils.get_endpoint_for_project('ironic')
@@ -66,7 +66,7 @@ class TripleOAction(base.Action):
retry_interval=5,
)
def _get_baremetal_introspection_client(self):
def get_baremetal_introspection_client(self):
ctx = context.ctx()
bmi_endpoint = keystone_utils.get_endpoint_for_project(
@@ -79,7 +79,7 @@ class TripleOAction(base.Action):
auth_token=ctx.auth_token
)
def _get_image_client(self):
def get_image_client(self):
ctx = context.ctx()
glance_endpoint = keystone_utils.get_endpoint_for_project('glance')
@@ -89,7 +89,7 @@ class TripleOAction(base.Action):
region_name=glance_endpoint.region
)
def _get_orchestration_client(self):
def get_orchestration_client(self):
ctx = context.ctx()
heat_endpoint = keystone_utils.get_endpoint_for_project('heat')
@@ -105,7 +105,7 @@ class TripleOAction(base.Action):
username=ctx.user_name
)
def _get_workflow_client(self):
def get_workflow_client(self):
ctx = context.ctx()
mistral_endpoint = keystone_utils.get_endpoint_for_project('mistral')
@@ -114,7 +114,7 @@ class TripleOAction(base.Action):
return mc
def _get_compute_client(self):
def get_compute_client(self):
ctx = context.ctx()
keystone_endpoint = keystone_utils.get_endpoint_for_project('keystone')
nova_endpoint = keystone_utils.get_endpoint_for_project('nova')

10
tripleo_common/actions/deployment.py
View File

@@ -65,7 +65,7 @@ class OrchestrationDeployAction(base.TripleOAction):
def _wait_for_data(self, container_name, object_name):
body = None
count_check = 0
swift_client = self._get_object_client()
swift_client = self.get_object_client()
while not body:
headers, body = swift_client.get_object(
container_name,
@@ -79,8 +79,8 @@ class OrchestrationDeployAction(base.TripleOAction):
return body
def run(self):
heat = self._get_orchestration_client()
swift_client = self._get_object_client()
heat = self.get_orchestration_client()
swift_client = self.get_object_client()
swift_url = deployment_utils.create_temp_url(swift_client,
self.name,
@@ -131,7 +131,7 @@ class DeployStackAction(templates.ProcessTemplatesAction):
def run(self):
# check to see if the stack exists
heat = self._get_orchestration_client()
heat = self.get_orchestration_client()
try:
stack = heat.stacks.get(self.container)
except heat_exc.HTTPNotFound:
@@ -140,7 +140,7 @@ class DeployStackAction(templates.ProcessTemplatesAction):
stack_is_new = stack is None
# update StackAction, DeployIdentifier and UpdateIdentifier
wc = self._get_workflow_client()
wc = self.get_workflow_client()
wf_env = wc.environments.get(self.container)
parameters = dict()

6
tripleo_common/actions/heat_capabilities.py
View File

@@ -40,7 +40,7 @@ class GetCapabilitiesAction(base.TripleOAction):
def run(self):
try:
swift_client = self._get_object_client()
swift_client = self.get_object_client()
map_file = swift_client.get_object(
self.container, 'capabilities-map.yaml')
capabilities = yaml.safe_load(map_file[1])
@@ -58,7 +58,7 @@ class GetCapabilitiesAction(base.TripleOAction):
LOG.exception(err_msg)
return mistral_workflow_utils.Result(error=err_msg)
try:
mistral_client = self._get_workflow_client()
mistral_client = self.get_workflow_client()
mistral_env = mistral_client.environments.get(self.container)
except Exception as mistral_err:
err_msg = ("Error retrieving mistral "
@@ -157,7 +157,7 @@ class UpdateCapabilitiesAction(base.TripleOAction):
self.environments = environments
def run(self):
mistral_client = self._get_workflow_client()
mistral_client = self.get_workflow_client()
mistral_env = None
try:
mistral_env = mistral_client.environments.get(self.container)

16
tripleo_common/actions/parameters.py
View File

@@ -54,9 +54,9 @@ class GetParametersAction(templates.ProcessTemplatesAction):
processed_data['show_nested'] = True
# respect previously user set param values
wc = self._get_workflow_client()
wc = self.get_workflow_client()
wf_env = wc.environments.get(self.container)
orc = self._get_orchestration_client()
orc = self.get_orchestration_client()
params = wf_env.variables.get('parameter_defaults')
@@ -80,7 +80,7 @@ class ResetParametersAction(base.TripleOAction):
self.container = container
def run(self):
wc = self._get_workflow_client()
wc = self.get_workflow_client()
wf_env = wc.environments.get(self.container)
if 'parameter_defaults' in wf_env.variables:
@@ -104,7 +104,7 @@ class UpdateParametersAction(base.TripleOAction):
self.parameters = parameters
def run(self):
wc = self._get_workflow_client()
wc = self.get_workflow_client()
wf_env = wc.environments.get(self.container)
if 'parameter_defaults' not in wf_env.variables:
wf_env.variables['parameter_defaults'] = {}
@@ -126,8 +126,8 @@ class UpdateRoleParametersAction(UpdateParametersAction):
self.role = role
def run(self):
baremetal_client = self._get_baremetal_client()
compute_client = self._get_compute_client()
baremetal_client = self.get_baremetal_client()
compute_client = self.get_compute_client()
self.parameters = parameters.set_count_and_flavor_params(
self.role, baremetal_client, compute_client)
return super(UpdateRoleParametersAction, self).run()
@@ -146,8 +146,8 @@ class GeneratePasswordsAction(base.TripleOAction):
def run(self):
orchestration = self._get_orchestration_client()
wc = self._get_workflow_client()
orchestration = self.get_orchestration_client()
wc = self.get_workflow_client()
try:
wf_env = wc.environments.get(self.container)
except Exception:

26
tripleo_common/actions/plan.py
View File

@@ -44,7 +44,7 @@ class CreateContainerAction(base.TripleOAction):
self.container = container
def run(self):
oc = self._get_object_client()
oc = self.get_object_client()
# checks to see if a container with that name exists
if self.container in [container["name"] for container in
oc.get_account()[1]]:
@@ -67,7 +67,7 @@ class CreatePlanAction(base.TripleOAction):
self.container = container
def run(self):
oc = self._get_object_client()
oc = self.get_object_client()
env_data = {
'name': self.container,
}
@@ -76,7 +76,7 @@ class CreatePlanAction(base.TripleOAction):
# Check to see if an environment with that name already exists
try:
self._get_workflow_client().environments.get(self.container)
self.get_workflow_client().environments.get(self.container)
except mistralclient_base.APIException:
# The environment doesn't exist, as expected. Proceed.
pass
@@ -98,7 +98,7 @@ class CreatePlanAction(base.TripleOAction):
env_data['variables'] = json.dumps(env_vars, sort_keys=True,)
# creates environment
self._get_workflow_client().environments.create(**env_data)
self.get_workflow_client().environments.create(**env_data)
except yaml.YAMLError as yaml_err:
error_text = "Error parsing the yaml file: %s" % yaml_err
except swiftexceptions.ClientException as obj_err:
@@ -127,8 +127,8 @@ class UpdatePlanAction(base.TripleOAction):
self.container = container
def run(self):
swift = self._get_object_client()
mistral = self._get_workflow_client()
swift = self.get_object_client()
mistral = self.get_workflow_client()
error_text = None
@@ -184,8 +184,8 @@ class ListPlansAction(base.TripleOAction):
# with the same name. The container is marked with metadata
# to ensure it isn't confused with another container
plan_list = []
oc = self._get_object_client()
mc = self._get_workflow_client()
oc = self.get_object_client()
mc = self.get_workflow_client()
for item in oc.get_account()[1]:
container = oc.get_container(item['name'])[0]
if constants.TRIPLEO_META_USAGE_KEY in container.keys():
@@ -212,7 +212,7 @@ class DeletePlanAction(base.TripleOAction):
error_text = None
# heat throws HTTPNotFound if the stack is not found
try:
stack = self._get_orchestration_client().stacks.get(self.container)
stack = self.get_orchestration_client().stacks.get(self.container)
except heatexceptions.HTTPNotFound:
pass
else:
@@ -220,7 +220,7 @@ class DeletePlanAction(base.TripleOAction):
raise exception.StackInUseError(name=self.container)
try:
swift = self._get_object_client()
swift = self.get_object_client()
if self.container in [container["name"] for container in
swift.get_account()[1]]:
box = swift.get_container(self.container)
@@ -234,7 +234,7 @@ class DeletePlanAction(base.TripleOAction):
# delete plan container
swift.delete_container(self.container)
# if mistral environment exists, delete it too
mistral = self._get_workflow_client()
mistral = self.get_workflow_client()
if self.container in [env.name for env in
mistral.environments.list()]:
# deletes environment
@@ -267,11 +267,11 @@ class ListRolesAction(base.TripleOAction):
def run(self):
try:
mc = self._get_workflow_client()
mc = self.get_workflow_client()
mistral_env = mc.environments.get(self.container)
template_name = mistral_env.variables['template']
oc = self._get_object_client()
oc = self.get_object_client()
resources = yaml.safe_load(
oc.get_object(self.container, template_name)[1])['resources']
except Exception as mistral_err:

6
tripleo_common/actions/scale.py
View File

@@ -85,8 +85,8 @@ class ScaleDownAction(templates.ProcessTemplatesAction):
fields['existing'] = True
LOG.debug('stack update params: %s', fields)
self._get_orchestration_client().stacks.update(self.container,
**fields)
self.get_orchestration_client().stacks.update(self.container,
**fields)
def _get_removal_params_from_heat(self, resources_by_role, resources):
stack_params = {}
@@ -111,7 +111,7 @@ class ScaleDownAction(templates.ProcessTemplatesAction):
return stack_params
def run(self):
heatclient = self._get_orchestration_client()
heatclient = self.get_orchestration_client()
resources = heatclient.resources.list(self.container, nested_depth=5)
resources_by_role = collections.defaultdict(list)
instance_list = list(self.nodes)

12
tripleo_common/actions/templates.py
View File

@@ -52,7 +52,7 @@ class UploadTemplatesAction(base.TripleOAction):
with tf.NamedTemporaryFile() as tmp_tarball:
tarball.create_tarball(tht_base_path, tmp_tarball.name)
tarball.tarball_extract_to_swift_container(
self._get_object_client(),
self.get_object_client(),
tmp_tarball.name,
self.container)
@@ -69,7 +69,7 @@ class ProcessTemplatesAction(base.TripleOAction):
self.container = container
def _j2_render_and_put(self, j2_template, j2_data, outfile_name=None):
swift = self._get_object_client()
swift = self.get_object_client()
yaml_f = outfile_name or j2_template.replace('.j2.yaml', '.yaml')
try:
@@ -93,7 +93,7 @@ class ProcessTemplatesAction(base.TripleOAction):
raise Exception(error_msg)
def _get_j2_excludes_file(self):
swift = self._get_object_client()
swift = self.get_object_client()
try:
j2_excl_file = swift.get_object(
self.container, constants.OVERCLOUD_J2_EXCLUDES)[1]
@@ -110,7 +110,7 @@ class ProcessTemplatesAction(base.TripleOAction):
return j2_excl_data
def _process_custom_roles(self):
swift = self._get_object_client()
swift = self.get_object_client()
try:
j2_role_file = swift.get_object(
@@ -173,8 +173,8 @@ class ProcessTemplatesAction(base.TripleOAction):
def run(self):
error_text = None
ctx = context.ctx()
swift = self._get_object_client()
mistral = self._get_workflow_client()
swift = self.get_object_client()
mistral = self.get_workflow_client()
try:
mistral_environment = mistral.environments.get(self.container)
except Exception as mistral_err:

6
tripleo_common/actions/validations.py
View File

@@ -30,7 +30,7 @@ class GetPubkeyAction(base.TripleOAction):
super(GetPubkeyAction, self).__init__()
def run(self):
mc = self._get_workflow_client()
mc = self.get_workflow_client()
try:
env = mc.environments.get('ssh_keys')
public_key = env.variables['public_key']
@@ -68,7 +68,7 @@ class Enabled(base.TripleOAction):
def _validations_enabled(self):
"""Detect whether the validations are enabled on the undercloud."""
mistral = self._get_workflow_client()
mistral = self.get_workflow_client()
try:
# NOTE: the `ssh_keys` environment is created by
# instack-undercloud only when the validations are enabled on the
@@ -121,7 +121,7 @@ class RunValidationAction(base.TripleOAction):
self.plan = plan
def run(self):
mc = self._get_workflow_client()
mc = self.get_workflow_client()
identity_file = None
try:
env = mc.environments.get('ssh_keys')

8
tripleo_common/tests/actions/test_baremetal.py
View File

@@ -38,14 +38,14 @@ class TestConfigureBootAction(base.TestCase):
self.ironic = mock.MagicMock()
ironic_patcher = mock.patch(
'tripleo_common.actions.base.TripleOAction._get_baremetal_client',
'tripleo_common.actions.base.TripleOAction.get_baremetal_client',
return_value=self.ironic)
self.mock_ironic = ironic_patcher.start()
self.addCleanup(ironic_patcher.stop)
self.glance = mock.MagicMock()
glance_patcher = mock.patch(
'tripleo_common.actions.base.TripleOAction._get_image_client',
'tripleo_common.actions.base.TripleOAction.get_image_client',
return_value=self.glance)
self.mock_glance = glance_patcher.start()
self.addCleanup(glance_patcher.stop)
@@ -160,7 +160,7 @@ class TestConfigureRootDeviceAction(base.TestCase):
# Ironic mocks
self.ironic = mock.MagicMock()
ironic_patcher = mock.patch(
'tripleo_common.actions.base.TripleOAction._get_baremetal_client',
'tripleo_common.actions.base.TripleOAction.get_baremetal_client',
return_value=self.ironic)
self.mock_ironic = ironic_patcher.start()
self.addCleanup(ironic_patcher.stop)
@@ -176,7 +176,7 @@ class TestConfigureRootDeviceAction(base.TestCase):
self.inspector = mock.MagicMock()
inspector_patcher = mock.patch(
'tripleo_common.actions.base.TripleOAction.'
'_get_baremetal_introspection_client',
'get_baremetal_introspection_client',
return_value=self.inspector)
self.mock_inspector = inspector_patcher.start()
self.addCleanup(inspector_patcher.stop)

2
tripleo_common/tests/actions/test_base.py
View File

@@ -34,7 +34,7 @@ class TestActionsBase(tests_base.TestCase):
def test__get_baremetal_client(self, mock_client, mock_endpoint, mock_cxt):
mock_endpoint.return_value = mock.Mock(
url='http://ironic/v1', region='ironic-region')
self.action._get_baremetal_client()
self.action.get_baremetal_client()
mock_client.assert_called_once_with(
'http://ironic/v1', max_retries=12, os_ironic_api_version='1.15',
region_name='ironic-region', retry_interval=5, token=mock.ANY)

22
tripleo_common/tests/actions/test_deployment.py
View File

@@ -55,7 +55,7 @@ class OrchestrationDeployActionTest(base.TestCase):
self.assertEqual('built_params', action._build_sc_params('swift_url'))
build_derived_config_params_mock.assert_called_once()
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
def test_wait_for_data(self, get_obj_client_mock):
swift = mock.MagicMock()
swift.get_object.return_value = ({}, 'body')
@@ -67,7 +67,7 @@ class OrchestrationDeployActionTest(base.TestCase):
get_obj_client_mock.assert_called_once()
swift.get_object.assert_called_once_with('container', 'object')
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('time.sleep')
def test_wait_for_data_timeout(self, sleep, get_obj_client_mock):
swift = mock.MagicMock()
@@ -83,9 +83,9 @@ class OrchestrationDeployActionTest(base.TestCase):
# Trying every 3 seconds, so 4 times for a timeout of 10 seconds
self.assertEqual(swift.get_object.call_count, 4)
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_orchestration_client')
'get_orchestration_client')
@mock.patch('heatclient.common.deployment_utils.create_temp_url')
@mock.patch('tripleo_common.actions.deployment.OrchestrationDeployAction.'
'_extract_container_object_from_swift_url')
@@ -122,9 +122,9 @@ class OrchestrationDeployActionTest(base.TestCase):
'object')
get_obj_client_mock.delete_container.called_once_with('container')
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_orchestration_client')
'get_orchestration_client')
@mock.patch('heatclient.common.deployment_utils.create_temp_url')
@mock.patch('tripleo_common.actions.deployment.OrchestrationDeployAction.'
'_extract_container_object_from_swift_url')
@@ -155,9 +155,9 @@ class OrchestrationDeployActionTest(base.TestCase):
'object')
get_obj_client_mock.delete_container.called_once_with('container')
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_orchestration_client')
'get_orchestration_client')
@mock.patch('heatclient.common.deployment_utils.create_temp_url')
@mock.patch('tripleo_common.actions.deployment.OrchestrationDeployAction.'
'_extract_container_object_from_swift_url')
@@ -199,10 +199,10 @@ class DeployStackActionTest(base.TestCase):
'process_multiple_environments_and_files')
@mock.patch('heatclient.common.template_utils.get_template_contents')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
'get_workflow_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_orchestration_client')
'tripleo_common.actions.base.TripleOAction.get_orchestration_client')
@mock.patch('mistral.context.ctx')
def test_run(self, mock_ctx, get_orchestration_client_mock,
mock_get_object_client, mock_get_workflow_client,

16
tripleo_common/tests/actions/test_heat_capabilities.py
View File

@@ -141,7 +141,7 @@ class GetCapabilitiesActionTest(base.TestCase):
super(GetCapabilitiesActionTest, self).setUp()
self.container_name = 'test-container'
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
def test_run_yaml_error(self, get_obj_client_mock):
# setup swift
swift = mock.MagicMock()
@@ -154,9 +154,9 @@ class GetCapabilitiesActionTest(base.TestCase):
error="Error parsing capabilities-map.yaml.")
self.assertEqual(expected, action.run())
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_run_mistral_error(self, get_workflow_client_mock,
get_obj_client_mock):
@@ -177,9 +177,9 @@ class GetCapabilitiesActionTest(base.TestCase):
error="Error retrieving mistral environment. ")
self.assertEqual(expected, action.run())
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_run(self, get_workflow_client_mock, get_obj_client_mock):
# setup swift
@@ -239,7 +239,7 @@ class UpdateCapabilitiesActionTest(base.TestCase):
self.container_name = 'test-container'
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_run(self, get_workflow_client_mock):
# setup mistral
@@ -270,9 +270,9 @@ class UpdateCapabilitiesActionTest(base.TestCase):
action.run())
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_object_client')
'tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_run_mistral_error(self, get_workflow_client_mock,
get_obj_client_mock):

28
tripleo_common/tests/actions/test_parameters.py
View File

@@ -61,10 +61,10 @@ class GetParametersActionTest(base.TestCase):
'process_multiple_environments_and_files')
@mock.patch('heatclient.common.template_utils.get_template_contents')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_orchestration_client')
'get_orchestration_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
'get_workflow_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('mistral.context.ctx')
def test_run(self, mock_ctx, mock_get_object_client,
mock_get_workflow_client, mock_get_orchestration_client,
@@ -109,7 +109,7 @@ class GetParametersActionTest(base.TestCase):
class ResetParametersActionTest(base.TestCase):
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
'get_workflow_client')
@mock.patch('mistral.context.ctx')
def test_run(self, mock_ctx, mock_get_workflow_client):
@@ -140,7 +140,7 @@ class ResetParametersActionTest(base.TestCase):
class UpdateParametersActionTest(base.TestCase):
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
'get_workflow_client')
@mock.patch('mistral.context.ctx')
def test_run(self, mock_ctx, mock_get_workflow_client):
@@ -175,11 +175,11 @@ class UpdateRoleParametersActionTest(base.TestCase):
@mock.patch('tripleo_common.utils.parameters.set_count_and_flavor_params')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_baremetal_client')
'get_baremetal_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_compute_client')
'get_compute_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
'get_workflow_client')
@mock.patch('mistral.context.ctx')
def test_run(self, mock_ctx, mock_get_workflow_client,
mock_get_compute_client, mock_get_baremetal_client,
@@ -208,11 +208,11 @@ class UpdateRoleParametersActionTest(base.TestCase):
class GeneratePasswordsActionTest(base.TestCase):
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_orchestration_client')
'get_orchestration_client')
@mock.patch('tripleo_common.utils.passwords.'
'get_snmpd_readonly_user_password')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client', return_value="TestPassword")
'get_workflow_client', return_value="TestPassword")
@mock.patch('mistral.context.ctx')
def test_run(self, mock_ctx, mock_get_workflow_client,
mock_get_snmpd_readonly_user_password,
@@ -246,11 +246,11 @@ class GeneratePasswordsActionTest(base.TestCase):
"%s is not in %s" % (password_param_name, result))
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_orchestration_client')
'get_orchestration_client')
@mock.patch('tripleo_common.utils.passwords.'
'get_snmpd_readonly_user_password')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
'get_workflow_client')
@mock.patch('mistral.context.ctx')
def test_run_passwords_exist(self, mock_ctx, mock_get_workflow_client,
mock_get_snmpd_readonly_user_password,
@@ -284,11 +284,11 @@ class GeneratePasswordsActionTest(base.TestCase):
self.assertEqual(_EXISTING_PASSWORDS, result)
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_orchestration_client')
'get_orchestration_client')
@mock.patch('tripleo_common.utils.passwords.'
'get_snmpd_readonly_user_password')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
'get_workflow_client')
@mock.patch('mistral.context.ctx')
def test_passwords_exist_in_heat(self, mock_ctx, mock_get_workflow_client,
mock_get_snmpd_readonly_user_password,

24
tripleo_common/tests/actions/test_plan.py
View File

@@ -89,7 +89,7 @@ class CreateContainerActionTest(base.TestCase):
self.container_name = 'test-container'
self.expected_list = ['', [{'name': 'test1'}, {'name': 'test2'}]]
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
def test_run(self, get_obj_client_mock):
# Setup
@@ -107,7 +107,7 @@ class CreateContainerActionTest(base.TestCase):
headers=plan.default_container_headers
)
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
def test_run_container_exists(self, get_obj_client_mock):
# Setup
@@ -137,7 +137,7 @@ class CreatePlanActionTest(base.TestCase):
self.swift = mock.MagicMock()
self.swift.get_object.return_value = ({}, MAPPING_YAML_CONTENTS)
swift_patcher = mock.patch(
'tripleo_common.actions.base.TripleOAction._get_object_client',
'tripleo_common.actions.base.TripleOAction.get_object_client',
return_value=self.swift)
swift_patcher.start()
self.addCleanup(swift_patcher.stop)
@@ -146,7 +146,7 @@ class CreatePlanActionTest(base.TestCase):
self.mistral = mock.MagicMock()
self.mistral.environments.get.side_effect = mistral_base.APIException
mistral_patcher = mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client',
'tripleo_common.actions.base.TripleOAction.get_workflow_client',
return_value=self.mistral)
mistral_patcher.start()
self.addCleanup(mistral_patcher.stop)
@@ -230,9 +230,9 @@ class ListPlansActionTest(base.TestCase):
super(ListPlansActionTest, self).setUp()
self.container = 'overcloud'
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_run(self, get_workflow_client_mock, get_obj_client_mock):
# setup swift
@@ -278,7 +278,7 @@ class DeletePlanActionTest(base.TestCase):
)
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_orchestration_client')
'tripleo_common.actions.base.TripleOAction.get_orchestration_client')
def test_run_stack_exists(self, get_orchestration_client):
# setup heat
@@ -291,11 +291,11 @@ class DeletePlanActionTest(base.TestCase):
self.assertRaises(exception.StackInUseError, action.run)
heat.stacks.get.assert_called_with(self.container_name)
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_orchestration_client')
'tripleo_common.actions.base.TripleOAction.get_orchestration_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_run(self, get_workflow_client_mock, get_orchestration_client,
get_obj_client_mock):
@@ -354,9 +354,9 @@ class RoleListActionTest(base.TestCase):
super(RoleListActionTest, self).setUp()
self.container = 'overcloud'
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_run(self, workflow_client_mock, get_obj_client_mock):
# setup mistral

6
tripleo_common/tests/actions/test_scale.py
View File

@@ -41,13 +41,13 @@ class ScaleDownActionTest(base.TestCase):
self.image = collections.namedtuple('image', ['id'])
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_orchestration_client')
'get_orchestration_client')
@mock.patch('heatclient.common.template_utils.'
'process_multiple_environments_and_files')
@mock.patch('heatclient.common.template_utils.get_template_contents')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
'get_workflow_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('mistral.context.ctx')
def test_run(self, mock_ctx, mock_get_object_client,
mock_get_workflow_client, mock_get_template_contents,

12
tripleo_common/tests/actions/test_templates.py
View File

@@ -75,7 +75,7 @@ J2_EXCLUDES_EMPTY_FILE = """
class UploadTemplatesActionTest(base.TestCase):
@mock.patch('tempfile.NamedTemporaryFile')
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('tripleo_common.utils.tarball.'
'tarball_extract_to_swift_container')
@mock.patch('tripleo_common.utils.tarball.create_tarball')
@@ -99,8 +99,8 @@ class ProcessTemplatesActionTest(base.TestCase):
'process_multiple_environments_and_files')
@mock.patch('heatclient.common.template_utils.get_template_contents')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'_get_workflow_client')
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
'get_workflow_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('mistral.context.ctx')
def test_run(self, mock_ctx, mock_get_object_client,
mock_get_workflow_client, mock_get_template_contents,
@@ -141,7 +141,7 @@ class ProcessTemplatesActionTest(base.TestCase):
}
})
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('mistral.context.ctx')
def test_process_custom_roles(self, ctx_mock, get_obj_client_mock):
@@ -190,7 +190,7 @@ class ProcessTemplatesActionTest(base.TestCase):
swift.put_object.assert_has_calls(
put_object_mock_calls, any_order=True)
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('mistral.context.ctx')
def test_j2_render_and_put(self, ctx_mock, get_obj_client_mock):
@@ -210,7 +210,7 @@ class ProcessTemplatesActionTest(base.TestCase):
self.assertTrue("CustomRole" in str(action_result))
@mock.patch('tripleo_common.actions.base.TripleOAction._get_object_client')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch('mistral.context.ctx')
def test_get_j2_excludes_file(self, ctx_mock, get_obj_client_mock):

16
tripleo_common/tests/actions/test_validations.py
View File

@@ -27,7 +27,7 @@ from tripleo_common.tests.utils import test_validations
class GetPubkeyActionTest(base.TestCase):
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_run_existing_pubkey(self, get_workflow_client_mock):
mistral = mock.MagicMock()
get_workflow_client_mock.return_value = mistral
@@ -39,7 +39,7 @@ class GetPubkeyActionTest(base.TestCase):
self.assertEqual('existing_pubkey', action.run())
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
@mock.patch('tripleo_common.utils.validations.create_ssh_keypair')
@mock.patch('tempfile.mkdtemp')
@mock.patch('shutil.rmtree')
@@ -65,7 +65,7 @@ class GetPubkeyActionTest(base.TestCase):
class Enabled(base.TestCase):
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_validations_enabled(self, get_workflow_client_mock):
mistral = mock.MagicMock()
get_workflow_client_mock.return_value = mistral
@@ -75,7 +75,7 @@ class Enabled(base.TestCase):
self.assertEqual(result, True)
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_validations_disabled(self, get_workflow_client_mock):
mistral = mock.MagicMock()
get_workflow_client_mock.return_value = mistral
@@ -87,7 +87,7 @@ class Enabled(base.TestCase):
@mock.patch(
'tripleo_common.actions.validations.Enabled._validations_enabled')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_success_with_validations_enabled(self, get_workflow_client_mock,
validations_enabled_mock):
validations_enabled_mock.return_value = True
@@ -100,7 +100,7 @@ class Enabled(base.TestCase):
@mock.patch(
'tripleo_common.actions.validations.Enabled._validations_enabled')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
def test_success_with_validations_disabled(self, get_workflow_client_mock,
validations_enabled_mock):
validations_enabled_mock.return_value = False
@@ -146,7 +146,7 @@ class ListGroupsActionTest(base.TestCase):
class RunValidationActionTest(base.TestCase):
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
@mock.patch('tripleo_common.utils.validations.write_identity_file')
@mock.patch('tripleo_common.utils.validations.cleanup_identity_file')
@mock.patch('tripleo_common.utils.validations.run_validation')
@@ -177,7 +177,7 @@ class RunValidationActionTest(base.TestCase):
'identity_file_path')
@mock.patch(
'tripleo_common.actions.base.TripleOAction._get_workflow_client')
'tripleo_common.actions.base.TripleOAction.get_workflow_client')
@mock.patch('tripleo_common.utils.validations.write_identity_file')
@mock.patch('tripleo_common.utils.validations.cleanup_identity_file')
@mock.patch('tripleo_common.utils.validations.run_validation')