diff options
| author |   ReemMahmoud <rfawzy.ext@orange.com> | 2018-03-22 12:06:48 +0200 |
|---|---|---|
| committer |   sgdt6900 <rhanafy.ext@orange.com> | 2018-03-26 16:28:53 +0200 |
| commit | 7cf97412a3e8059c4ddd0a471bc3095a7b5a266b (patch) | |
| tree | 389c4b9c5587d09699e7e92d1e1d89b0d7b3fe5e /moon_orchestrator/moon_orchestrator/drivers.py | |
| parent | 6d2dbd0af7da445b39bbb7e16a36260268c685cd (diff) | |
Add more tests and fix bug in moon_orchestrator
adding more validation
adding more test cases covering pods, slaves
applying comments mentioned
Change-Id: I7e58f184a3f216fc3740097244a5538c184bd940
Signed-off-by: ReemMahmoud <rfawzy.ext@orange.com>
Diffstat (limited to 'moon_orchestrator/moon_orchestrator/drivers.py')
| -rw-r--r-- | moon_orchestrator/moon_orchestrator/drivers.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/moon_orchestrator/moon_orchestrator/drivers.py b/moon_orchestrator/moon_orchestrator/drivers.py index bb0d0c2c..4519f3aa 100644 --- a/moon_orchestrator/moon_orchestrator/drivers.py +++ b/moon_orchestrator/moon_orchestrator/drivers.py @@ -203,13 +203,14 @@ class K8S(Driver): for key, value in pods.items(): # logger.info("ctx={}".format(active_context)) # logger.info("value={}".format(value)) - if active_context["name"] == value[0].get('slave_name'): - data = dict(active_context) - data["wrapper_name"] = value[0]['name'] - data["ip"] = value[0].get("ip", "NC") - data["port"] = value[0].get("external_port", "NC") - slaves.append(data) - break + if "name" in active_context and value and "name" in value[0]: + if active_context["name"] == value[0].get('slave_name'): + data = dict(active_context) + data["wrapper_name"] = value[0]['name'] + data["ip"] = value[0].get("ip", "NC") + data["port"] = value[0].get("external_port", "NC") + slaves.append(data) + break return slaves for ctx in contexts: data = dict(ctx) @@ -217,12 +218,13 @@ class K8S(Driver): for key, value in pods.items(): # logger.info("ctx={}".format(ctx)) # logger.info("value={}".format(value)) - if ctx["name"] == value[0].get('slave_name'): - data["wrapper_name"] = value[0]['name'] - data["ip"] = value[0].get("ip", "NC") - data["port"] = value[0].get("external_port", "NC") - data["configured"] = True - break + if "name" in ctx and value and "name" in value[0]: + if ctx["name"] == value[0].get('slave_name'): + data["wrapper_name"] = value[0]['name'] + data["ip"] = value[0].get("ip", "NC") + data["port"] = value[0].get("external_port", "NC") + data["configured"] = True + break slaves.append(data) return slaves |