diff options
| -rw-r--r-- | docs/development/design/index.rst | 11 | ||||
| -rw-r--r-- | docs/development/overview/index.rst | 21 | ||||
| -rw-r--r-- | docs/development/requirements/index.rst | 11 | ||||
| -rw-r--r-- | docs/release/configguide/index.rst | 11 | ||||
| -rw-r--r-- | docs/release/installation/index.rst | 11 | ||||
| -rw-r--r-- | docs/release/release-notes/index.rst (renamed from docs/release-notes/index.rst) | 0 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst (renamed from docs/release-notes/release-notes.rst) | 0 | ||||
| -rw-r--r-- | docs/release/scenarios/os-odl_l2-bgpvpn/index.rst (renamed from docs/scenarios/os-odl_l2-bgpvpn/index.rst) | 0 | ||||
| -rw-r--r-- | docs/release/scenarios/os-odl_l2-bgpvpn/scenario.description.rst (renamed from docs/scenarios/os-odl_l2-bgpvpn/scenario.description.rst) | 0 | ||||
| -rw-r--r-- | docs/release/userguide/feature.userguide.rst (renamed from docs/userguide/feature.userguide.rst) | 0 | ||||
| -rw-r--r-- | docs/release/userguide/index.rst (renamed from docs/userguide/index.rst) | 0 | ||||
| -rw-r--r-- | sdnvpn/test/functest/run_tests.py | 19 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 4 |
13 files changed, 76 insertions, 12 deletions
diff --git a/docs/development/design/index.rst b/docs/development/design/index.rst new file mode 100644 index 0000000..44e0058 --- /dev/null +++ b/docs/development/design/index.rst @@ -0,0 +1,11 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) Tim Irnich, (tim.irnich@ericsson.com) and others + +======= +SDN VPN +======= + +.. include:: ../../release/userguide/feature.userguide.rst + + diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst new file mode 100644 index 0000000..8bd29f8 --- /dev/null +++ b/docs/development/overview/index.rst @@ -0,0 +1,21 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) Tim Irnich, (tim.irnich@ericsson.com) and others + +======= +SDN VPN +======= + +A high-level description of the scenarios is provided in this section. +For details of the scenarios and their provided capabilities refer to +the scenario description document: +http://artifacts.opnfv.org/danube/sdnpvn/scenarios/os-odl_l2-bgpvpn/index.html + +The BGPVPN feature enables creation of BGP VPNs on the Neutron API according to the OpenStack +BGPVPN blueprint at https://blueprints.launchpad.net/neutron/+spec/neutron-bgp-vpn. +In a nutshell, the blueprint defines a BGPVPN object and a number of ways +how to associate it with the existing Neutron object model, as well as a unique +definition of the related semantics. The BGPVPN framework supports a backend +driver model with currently available drivers for Bagpipe, OpenContrail, Nuage +and OpenDaylight. The OPNFV scenario makes use of the OpenDaylight driver and backend +implementation through the ODL NetVirt project. diff --git a/docs/development/requirements/index.rst b/docs/development/requirements/index.rst new file mode 100644 index 0000000..44e0058 --- /dev/null +++ b/docs/development/requirements/index.rst @@ -0,0 +1,11 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) Tim Irnich, (tim.irnich@ericsson.com) and others + +======= +SDN VPN +======= + +.. include:: ../../release/userguide/feature.userguide.rst + + diff --git a/docs/release/configguide/index.rst b/docs/release/configguide/index.rst new file mode 100644 index 0000000..9fe2e30 --- /dev/null +++ b/docs/release/configguide/index.rst @@ -0,0 +1,11 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) Tim Irnich, (tim.irnich@ericsson.com) and others + +======= +SDN VPN +======= + +.. include:: ../userguide/feature.userguide.rst + + diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst new file mode 100644 index 0000000..9fe2e30 --- /dev/null +++ b/docs/release/installation/index.rst @@ -0,0 +1,11 @@ +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) Tim Irnich, (tim.irnich@ericsson.com) and others + +======= +SDN VPN +======= + +.. include:: ../userguide/feature.userguide.rst + + diff --git a/docs/release-notes/index.rst b/docs/release/release-notes/index.rst index 4f7261d..4f7261d 100644 --- a/docs/release-notes/index.rst +++ b/docs/release/release-notes/index.rst diff --git a/docs/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index fe0fbbe..fe0fbbe 100644 --- a/docs/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst diff --git a/docs/scenarios/os-odl_l2-bgpvpn/index.rst b/docs/release/scenarios/os-odl_l2-bgpvpn/index.rst index 2389706..2389706 100644 --- a/docs/scenarios/os-odl_l2-bgpvpn/index.rst +++ b/docs/release/scenarios/os-odl_l2-bgpvpn/index.rst diff --git a/docs/scenarios/os-odl_l2-bgpvpn/scenario.description.rst b/docs/release/scenarios/os-odl_l2-bgpvpn/scenario.description.rst index e552bcf..e552bcf 100644 --- a/docs/scenarios/os-odl_l2-bgpvpn/scenario.description.rst +++ b/docs/release/scenarios/os-odl_l2-bgpvpn/scenario.description.rst diff --git a/docs/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst index 4f16d3d..4f16d3d 100644 --- a/docs/userguide/feature.userguide.rst +++ b/docs/release/userguide/feature.userguide.rst diff --git a/docs/userguide/index.rst b/docs/release/userguide/index.rst index 0eab38c..0eab38c 100644 --- a/docs/userguide/index.rst +++ b/docs/release/userguide/index.rst diff --git a/sdnvpn/test/functest/run_tests.py b/sdnvpn/test/functest/run_tests.py index 1130759..140aee2 100644 --- a/sdnvpn/test/functest/run_tests.py +++ b/sdnvpn/test/functest/run_tests.py @@ -20,13 +20,7 @@ import functest.utils.functest_utils as ft_utils from sdnvpn.lib import config as sdnvpn_config -parser = argparse.ArgumentParser() -parser.add_argument("-r", "--report", - help="Create json result file", - action="store_true") -args = parser.parse_args() - -logger = ft_logger.Logger("sdnvpn-run-tests").getLogger() +logger = ft_logger.Logger(__name__).getLogger() COMMON_CONFIG = sdnvpn_config.CommonConfig() TEST_DB_URL = COMMON_CONFIG.test_db @@ -42,7 +36,7 @@ def push_results(testname, start_time, end_time, criteria, details): details) -def main(): +def main(report=False): # Workaround for https://jira.opnfv.org/projects/SDNVPN/issues/SDNVPN-100 # and SDNVPN-126 cmd_line = "neutron quota-update --subnet -1 --network -1 --port -1" @@ -88,7 +82,7 @@ def main(): if status == "FAIL": overall_status = "FAIL" - if args.report: + if report: push_results( test_name_db, start_time, end_time, status, details) @@ -99,4 +93,9 @@ def main(): if __name__ == '__main__': - main() + parser = argparse.ArgumentParser() + parser.add_argument("-r", "--report", + help="Create json result file", + action="store_true") + args = parser.parse_args() + main(report=args.report) diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index b7df013..09e71bd 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -138,8 +138,8 @@ def main(): if not os.path.isfile(COMMON_CONFIG.ubuntu_image_path): logger.info("Downloading image") ft_utils.download_url( - "https://cloud-images.ubuntu.com/releases/16.04/" - "release/ubuntu-16.04-server-cloudimg-amd64-disk1.img", + "http://artifacts.opnfv.org/sdnvpn/" + "ubuntu-16.04-server-cloudimg-amd64-disk1.img", "/home/opnfv/functest/data/") else: logger.info("Using old image") |