Updated scenario documentationopnfv-6.1.0opnfv-6.0.0

Change-Id: I125988afe557e5117fcbbace23b5e48e740d216c
Signed-off-by: Sofia Wallin <sofia.wallin@ericsson.com>
Signed-off-by: Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com>
(cherry picked from commit b1c8323dcd962b456da0438df65b4a37bb12f3d7)

3 files changed, 35 insertions, 23 deletions

diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst
index 07674b4..652bf32 100644
--- a/docs/release/release-notes/release-notes.rst
+++ b/docs/release/release-notes/release-notes.rst
@@ -1,3 +1,11 @@
+.. _-os-odl-bgpvpn-noha:
+
+.. _-os-odl-bgpvpn-ha:
+
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> and others
+
 =====================
 SDN VPN Release Notes
 =====================
@@ -92,6 +100,10 @@ Software deliverables
 - Integration of VPN Service functional tests and BGPVPN API tests into Functest framework.
 - Enabling performance tests in Yardstick.
 - Changes to 6Wind Zrpcd to enable integration with Apex.
+- Intra Datacenter ECMP (Equal Cost Multi Pathing) Testcase.
+- OpenDaylight and Open vSwitch Resynchronization Testcase.
+- Improved quality and stability of Testcase runs in CI environment.
+- External BGPVPN scenario added for XCI based deployment for BGPVPN scenarios.
 
 Documentation deliverables
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/release/scenarios/os-odl-bgpvpn/index.rst b/docs/release/scenarios/os-odl-bgpvpn/index.rst
index b50ac21..74bac98 100644
--- a/docs/release/scenarios/os-odl-bgpvpn/index.rst
+++ b/docs/release/scenarios/os-odl-bgpvpn/index.rst
@@ -1,14 +1,15 @@
-.. _sdnvpn-os-odl-bgpvpn-noha:
+.. _-os-odl-bgpvpn-noha:
 
-.. _sdnvpn-os-odl-bgpvpn-ha:
+.. _-os-odl-bgpvpn-ha:
 
 .. 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
+.. (c) Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> and others
+
+================================================================
+os-odl-bgpvpn-noha and os-odl-bgpvpn-ha overview and description
+================================================================
 
-=========================================
-os-odl_l2-bgpvpn overview and description
-=========================================
 .. This document will be used to provide a description of the scenario for an end user.
 .. You should explain the purpose of the scenario, the types of capabilities provided and
 ..  the unique components that make up the scenario including how they are used.
diff --git a/docs/release/scenarios/os-odl-bgpvpn/scenario.description.rst b/docs/release/scenarios/os-odl-bgpvpn/scenario.description.rst
index 2641d82..f780d20 100644
--- a/docs/release/scenarios/os-odl-bgpvpn/scenario.description.rst
+++ b/docs/release/scenarios/os-odl-bgpvpn/scenario.description.rst
@@ -1,6 +1,10 @@
+.. _-os-odl-bgpvpn-noha:
+
+.. _-os-odl-bgpvpn-ha:
+
 .. 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 Nikolas Hermanns (nikolas.hermanns@ericsson.com)
+.. (c) Periyasamy Palanisamy <periyasamy.palanisamy@ericsson.com> and others
 
 Introduction
 ============
@@ -72,28 +76,23 @@ Scenario usage overview
 Configuring SDNVPN features
 ---------------------------
 
-Each installer has specific procedures to deploy the OPNFV platform so that the SDNVPN feature is enabled.
+Apex installer has specific procedures to deploy the OPNFV platform so that the SDNVPN feature is enabled.
 
-Fuel installer configuration
+APEX installer configuration
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-To install the SDNVPN feature using Fuel, follow the Fuel installation guide ensuring to select the SDNVPN
-feature when prompted <add link to Fuel docs once artifact locations are known>.
+To install the SDNVPN feature using the APEX installer, follow the APEX installation guide
+(https://wiki.opnfv.org/display/apex/Integration+Guide) and activate the SDNVPN feature when prompted (step "# Now execute a deployment")
 
-This will trigger installation of the OpenStack BGPVPN API extension for
-Neutron, set up for using the ODL driver, in addition to vanilla Neutron.
-In addition, the required karaf features will be activated when ODL is installed and the compute nodes
-will be configured including the VPN Service internal transport tunnel mesh.
+For os-odl-bgpvpn-noha deployment:
+----------------------------------
 
-No post-deploy configuration is necessary. The Fuel BGPVPN plugin and the ODL plugin
-should set up the cluster ready for BGPVPNs being created.
+python3 deploy.py -v -n ../config/network/network_settings.yaml -d ../config/deploy/os-odl-bgpvpn-noha.yaml --deploy-dir ../build --lib-dir ../lib --image-dir ../.build --virtual-computes 2 --virtual-default-ram 16
 
-APEX installer configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+For os-odl-bgpvpn-ha deployment:
+--------------------------------
 
-To install the SDNVPN feature using the APEX installer, follow the APEX installation guide
-(https://wiki.opnfv.org/display/apex/Integration+Guide) and activate the SDNVPN feature when prompted (step "# Now execute a deployment")
-i.e. python3 deploy.py -v -n ../config/network/network_settings.yaml -d ../config/deploy/os-odl-bgpvpn-noha.yaml --deploy-dir ../build --lib-dir ../lib --image-dir ../.build --virtual-computes 2 --virtual-default-ram 16
+python3 deploy.py -v -n ../config/network/network_settings.yaml -d ../config/deploy/os-odl-bgpvpn-ha.yaml --deploy-dir ../build --lib-dir ../lib --image-dir ../.build --virtual-computes 2 --virtual-default-ram 16
 
 Limitations, Issues and Workarounds
 ===================================
@@ -112,5 +111,5 @@ Integration with data center gateway will not work due to missing OVS patches fo
 References
 ==========
 
-For more information on the OPNFV Danube release, please visit
+For more information on the OPNFV Fraser release, please visit
 https://www.opnfv.org/software