diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | docs/conf.py | 1 | ||||
| -rw-r--r-- | docs/conf.yaml | 3 | ||||
| -rw-r--r-- | docs/development/overview/index.rst | 22 | ||||
| -rw-r--r-- | docs/index.rst | 23 | ||||
| -rw-r--r-- | docs/requirements.txt | 2 | ||||
| -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_3.py | 17 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_9.py | 18 | ||||
| -rw-r--r-- | tox.ini | 17 |
11 files changed, 76 insertions, 102 deletions
@@ -3,7 +3,6 @@ *.pyc *~ .*.sw? -/docs_build/ /docs_output/ /releng/ *.tar.gz @@ -13,3 +12,5 @@ odl-pipeline/build/* odl-pipeline/trash/* odl-pipeline/lib/tmp odl-pipeline/disks/* +.tox +docs/_build/* diff --git a/docs/conf.py b/docs/conf.py new file mode 100644 index 0000000..eb12e74 --- /dev/null +++ b/docs/conf.py @@ -0,0 +1 @@ +from docs_conf.conf import * # noqa: F401,F403 diff --git a/docs/conf.yaml b/docs/conf.yaml new file mode 100644 index 0000000..4175c7c --- /dev/null +++ b/docs/conf.yaml @@ -0,0 +1,3 @@ +--- +project_cfg: opnfv +project: SDNVPN diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst index 4511e0a..1127130 100644 --- a/docs/development/overview/index.rst +++ b/docs/development/overview/index.rst @@ -23,28 +23,6 @@ SDNVPN Testing Suite An overview of the SDNVPN Test is depicted here. A more detailed description of each test case can be found at `SDNVPN Testing <https://wiki.opnfv.org/display/sdnvpn/SDNVPN+Testing>`_. -BGPVPN Tempest test cases -""""""""""""""""""""""""" - -#. Create BGPVPN passes -#. Create BGPVPN as non-admin fails -#. Delete BGPVPN as non-admin fails -#. Show BGPVPN as non-owner fails -#. List BGPVPNs as non-owner fails -#. Show network associated BGPVPNs as non-owner fails -#. List network associated BGPVPNs as non-owner fails -#. Associate/Deassociate a network to a BGPVPN resource passes -#. Update route targets on a BGPVPN passes -#. Update route targets on a BGPVPN as non-admin fails -#. Reject the creation of BGPVPN with invalid route targets passes -#. Reject the update of BGPVPN with invalid route targets passes -#. Reject the association on an invalid network to a BGPVPN passes -#. Reject the diassociation on an invalid network to a BGPVPN passes -#. Associate/Deassociate a router to a BGPVPN resource passes -#. Attach the subnet of an associated network to an associated router of the same BGVPN passes - - - Functest scenario specific tests """""""""""""""""""""""""""""""""" - **Test Case 1**: VPN provides connectivity between subnets, using network association diff --git a/docs/index.rst b/docs/index.rst new file mode 100644 index 0000000..d07beb2 --- /dev/null +++ b/docs/index.rst @@ -0,0 +1,23 @@ +.. _sdnvpn: + +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. SPDX-License-Identifier CC-BY-4.0 +.. (c) Open Platform for NFV Project, Inc. and its contributors + +********************************* +OPNFV SDNVPN +********************************* + +.. toctree:: + :numbered: + :maxdepth: 3 + + release/release-notes/index + release/configguide/index + release/userguide/index + release/installation/index + development/requirements/index + development/overview/index + development/design/index + diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000..9fde2df --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1,2 @@ +lfdocs-conf +sphinx_opnfv_theme 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_3.py b/sdnvpn/test/functest/testcase_3.py index c942f0b..3d202c5 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") 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") @@ -0,0 +1,17 @@ +[tox] +minversion = 1.6 +envlist = + docs, + docs-linkcheck +skipsdist = true + +[testenv:docs] +deps = -rdocs/requirements.txt +commands = + sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html + echo "Generated docs available in {toxinidir}/docs/_build/html" +whitelist_externals = echo + +[testenv:docs-linkcheck] +deps = -rdocs/requirements.txt +commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck |