Merge "Prepare Brahmaputra 3.0 release"

4 files changed, 31 insertions, 7 deletions

diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst
index dcca57bef..60bbc5b1a 100644
--- a/docs/userguide/index.rst
+++ b/docs/userguide/index.rst
@@ -350,7 +350,21 @@ The available 33 test cases can be grouped into 7 test suites:
     #. Cleanup test allocations: Destroys all allocations in OpenStack.
 
 
-
+SDNVPN
+^^^^^^
+Many telecom network functions are relying on layer-3 infrastructure services,
+within a VNF between components, or towards existing external networks.
+In many cases, these external networks are implemented in MPLS/BGP technology in
+existing service provider wide-area-networks (WAN). This proven technology
+provides a good mechanism for inter-operation of a NFV Infrastructure (NFVI)
+and WAN.
+
+The SDNVPN project defined a bgpvpn suite.
+This bgpvpn suite deals with 2 Tempest cases dedicated to the test of the
+OpenStack bgpvpn API:
+
+  * test_create_bgpvpn
+  * test_create_bgpvpn_as_non_admin_fail
 
 .. include:: ./runfunctest.rst
 
@@ -369,7 +383,6 @@ Test Dashboard
 ==============
 
 Based on results collected in CI, a test dashboard is dynamically generated.
-The URL of this dashboard is TODO LF
 
 
 .. include:: ./troubleshooting.rst
diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst
index 03039ef87..65f8dc48b 100644
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@@ -50,6 +50,11 @@ The current list of test suites can be distributed in 3 main domains: VIM
 |                |                | * Consistent resource state awareness     |
 |                |                | (compute), see `Doctor User Guide`_ for   |
 |                |                | details                                   |
+|                +----------------+-------------------------------------------+
+|                | SDNVPN         | Implementation of the OpenStack bgpvpn API|
+|                |                | from the SDNVPN feature project.          |
+|                |                | It allowing the cration of BGP VPNs       |
+|                |                | see SDNVPN User Guide for                 |
 +----------------+----------------+-------------------------------------------+
 
 
diff --git a/docs/userguide/runfunctest.rst b/docs/userguide/runfunctest.rst
index 7777e4fde..b7bdda282 100644
--- a/docs/userguide/runfunctest.rst
+++ b/docs/userguide/runfunctest.rst
@@ -37,7 +37,7 @@ several options::
         -s|--serial       run tests in one thread
         -t|--test         run specific set of tests
           <test_name>     one or more of the following separated by comma:
-                             vping_ssh,vping_userdata,odl,onos,tempest,rally,vims,promise,doctor
+                             vping_ssh,vping_userdata,odl,onos,tempest,rally,vims,promise,doctor,bgpvpn
 
     examples:
         run_tests.sh
@@ -55,7 +55,7 @@ by default Functest will launch all the test suites in the following order:
   1) vPing test cases
   2) Tempest suite
   3) SDN controller suites
-  4) Feature project tests cases (Promise, Doctor, ...)
+  4) Feature project tests cases (Promise, Doctor, SDNVPN)
   5) vIMS suite
   6) Rally suite
 
@@ -127,7 +127,7 @@ variables:
  * The scenario [controller]-[feature]-[mode], stored in DEPLOY_SCENARIO with
 
    * controller = (odl|onos|ocl|nosdn)
-   * feature = (ovs(dpdk)|kvm)
+   * feature = (ovs(dpdk)|kvm|sfc|bgpvpn)
    * mode = (ha|noha)
 
 The constraints per test case are defined in the Functest configuration file
@@ -169,7 +169,7 @@ The order of execution is also described in the Functest configuration file::
     8: promise
     9: odl-vpnservice
     10: bgpvpn
-    11: openstack-neutron-bgpvpn-api-extension-tests
+    #11: openstack-neutron-bgpvpn-api-extension-tests
     12: vims
     13: rally
 
@@ -178,7 +178,7 @@ The tests are executed in the following order:
   1) vPing test cases
   2) Tempest suite
   3) SDN controller suites
-  4) Feature project tests cases (Promise, Doctor, ...)
+  4) Feature project tests cases (Promise, Doctor, BGPVPN...)
   5) vIMS suite
   6) Rally suite
 
diff --git a/docs/userguide/troubleshooting.rst b/docs/userguide/troubleshooting.rst
index 7eb62c6d5..406aaad2a 100644
--- a/docs/userguide/troubleshooting.rst
+++ b/docs/userguide/troubleshooting.rst
@@ -340,3 +340,9 @@ Promise
 ^^^^^^^
 
 Please refer to the Promise documentation.
+
+
+SDNVPN
+^^^^^^^
+
+Please refer to the SNVPN documentation.