summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikos Karandreas <nick@intracom-telecom.com>2018-10-05 10:48:04 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-10-05 10:48:04 +0000
commitd94a5050a1f33c4ef84e546f5d44f731b7c93ab6 (patch)
tree1af86431ffeb12ff21f9033fd6e782a49e28037e
parent7b1b9e2ff57ceb2a75b3d60b95262c12e1823586 (diff)
parent3c95b11bcd889f1a5e9eb76ade16e985ceec1f03 (diff)
Merge "Fix testcase_9"
-rw-r--r--sdnvpn/test/functest/testcase_9.py18
1 files changed, 14 insertions, 4 deletions
diff --git a/sdnvpn/test/functest/testcase_9.py b/sdnvpn/test/functest/testcase_9.py
index b77360d..c74ceb5 100644
--- a/sdnvpn/test/functest/testcase_9.py
+++ b/sdnvpn/test/functest/testcase_9.py
@@ -15,6 +15,7 @@
# - Verify that the OpenDaylight and gateway Quagga peer
import logging
import sys
+import os
from sdnvpn.lib import config as sdnvpn_config
from sdnvpn.lib import utils as test_utils
@@ -34,12 +35,21 @@ 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)]
msg = ("Verify that all OpenStack nodes OVS br-int have "
"fail_mode set to secure")