diff options
Diffstat (limited to 'sdnvpn')
| -rw-r--r-- | sdnvpn/test/functest/config.yaml | 13 | ||||
| -rw-r--r-- | sdnvpn/test/functest/run_tempest.py | 59 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_9.py | 18 |
3 files changed, 14 insertions, 76 deletions
diff --git a/sdnvpn/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml index 40703f3..31dce67 100644 --- a/sdnvpn/test/functest/config.yaml +++ b/sdnvpn/test/functest/config.yaml @@ -2,19 +2,6 @@ defaults: flavor: m1.tiny # adapt to your environment testcases: - sdnvpn.test.functest.run_tempest: - enabled: true - order: 0 - description: Neutron BGPVPN tests in tempest - image_name: bgpvpn-tempest-image - functest_conf: - case_name: bgpvpn-tempest-tests - run: - args: - mode: '^networking_bgpvpn_tempest\.' - option: - - '--concurrency=4' - sdnvpn.test.functest.testcase_1: enabled: true order: 1 diff --git a/sdnvpn/test/functest/run_tempest.py b/sdnvpn/test/functest/run_tempest.py deleted file mode 100644 index f56b18f..0000000 --- a/sdnvpn/test/functest/run_tempest.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env python -# -# Copyright (c) 2018 All rights reserved -# This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# -import logging -import os - -from functest.opnfv_tests.openstack.tempest.tempest import TempestCommon -from six.moves import configparser - -from sdnvpn.lib import config as sdnvpn_config - - -logger = logging.getLogger('sdnvpn-tempest') - -TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig( - 'sdnvpn.test.functest.run_tempest') - - -class BgpvpnTempest(TempestCommon): - def configure(self, **kwargs): - super(BgpvpnTempest, self).configure(**kwargs) - rconfig = configparser.RawConfigParser() - rconfig.read(self.conf_file) - rconfig.set('service_available', 'bgpvpn', 'True') - logger.debug("Updating %s with bgpvpn=True" - % self.conf_file) - with open(self.conf_file, 'wb') as config_file: - rconfig.write(config_file) - self.backup_tempest_config(self.conf_file, self.res_dir) - - -def main(): - try: - test_case = BgpvpnTempest(**TESTCASE_CONFIG.functest_conf) - except Exception as e: - logger.error("Initialization of bgpvpn tempest failed: %s" % e) - status = 'FAIL' - else: - test_case.check_requirements() - try: - test_case.run(**TESTCASE_CONFIG.functest_conf['run']['args']) - except KeyError: - test_case.run() - status = 'PASS' if (test_case.is_successful() == os.EX_OK) else 'FAIL' - test_case.clean() - - return {'status': status, - 'details': 'Tempest testcases have been completed'} - - -if __name__ == '__main__': - main() 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") |