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/testcase_3.py | 13 |
12 files changed, 66 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/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 41f8f70..b7df013 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -71,18 +71,6 @@ def main(): ext_net_mask = ext_net_cidr[0].split('/')[1] controller_ext_ip = ext_net_cidr[0].split('/')[0] - # TODO This code has to be adapted into Apex quagga rpm spec - installer_type = str(os.environ['INSTALLER_TYPE'].lower()) - if installer_type == "apex": - add_quagga_user = 'sudo usermod -a -G quaggavt quagga' - test_utils.run_odl_cmd(controller, add_quagga_user) - - create_quagga_run_folder = "sudo mkdir -p /var/run/quagga/" - test_utils.run_odl_cmd(controller, create_quagga_run_folder) - - chown_quagga_folder = 'sudo chown quagga:quagga -R /var/run/quagga/' - test_utils.run_odl_cmd(controller, chown_quagga_folder) - logger.info("Starting bgp speaker of controller at IP %s " % controller_ext_ip) logger.info("Checking if zrpcd is " @@ -178,6 +166,7 @@ def main(): TESTCASE_CONFIG.quagga_subnet_cidr, TESTCASE_CONFIG.quagga_router_name) + installer_type = str(os.environ['INSTALLER_TYPE'].lower()) if installer_type == "fuel": disk = 'raw' elif installer_type == "apex": |