Tag dovetail with cvp.0.3.0

JIRA: DOVETAIL-468

1. docker image used
   yardstick: danube.3.1
   functest: cvp.0.2.0
   testapi: cvp.0.3.0
   dovetail: cvp.0.3.0
2. main changes
   fix dovetail docker version to be 17.03.0-ce
   adapt yardstick danube.3.1
   For more information, refer to
   https://wiki.opnfv.org/display/dovetail/Running+history+for+the+dovetail+tool

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

8 files changed, 19 insertions, 18 deletions

diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst
index c2dd32a7..aec3e861 100644
--- a/docs/testing/user/userguide/index.rst
+++ b/docs/testing/user/userguide/index.rst
@@ -10,4 +10,3 @@ Compliance Verification Program Testing User Guide
    :maxdepth: 2
 
    testing_guide.rst
-   cli_reference.rst
diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index ab3c5ec9..9e46b561 100644
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -261,8 +261,8 @@ If the Test Host is online, you can directly pull.
 
 .. code-block:: bash
 
-   $ sudo docker pull opnfv/dovetail:cvp.0.2.0
-   cvp.0.2.0: Pulling from opnfv/dovetail
+   $ sudo docker pull opnfv/dovetail:cvp.0.3.0
+   cvp.0.3.0: Pulling from opnfv/dovetail
    30d541b48fc0: Pull complete
    8ecd7f80d390: Pull complete
    46ec9927bb81: Pull complete
@@ -275,9 +275,9 @@ If the Test Host is online, you can directly pull.
    bf7c644692de: Pull complete
    cdc345e3f363: Pull complete
    Digest: sha256:d571b1073b2fdada79562e8cc67f63018e8d89268ff7faabee3380202c05edee
-   Status: Downloaded newer image for opnfv/dovetail:cvp.0.2.0
+   Status: Downloaded newer image for opnfv/dovetail:cvp.0.3.0
 
-An example of the <tag> is *cvp.0.2.0*.
+An example of the <tag> is *cvp.0.3.0*.
 
 If the Test Host is offline, you will need to first pull the Dovetail Docker image, and all the
 dependent images that Dovetail uses, to a host that is online. The reason that you need
@@ -287,9 +287,9 @@ offline, then all these dependencies will also need to be manually copied.
 
 .. code-block:: bash
 
-   $ sudo docker pull opnfv/dovetail:cvp.0.2.0
+   $ sudo docker pull opnfv/dovetail:cvp.0.3.0
    $ sudo docker pull opnfv/functest:cvp.0.2.0
-   $ sudo docker pull opnfv/yardstick:danube.3.0
+   $ sudo docker pull opnfv/yardstick:danube.3.1
    $ sudo wget -nc http://artifacts.opnfv.org/sdnvpn/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P {ANY_DIR}
 
 Once all these images are pulled, save the images, copy to the Test Host, and then load
@@ -299,7 +299,7 @@ At the online host, save images.
 
 .. code-block:: bash
 
-   $ sudo docker save -o dovetail.tar opnfv/dovetail:cvp.0.2.0 opnfv/functest:cvp.0.2.0 opnfv/yardstick:danube.3.0
+   $ sudo docker save -o dovetail.tar opnfv/dovetail:cvp.0.3.0 opnfv/functest:cvp.0.2.0 opnfv/yardstick:danube.3.1
 
 Copy dovetail.tar file to the Test Host, and then load the images on the Test Host.
 
@@ -316,8 +316,8 @@ Now check to see that the Dovetail image has been pulled or loaded properly.
    $ sudo docker images
    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
    opnfv/functest      cvp.0.2.0           9eaeaea5f203        8 days ago          1.53GB
-   opnfv/dovetail      cvp.0.2.0           5d25b289451c        8 days ago          516MB
-   opnfv/yardstick     danube.3.0          574596b6ea12        8 days ago          1.2GB
+   opnfv/dovetail      cvp.0.3.0           5d25b289451c        8 days ago          516MB
+   opnfv/yardstick     danube.3.1          574596b6ea12        8 days ago          1.2GB
 
 Regardless of whether you pulled down the Dovetail image directly online, or loaded from
 a static image tar file, you are ready to run Dovetail.
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index 793c7051..fecc0ae1 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -79,5 +79,7 @@ validate_input:
     - 'danube.1.0'
     - 'danube.2.0'
     - 'danube.3.0'
+    - 'danube.3.1'
     - 'cvp.0.1.0'
     - 'cvp.0.2.0'
+    - 'cvp.0.3.0'
diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml
index 56ad75a5..fd93d61a 100644
--- a/dovetail/conf/yardstick_config.yml
+++ b/dovetail/conf/yardstick_config.yml
@@ -1,7 +1,7 @@
 ---
 yardstick:
   image_name: opnfv/yardstick
-  docker_tag: danube.3.0
+  docker_tag: danube.3.1
   opts: '-id --privileged=true'
   config:
     dir: '/home/opnfv/userconfig'
diff --git a/dovetail/utils/local_db/launch_db.sh b/dovetail/utils/local_db/launch_db.sh
index e31f47ce..722dc227 100755
--- a/dovetail/utils/local_db/launch_db.sh
+++ b/dovetail/utils/local_db/launch_db.sh
@@ -59,8 +59,8 @@ echo "Create the testapi service."
 echo "=========================="
 
 set +e
-# pull image opnfv/testapi:cvp.0.2.0
-testapi_img="opnfv/testapi:cvp.0.2.0"
+# pull image opnfv/testapi:cvp.0.3.0
+testapi_img="opnfv/testapi:cvp.0.3.0"
 echo "Step1: pull the image $testapi_img."
 sudo docker pull $testapi_img
 set -e
diff --git a/dovetail/utils/local_db/restart_db.sh b/dovetail/utils/local_db/restart_db.sh
index 5d6b9b68..35096b99 100755
--- a/dovetail/utils/local_db/restart_db.sh
+++ b/dovetail/utils/local_db/restart_db.sh
@@ -26,4 +26,4 @@ export db_host_ip=${db_host_ip:-"$1"}
 
 sudo docker rm -f testapi
 sudo docker run -itd -p $testapi_port:8000 --name testapi \
-    -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.2.0
+    -e mongodb_url=mongodb://$db_host_ip:$mongodb_port/ opnfv/testapi:cvp.0.3.0
diff --git a/dovetail/utils/offline/config.yaml b/dovetail/utils/offline/config.yaml
index edb8a5b8..11134dd1 100644
--- a/dovetail/utils/offline/config.yaml
+++ b/dovetail/utils/offline/config.yaml
@@ -2,7 +2,7 @@
 docker_images:
   dovetail:
     domain: opnfv
-    tag: cvp.0.2.0
+    tag: cvp.0.3.0
     store_name: image_dovetail.docker
   functest:
     domain: opnfv
@@ -10,11 +10,11 @@ docker_images:
     store_name: image_functest.docker
   yardstick:
     domain: opnfv
-    tag: danube.3.0
+    tag: danube.3.1
     store_name: image_yardstick.docker
   testapi:
     domain: opnfv
-    tag: cvp.0.2.0
+    tag: cvp.0.3.0
     store_name: image_testapi.docker
   mongo:
     tag: 3.2.1
diff --git a/setup.cfg b/setup.cfg
index 37b03123..64d35f68 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = dovetail
-version = 0.2.0
+version = 0.3.0
 home-page = https://wiki.opnfv.org/display/dovetail
 
 [entry_points]