From 8511e361a162afb961654a0aa47ea09ba4b55932 Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Tue, 24 Jan 2017 11:36:15 -0500 Subject: [BGPVPN] Remove l2 in Name; Enable ODL Boron Since Boron ODL servers always the l3 usecase so the l2 differentiation does not make sense anymore. Depends: https://gerrit.opnfv.org/gerrit/27605 Change-Id: I8bb55387001dfc81845134639ab4e913072f9a27 Signed-off-by: Nikolas Hermanns --- build/rpm_specs/opnfv-apex-common.spec | 8 ++++---- config/deploy/os-odl-bgpvpn-ha.yaml | 11 +++++++++++ config/deploy/os-odl-bgpvpn-noha.yaml | 11 +++++++++++ config/deploy/os-odl_l2-bgpvpn-ha.yaml | 10 ---------- config/deploy/os-odl_l2-bgpvpn-noha.yaml | 10 ---------- docs/installationprocedure/architecture.rst | 2 +- docs/installationprocedure/troubleshooting.rst | 2 +- docs/releasenotes/release-notes.rst | 2 +- tests/test_apex_deploy_settings.py | 4 ++-- 9 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 config/deploy/os-odl-bgpvpn-ha.yaml create mode 100644 config/deploy/os-odl-bgpvpn-noha.yaml delete mode 100644 config/deploy/os-odl_l2-bgpvpn-ha.yaml delete mode 100644 config/deploy/os-odl_l2-bgpvpn-noha.yaml diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 09d54e07..077046f5 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -45,8 +45,8 @@ install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/op install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml -install config/deploy/os-odl_l2-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml -install config/deploy/os-odl_l2-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-noha.yaml +install config/deploy/os-odl-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml +install config/deploy/os-odl-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml @@ -119,8 +119,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml -%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml new file mode 100644 index 00000000..ef51e737 --- /dev/null +++ b/config/deploy/os-odl-bgpvpn-ha.yaml @@ -0,0 +1,11 @@ +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + sdn_l3: true + odl_version: boron + tacker: false + congress: true + sfc: false + vpn: true diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml new file mode 100644 index 00000000..7812d054 --- /dev/null +++ b/config/deploy/os-odl-bgpvpn-noha.yaml @@ -0,0 +1,11 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + sdn_l3: true + odl_version: boron + tacker: false + congress: true + sfc: false + vpn: true diff --git a/config/deploy/os-odl_l2-bgpvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-ha.yaml deleted file mode 100644 index 1d29c2bf..00000000 --- a/config/deploy/os-odl_l2-bgpvpn-ha.yaml +++ /dev/null @@ -1,10 +0,0 @@ -global_params: - ha_enabled: true - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - tacker: false - congress: true - sfc: false - vpn: true diff --git a/config/deploy/os-odl_l2-bgpvpn-noha.yaml b/config/deploy/os-odl_l2-bgpvpn-noha.yaml deleted file mode 100644 index 011c2b3d..00000000 --- a/config/deploy/os-odl_l2-bgpvpn-noha.yaml +++ /dev/null @@ -1,10 +0,0 @@ -global_params: - ha_enabled: false - -deploy_options: - sdn_controller: opendaylight - sdn_l3: false - tacker: false - congress: true - sfc: false - vpn: true diff --git a/docs/installationprocedure/architecture.rst b/docs/installationprocedure/architecture.rst index 33536788..38806391 100644 --- a/docs/installationprocedure/architecture.rst +++ b/docs/installationprocedure/architecture.rst @@ -133,7 +133,7 @@ issues per scenario. The following scenarios correspond to a supported +-------------------------+------------+-----------------+ | os-odl_l2-sfc-noha | SFC | Yes | +-------------------------+------------+-----------------+ -| os-odl_l2-bgpvpn-ha | SDNVPN | No | +| os-odl-bgpvpn-ha | SDNVPN | No | +-------------------------+------------+-----------------+ | os-odl_l2-fdio-noha | FDS | Yes | +-------------------------+------------+-----------------+ diff --git a/docs/installationprocedure/troubleshooting.rst b/docs/installationprocedure/troubleshooting.rst index 56dfa5be..ed0d1ff6 100644 --- a/docs/installationprocedure/troubleshooting.rst +++ b/docs/installationprocedure/troubleshooting.rst @@ -87,7 +87,7 @@ OpenDaylight Integration When a user deploys any of the following scenarios: - - os-odl_l2-bgpvpn-ha.yaml + - os-odl-bgpvpn-ha.yaml - os-odl_l2-fdio-ha.yaml - os-odl_l2-fdio-noha.yaml - os-odl_l2-nofeature-ha.yaml diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst index 3e6e0aac..a5d52f0c 100644 --- a/docs/releasenotes/release-notes.rst +++ b/docs/releasenotes/release-notes.rst @@ -300,7 +300,7 @@ Scenario os-odl_l2-nofeature known issues * `APEX-149 `_: Openflow rules are populated very slowly -Scenario os-odl_l2-bgpvpn known issues +Scenario os-odl-bgpvpn known issues -------------------------------------- * `APEX-278 `_: diff --git a/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py index a0af1211..48c55d79 100644 --- a/tests/test_apex_deploy_settings.py +++ b/tests/test_apex_deploy_settings.py @@ -22,8 +22,8 @@ deploy_files = ('deploy_settings.yaml', 'os-nosdn-nofeature-noha.yaml', 'os-nosdn-ovs-noha.yaml', 'os-ocl-nofeature-ha.yaml', - 'os-odl_l2-bgpvpn-ha.yaml', - 'os-odl_l2-bgpvpn-noha.yaml', + 'os-odl-bgpvpn-ha.yaml', + 'os-odl-bgpvpn-noha.yaml', 'os-odl_l3-nofeature-ha.yaml', 'os-nosdn-nofeature-ha.yaml', 'os-nosdn-ovs-ha.yaml', -- cgit 1.2.3-korg