openstack
/
python-tripleoclient
Code Issues Proposed changes

Remove usage of GenerateFencingParametersAction action class 

Replace with tripleo-common utils api.

Change-Id: I5fdecc3a9a2bd46f7d8056144c8b1d68f170878d
This commit is contained in:
Rabi Mishra 2020-03-30 15:10:14 +05:30
parent 98258c1a49
commit 71ca2d1073
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tripleoclient/tests/workflows/test_parameters.py
View File

@ -45,25 +45,14 @@ class TestParameterWorkflows(utils.TestCommand):
self.tripleoclient.messaging_websocket.return_value = self.websocket
self.app.client_manager.tripleoclient = self.tripleoclient
self.app.client_manager.orchestration = self.orchestration
self.app.client_manager.baremetal = mock.Mock()
self.app.client_manager.compute = mock.Mock()
execution = mock.Mock()
execution.id = "IDID"
self.workflow.executions.create.return_value = execution
get_container = self.tripleoclient.object_store.get_container \
= mock.MagicMock()
get_container.return_value = ('container', [{'name': 'f1'}])
roles = mock.patch(
'tripleoclient.workflows.roles.list_available_roles',
autospec=True,
return_value=[
{
'TestRole1': {
'TestParameter1': {}
}
}
]
)
roles.start()
self.addCleanup(roles.stop)
flatten = mock.patch(
'tripleo_common.utils.stack_parameters.get_flattened_parameters',
@ -224,10 +213,8 @@ class TestParameterWorkflows(utils.TestCommand):
self.assertTrue(mock_log.warning.called)
@mock.patch(
'tripleo_common.actions.parameters.GenerateFencingParametersAction'
'.run',
autospec=True
)
'tripleo_common.utils.stack_parameters.generate_fencing_parameters',
return_value={})
def test_generate_fencing_parameters(self, mock_params):
mock_params.return_value = {"parameter_defaults": {}}

10
tripleoclient/workflows/parameters.py
View File

@ -14,7 +14,6 @@ import logging
import re
import yaml
from tripleo_common.actions import parameters
from tripleo_common.utils import stack_parameters as stk_parameters
from tripleoclient.constants import UNUSED_PARAMETER_EXCLUDES_RE
@ -210,12 +209,11 @@ def generate_fencing_parameters(clients, nodes_json, delay, ipmi_level,
:returns: Dictionary
"""
context = clients.tripleoclient.create_mistral_context()
fencing_params = parameters.GenerateFencingParametersAction(
return stk_parameters.generate_fencing_parameters(
clients.baremetal,
clients.compute,
nodes_json=nodes_json,
delay=delay,
ipmi_level=ipmi_level,
ipmi_cipher=ipmi_cipher,
ipmi_lanplus=ipmi_lanplus
)
return fencing_params.run(context=context)
ipmi_lanplus=ipmi_lanplus)