x
/
cloudpulse
Code Issues Proposed changes

Merge "Adding docker tests to cloudpulse"

This commit is contained in:
Jenkins 2016-04-20 07:12:34 +00:00 committed by Gerrit Code Review
parent 6e7070dafd c59831c45d
commit e80d0602b9
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloudpulse/operator/ansible/ansible_runner.py
View File

@ -192,7 +192,9 @@ class ansible_runner(object):
if 'failed' in results['contacted'][node]:
if results['contacted'][node]['failed'] is True:
results['status'] = 'FAIL'
results['status_message'] = ''
results['status_message'] = " ".join(
[("%s -> %s") % (key, results['dark'][key])
for key in results['dark']])
for node in results['contacted'].keys():
rc = results['contacted'][node].get('rc', None)

24
cloudpulse/scenario/plugins/operator_tests/operator.py
View File

@ -44,7 +44,10 @@ PERIODIC_TESTS_OPTS = [
help='The galera periodic check'),
cfg.IntOpt('ceph_check',
default=0,
help='The ceph periodic check')
help='The ceph periodic check'),
cfg.IntOpt('docker_check',
default=0,
help='The docker periodic check')
]
CONF = cfg.CONF
@ -143,6 +146,25 @@ class operator_scenario(base.Scenario):
return (404, ("Galera Cluster Test Failed: %s" %
results['status_message']), [])
@base.scenario(admin_only=False, operator=True)
def docker_check(self):
self.load()
cmd = "docker ps -aq --filter 'status=exited'"
out = self.ans_runner.execute(cmd)
results, failed_hosts = self.ans_runner.validate_results(out)
if results['status'] is 'PASS':
docker_failed = {key: results['contacted'][key]['stdout']
for key in results['contacted']
if results['contacted'][key]['stdout']}
if docker_failed:
docker_str = " ".join(["Containers failed in %s : %s" % (
key, docker_failed[key]) for key in docker_failed])
return (404, docker_str, [])
else:
return (200, "All docker containers are up",
['Docker container Test Passed'])
@base.scenario(admin_only=False, operator=True)
def ceph_check(self):
self.load()