summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikos Karandreas <nick@intracom-telecom.com>2018-10-05 10:50:12 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-05 10:50:12 +0000
commitb80455110aaaadafcd416b6a8e39467071cb6a62 (patch)
treeb67cf43e281d86de38c7dfca223f75ddc1ff8d86
parentd94a5050a1f33c4ef84e546f5d44f731b7c93ab6 (diff)
parentf506fc56c70f7d4a220264f1ab172b6adca12be5 (diff)
Merge "Fix testcase_3"
-rw-r--r--sdnvpn/test/functest/testcase_3.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index b06915a..258652f 100644
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -40,12 +40,23 @@ def main():
results.add_to_summary(0, "=")
openstack_nodes = test_utils.get_nodes()
+ installer_type = str(os.environ['INSTALLER_TYPE'].lower())
# node.is_odl() doesn't work in Apex
# https://jira.opnfv.org/browse/RELENG-192
- controllers = [node for node in openstack_nodes
- if "running" in
- node.run_cmd("sudo systemctl status opendaylight")]
+ fuel_cmd = "sudo systemctl status opendaylight"
+ apex_cmd = "sudo docker exec opendaylight_api " \
+ "/opt/opendaylight/bin/status"
+ health_cmd = "sudo docker ps -f name=opendaylight_api -f " \
+ "health=healthy -q"
+ if installer_type in ["fuel"]:
+ controllers = [node for node in openstack_nodes
+ if "running" in node.run_cmd(fuel_cmd)]
+ elif installer_type in ["apex"]:
+ controllers = [node for node in openstack_nodes
+ if node.run_cmd(health_cmd)
+ if "Running" in node.run_cmd(apex_cmd)]
+
computes = [node for node in openstack_nodes if node.is_compute()]
msg = ("Verify that OpenDaylight can start/communicate with zrpcd/Quagga")