From 6ac1ad253dac7eed8a922de893f3021f849ab34d Mon Sep 17 00:00:00 2001 From: Sawan Choudhary Date: Thu, 8 Mar 2018 12:42:08 -0800 Subject: [PATCH] Add container name in addtion to node IP in docker_check failed o/p Change-Id: I88a0c3ada509dda32bc2e996b86d2547ff012bfe --- .../scenario/plugins/operator_tests/operator.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cloudpulse/scenario/plugins/operator_tests/operator.py b/cloudpulse/scenario/plugins/operator_tests/operator.py index 0782865..beb8e02 100644 --- a/cloudpulse/scenario/plugins/operator_tests/operator.py +++ b/cloudpulse/scenario/plugins/operator_tests/operator.py @@ -220,7 +220,8 @@ class operator_scenario(base.Scenario): nodeip_list = [node.ip for node in node_list] anscmd = "ansible -o all -i %s -a " % ','.join(nodeip_list) - cmd = "'docker ps -aq --filter %s '" % "status=exited" + cmd = "'docker ps -a --format \{\{.Names\}\} --filter %s '" \ + % "status=exited" cmd = anscmd + cmd + ' -u root' res = execute(cmd) @@ -236,7 +237,7 @@ class operator_scenario(base.Scenario): continue if 'SUCCESS' not in line[1]: if docker_failed: - docker_failed = docker_failed + ',' + line[0] + docker_failed = "{}, {}".format(docker_failed, line[0]) else: docker_failed = line[0] else: @@ -244,9 +245,13 @@ class operator_scenario(base.Scenario): line[3] = line[3].replace('(stdout)', '') if not re.match(r'^\s*$', line[3]): if docker_failed: - docker_failed = docker_failed + ',' + line[0] + docker_failed = "{}, {}: {}"\ + .format(docker_failed, + line[0].strip(), + line[3]) else: - docker_failed = line[0] + docker_failed = "{}: {}".format(line[0].strip(), + line[3]) if docker_failed: return (404, docker_failed, []) else: