summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2015-11-23 14:19:44 -0500
committerKenny Woodson <kwoodson@redhat.com>2015-11-23 14:21:50 -0500
commit6f64159147a99f5b514bd48047a038c15692928b (patch)
treed321e65fd2373b9b2ed20afde8c6605a862b5773
parent8e979def0a56b40ab8a3acbd2e1a146457a5aaa6 (diff)
downloadopenshift-6f64159147a99f5b514bd48047a038c15692928b.tar.gz
openshift-6f64159147a99f5b514bd48047a038c15692928b.tar.bz2
openshift-6f64159147a99f5b514bd48047a038c15692928b.tar.xz
openshift-6f64159147a99f5b514bd48047a038c15692928b.zip
Modified step params to be in order when passed as a list
-rw-r--r--roles/lib_zabbix/library/zbx_httptest.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/roles/lib_zabbix/library/zbx_httptest.py b/roles/lib_zabbix/library/zbx_httptest.py
index 96733b3d1..6b28117ad 100644
--- a/roles/lib_zabbix/library/zbx_httptest.py
+++ b/roles/lib_zabbix/library/zbx_httptest.py
@@ -131,6 +131,14 @@ def steps_equal(zab_steps, user_steps):
return True
+def process_steps(steps):
+ '''Preprocess the step parameters'''
+ for idx, step in enumerate(steps):
+ if not step.has_key('no'):
+ step['no'] = idx + 1
+
+ return steps
+
# The branches are needed for CRUD and error handling
# pylint: disable=too-many-branches
def main():
@@ -218,7 +226,7 @@ def main():
'hostid': hostid,
'agent': module.params['agent'],
'retries': module.params['retries'],
- 'steps': module.params['steps'],
+ 'steps': process_steps(module.params['steps']),
'applicationid': get_app_id(zapi, module.params['application']),
'delay': module.params['interval'],
'verify_host': get_verify_host(module.params['verify_host']),