Update release note and user guide before tagging ovp-2.2.0

Change-Id: I1b1a1c96db933dc54242a226a6b8ea4a58147a14
Signed-off-by: xudan <xudan16@huawei.com>

2 files changed, 34 insertions, 13 deletions

diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst
index 3937e4aa..8f8bd7d1 100644
--- a/docs/release/release-notes/index.rst
+++ b/docs/release/release-notes/index.rst
@@ -4,7 +4,7 @@
 .. _dovetail-releasenotes:
 
 ==================================================================
-OPNFV Verified Program (OVP) 2018.09 / Dovetail 2.0.0 Release Note
+OPNFV Verified Program (OVP) 2018.09 / Dovetail 2.2.0 Release Note
 ==================================================================
 
 
@@ -74,7 +74,7 @@ in parenthesis is shown below for the OVP 2018.09 release.
 - functest.tempest.volume (2)
 - functest.tempest.neutron_trunk_ports (38)
 - functest.tempest.ipv6_api (21)
-- functest.security.patrole (119)
+- functest.security.patrole (117)
 - yardstick.ha.nova_api (1)
 - yardstick.ha.neutron_server (1)
 - yardstick.ha.keystone (1)
@@ -106,7 +106,7 @@ There are a total of 432 mandatory test cases.
 - functest.bgpvpn.tenant_separation (1)
 - functest.bgpvpn.router_association (1)
 - functest.bgpvpn.router_association_floating_ip (1)
-
+- functest.security.patrole_vxlan_dependent (2)
 
 There are a total of 61 optional test cases.
 
@@ -130,7 +130,7 @@ for compliance verification. The category label of 'Infrastructure' is used with
 Marks logo and limits the scope of this OVP release to a SUT consisting of NFVI and VIM components
 using ETSI terminology. It does not provide compliance verification for specific VNFs in any fashion.
 The date '2018.09' corresponds to a reference SUT that aligns to the OPNFV Fraser release and
-currently aligns to the Dovetail framework version 2.0.0.
+currently aligns to the Dovetail framework version 2.2.0.
 
 Organizations shall not use the Program Marks in any way that would associate it with any
 individual or company logo or brand, beyond the association to the specific platform to which it
@@ -152,7 +152,7 @@ Release Data
 | **Project**                          | Dovetail                              |
 |                                      |                                       |
 +--------------------------------------+---------------------------------------+
-| **Repo tag**                         | ovp.2.0.0                             |
+| **Repo tag**                         | ovp-2.0.0                             |
 |                                      |                                       |
 +--------------------------------------+---------------------------------------+
 | **Release designation**              | OPNFV Verified Program (OVP)          |
@@ -165,6 +165,27 @@ Release Data
 |                                      | OPNFV Fraser release as reference SUT |
 +--------------------------------------+---------------------------------------+
 
+There is a patch version of Dovetail after the above release.
+
++------------------------------+--------------------------------------------------------------------------------+
+| **Project**                  | Dovetail                                                                       |
+|                              |                                                                                |
++------------------------------+--------------------------------------------------------------------------------+
+| **Repo tag**                 | ovp-2.2.0                                                                      |
+|                              |                                                                                |
++------------------------------+--------------------------------------------------------------------------------+
+| **Release date**             | March 2019                                                                     |
+|                              |                                                                                |
++------------------------------+--------------------------------------------------------------------------------+
+| **Purpose of the delivery**  | - Test scope update                                                            |
+|                              |    - Move 2 sub-test cases in functest.security.patrole to optional            |
+|                              |    - These 2 sub-test cases rely on vxlan as virtual networking implementation |
+|                              | - Three bug fixes                                                              |
+|                              |    - Yardstick: Add SLA check and reverse the creation order of servers        |
+|                              |    - Dovetail: Set Yardstick_TAG to be ovp-2.0.0 instead of stable             |
+|                              |    - Bottlenecks: Make ram_num configurable for DPDK                           |
++------------------------------+--------------------------------------------------------------------------------+
+
 Deliverables
 ============
 
@@ -173,7 +194,7 @@ Software
 +-------------------------+-----------------------------------+----------------+
 |  **Docker Container**   | **Docker Image**                  | **Tag**        |
 +-------------------------+-----------------------------------+----------------+
