Stop mocking workflow client
We have already removed Mistral, so we no longer need these. Change-Id: I0b9215293525c70555f9ad7224d780057eb74560
This commit is contained in:
@@ -187,10 +187,8 @@ class FakeStackObject(object):
|
||||
class FakeClientManager(object):
|
||||
def __init__(self):
|
||||
self.identity = None
|
||||
self.workflow_engine = None
|
||||
self.auth_ref = None
|
||||
self.tripleoclient = FakeClientWrapper()
|
||||
self.workflow_engine = mock.Mock()
|
||||
|
||||
|
||||
class FakeHandle(object):
|
||||
|
||||
@@ -61,7 +61,6 @@ class TestBaremetal(utils.TestCommand):
|
||||
self.app.client_manager.baremetal_introspection = FakeInspectorClient()
|
||||
self.app.client_manager._region_name = "Arcadia"
|
||||
self.app.client_manager.session = mock.Mock()
|
||||
self.app.client_manager.workflow_engine = mock.Mock()
|
||||
self.app.client_manager.tripleoclient = ClientWrapper()
|
||||
|
||||
def tearDown(self):
|
||||
|
||||
@@ -33,8 +33,6 @@ class TestOvercloudBackup(utils.TestCommand):
|
||||
app_args.verbose_level = 1
|
||||
self.app.options = fakes.FakeOptions()
|
||||
self.cmd = overcloud_backup.BackupOvercloud(self.app, app_args)
|
||||
self.app.client_manager.workflow_engine = mock.Mock()
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
self.inventory = '/tmp/test_inventory.yaml'
|
||||
self.file = open(self.inventory, 'w').close()
|
||||
|
||||
@@ -378,8 +376,6 @@ class TestOvercloudSnapshot(utils.TestCommand):
|
||||
app_args.verbose_level = 1
|
||||
self.app.options = fakes.FakeOptions()
|
||||
self.cmd = overcloud_backup.BackupSnapshot(self.app, app_args)
|
||||
self.app.client_manager.workflow_engine = mock.Mock()
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
self.inventory = '/tmp/test_inventory.yaml'
|
||||
self.file = open(self.inventory, 'w').close()
|
||||
|
||||
|
||||
@@ -32,8 +32,6 @@ class TestOvercloudRestore(utils.TestCommand):
|
||||
app_args.verbose_level = 1
|
||||
self.app.options = fakes.FakeOptions()
|
||||
self.cmd = overcloud_restore.RestoreOvercloud(self.app, app_args)
|
||||
self.app.client_manager.workflow_engine = mock.Mock()
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
self.inventory = '/tmp/test_inventory.yaml'
|
||||
self.file = open(self.inventory, 'w').close()
|
||||
|
||||
|
||||
@@ -24,7 +24,6 @@ from tripleoclient.v1 import overcloud_bios
|
||||
class Base(fakes.TestBaremetal):
|
||||
def setUp(self):
|
||||
super(Base, self).setUp()
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
self.conf = {
|
||||
"settings": [
|
||||
{"name": "virtualization", "value": "on"},
|
||||
@@ -33,10 +32,6 @@ class Base(fakes.TestBaremetal):
|
||||
}
|
||||
self.app.client_manager.baremetal.node.list.return_value = []
|
||||
|
||||
self.execution = self.workflow.executions.create.return_value
|
||||
self.execution.id = 'fake id'
|
||||
self.execution.output = '{"result": null}'
|
||||
|
||||
|
||||
class TestConfigureBIOS(Base):
|
||||
|
||||
@@ -86,7 +81,6 @@ class TestConfigureBIOS(Base):
|
||||
|
||||
self.assertRaisesRegex(RuntimeError, 'cannot be parsed as YAML',
|
||||
self.cmd.take_action, parsed_args)
|
||||
self.assertFalse(self.workflow.executions.create.called)
|
||||
|
||||
def test_configure_specified_nodes_and_configuration_bad_type(self):
|
||||
for conf in ('[]', '{"settings": 42}', '{settings: [42]}'):
|
||||
@@ -98,7 +92,6 @@ class TestConfigureBIOS(Base):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaises(TypeError, self.cmd.take_action, parsed_args)
|
||||
self.assertFalse(self.workflow.executions.create.called)
|
||||
|
||||
def test_configure_specified_nodes_and_configuration_bad_value(self):
|
||||
conf = '{"another_key": [{}]}'
|
||||
@@ -110,7 +103,6 @@ class TestConfigureBIOS(Base):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaises(ValueError, self.cmd.take_action, parsed_args)
|
||||
self.assertFalse(self.workflow.executions.create.called)
|
||||
|
||||
def test_configure_uuids_and_all_both_specified(self):
|
||||
conf = json.dumps(self.conf)
|
||||
@@ -169,7 +161,6 @@ class TestResetBIOS(Base):
|
||||
verifylist = []
|
||||
self.assertRaises(test_utils.ParserException, self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
self.assertFalse(self.workflow.executions.create.called)
|
||||
|
||||
def test_reset_uuids_and_all_both_specified(self):
|
||||
arglist = ['node_uuid1', 'node_uuid2', '--all-manageable']
|
||||
|
||||
@@ -30,7 +30,6 @@ class TestCreateRAID(fakes.TestBaremetal):
|
||||
self.app.options = ooofakes.FakeOptions()
|
||||
self.cmd = overcloud_raid.CreateRAID(self.app, app_args)
|
||||
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
self.conf = {
|
||||
"logical_disks": [
|
||||
{"foo": "bar"},
|
||||
@@ -43,7 +42,6 @@ class TestCreateRAID(fakes.TestBaremetal):
|
||||
})
|
||||
)
|
||||
execution.id = "IDID"
|
||||
self.workflow.executions.create.return_value = execution
|
||||
playbook_runner = mock.patch(
|
||||
'tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True
|
||||
@@ -81,7 +79,6 @@ class TestCreateRAID(fakes.TestBaremetal):
|
||||
]
|
||||
self.assertRaises(test_utils.ParserException, self.check_parser,
|
||||
self.cmd, arglist, verifylist)
|
||||
self.assertFalse(self.workflow.executions.create.called)
|
||||
|
||||
def test_not_yaml(self):
|
||||
arglist = ['--node', 'uuid1', '--node', 'uuid2', ':']
|
||||
@@ -93,7 +90,6 @@ class TestCreateRAID(fakes.TestBaremetal):
|
||||
|
||||
self.assertRaisesRegex(RuntimeError, 'cannot be parsed as YAML',
|
||||
self.cmd.take_action, parsed_args)
|
||||
self.assertFalse(self.workflow.executions.create.called)
|
||||
|
||||
def test_bad_type(self):
|
||||
for conf in ('[]', '{logical_disks: 42}', '{logical_disks: [42]}'):
|
||||
@@ -105,7 +101,6 @@ class TestCreateRAID(fakes.TestBaremetal):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaises(TypeError, self.cmd.take_action, parsed_args)
|
||||
self.assertFalse(self.workflow.executions.create.called)
|
||||
|
||||
def test_bad_value(self):
|
||||
conf = '{another_key: [{}]}'
|
||||
@@ -117,4 +112,3 @@ class TestCreateRAID(fakes.TestBaremetal):
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaises(ValueError, self.cmd.take_action, parsed_args)
|
||||
self.assertFalse(self.workflow.executions.create.called)
|
||||
|
||||
@@ -33,8 +33,6 @@ class TestUndercloudBackup(utils.TestCommand):
|
||||
app_args.verbose_level = 1
|
||||
self.app.options = fakes.FakeOptions()
|
||||
self.cmd = undercloud_backup.BackupUndercloud(self.app, app_args)
|
||||
self.app.client_manager.workflow_engine = mock.Mock()
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
self.inventory = '/tmp/test_inventory.yaml'
|
||||
self.file = open(self.inventory, 'w').close()
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@ class TestBaremetalWorkflows(fakes.FakePlaybookExecution):
|
||||
|
||||
def setUp(self):
|
||||
super(TestBaremetalWorkflows, self).setUp()
|
||||
self.app.client_manager.workflow_engine = self.workflow = mock.Mock()
|
||||
self.glance = self.app.client_manager.image = mock.Mock()
|
||||
self.tripleoclient = mock.Mock()
|
||||
self.app.client_manager.tripleoclient = self.tripleoclient
|
||||
|
||||
Reference in New Issue
Block a user