Catch devops error if inspecting containers goes wrong

In case something is wrong with inspecting containers catch DevopsError
instead of failing whole deployment

Change-Id: Ib4888c30c6b1dcae8d6094f769246fac6b41e164
This commit is contained in:
Volodymyr Shypyguzov 2016-11-24 17:27:58 +02:00
parent e1d0e06d99
commit 27e62c6f13
1 changed files with 17 additions and 12 deletions

View File

@ -16,6 +16,7 @@ import re
import json
from devops.helpers import helpers
from devops.error import DevopsError
from fuel_ccp_tests import logger
@ -75,15 +76,19 @@ def inspect_docker_containers(image_name, underlay, host_ip):
if result:
LOG.info("Inspecting running containers with name={name}: on: {node}".
format(name=image_name, node=host_ip))
for container in result.stdout_json:
raw_out = container['Config']['Labels']
labels = json.dumps(
raw_out,
indent=4,
separators=(',', ': '),
sort_keys=True
)
LOG.info("Docker container {name} Labels: {labels}".format(
name=container['Name'],
labels=labels)
)
try:
for container in result.stdout_json:
raw_out = container['Config']['Labels']
labels = json.dumps(
raw_out,
indent=4,
separators=(',', ': '),
sort_keys=True
)
LOG.info("Docker container {name} Labels: {labels}".format(
name=container['Name'],
labels=labels)
)
except DevopsError:
LOG.info("{} stdout is not a valid json. Stdout:{}".format(
cmd, result.stdout))