openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Support multiple messages from introspect workflow"

Browse Source
This commit is contained in:
Jenkins
2017-03-30 03:46:21 +00:00
committed by Gerrit Code Review
parent 7076c58d16 f71fc36a3c
commit 65afc3e3d7
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tripleoclient/tests/workflows/test_baremetal.py
View File

@@ -145,10 +145,7 @@ class TestBaremetalWorkflows(utils.TestCommand):
def test_introspect_success(self):
self.websocket.wait_for_message.return_value = {
"status": "SUCCESS",
"introspected_nodes": {}
}
self.websocket.wait_for_messages.return_value = self.message_success
baremetal.introspect(self.app.client_manager, node_uuids=[],
run_validations=True, queue_name="QUEUE_NAME")
@@ -163,11 +160,7 @@ class TestBaremetalWorkflows(utils.TestCommand):
def test_introspect_error(self):
self.websocket.wait_for_message.return_value = {
"status": "FAIL",
"message": "Failed",
"introspected_nodes": {}
}
self.websocket.wait_for_messages.return_value = self.message_failed
self.assertRaises(
exceptions.IntrospectionError,

4
tripleoclient/workflows/baremetal.py
View File

@@ -116,7 +116,9 @@ def introspect(clients, **workflow_input):
print("Waiting for introspection to finish...")
with tripleoclients.messaging_websocket(queue_name) as ws:
payload = ws.wait_for_message(execution.id)
for payload in base.wait_for_messages(workflow_client, ws, execution):
if 'message' in payload:
print(payload['message'])
if payload['status'] == 'SUCCESS':
print('Successfully introspected all nodes.')