-|   dovetail              |    opnfv/dovetail                 |    ovp-2.0.0   |
+|   dovetail              |    opnfv/dovetail                 |    ovp-2.2.0   |
 +-------------------------+-----------------------------------+----------------+
 |   functest              |    opnfv/functest-smoke           |    opnfv-6.3.0 |
 +-------------------------+-----------------------------------+----------------+
@@ -220,7 +241,7 @@ Documents
 Testing with OPNFV Fraser Installers
 ====================================
 
-OVP 2018.09 and Dovetail 2.0.0 are known to be have been tested with the following OPNFV
+OVP 2018.09 and Dovetail 2.2.0 are known to be have been tested with the following OPNFV
 Fraser installer versions.
 
 +-----------------+----------------------+
diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index 2a6a46a6..c6911f68 100644
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -444,8 +444,8 @@ the SUT.
    $ wget -nc https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ${DOVETAIL_HOME}/images
    $ wget -nc http://repository.cloudifysource.org/cloudify/4.0.1/sp-release/cloudify-manager-premium-4.0.1.qcow2 -P ${DOVETAIL_HOME}/images
 
-   $ sudo docker pull opnfv/dovetail:ovp-2.0.0
-   ovp-2.0.0: Pulling from opnfv/dovetail
+   $ sudo docker pull opnfv/dovetail:ovp-2.2.0
+   ovp-2.2.0: Pulling from opnfv/dovetail
    324d088ce065: Pull complete
    2ab951b6c615: Pull complete
    9b01635313e2: Pull complete
@@ -457,7 +457,7 @@ the SUT.
    0ad9f4168266: Pull complete
    d949894f87f6: Pull complete
    Digest: sha256:7449601108ebc5c40f76a5cd9065ca5e18053be643a0eeac778f537719336c29
-   Status: Downloaded newer image for opnfv/dovetail:ovp-2.0.0
+   Status: Downloaded newer image for opnfv/dovetail:ovp-2.2.0
 
 Offline Test Host
 """""""""""""""""
@@ -472,7 +472,7 @@ The Docker images and Cirros image below are necessary for all mandatory test ca
 
 .. code-block:: bash
 
-   $ sudo docker pull opnfv/dovetail:ovp-2.0.0
+   $ sudo docker pull opnfv/dovetail:ovp-2.2.0
    $ sudo docker pull opnfv/functest-smoke:opnfv-6.3.0
    $ sudo docker pull opnfv/yardstick:ovp-2.0.0
    $ sudo docker pull opnfv/bottlenecks:ovp-2.0.0
@@ -496,7 +496,7 @@ At the online host, save the images with the command below.
 
 .. code-block:: bash
 
-   $ sudo docker save -o dovetail.tar opnfv/dovetail:ovp-2.0.0 \
+   $ sudo docker save -o dovetail.tar opnfv/dovetail:ovp-2.2.0 \
      opnfv/functest-smoke:opnfv-6.3.0 opnfv/functest-healthcheck:opnfv-6.3.0 \
      opnfv/functest-features:opnfv-6.3.0 opnfv/functest-vnf:opnfv-6.3.0 \
      opnfv/yardstick:ovp-2.0.0 opnfv/bottlenecks:ovp-2.0.0
@@ -514,7 +514,7 @@ Now check to see that all Docker images have been pulled or loaded properly.
 
    $ sudo docker images
    REPOSITORY                      TAG                 IMAGE ID            CREATED             SIZE
-   opnfv/dovetail                  ovp-2.0.0           ac3b2d12b1b0        24 hours ago        784 MB
+   opnfv/dovetail                  ovp-2.2.0           ac3b2d12b1b0        24 hours ago        784 MB
    opnfv/functest-smoke            opnfv-6.3.0         010aacb7c1ee        17 hours ago        594.2 MB
    opnfv/functest-healthcheck      opnfv-6.3.0         2cfd4523f797        17 hours ago        234 MB
    opnfv/functest-features         opnfv-6.3.0         b61d4abd56fd        17 hours ago        530.5 MB