Align container tags and test suite configuration yaml for initial release

Change default container tag to be:
1. Functest ovp.1.0.0
2. testapi ovp.1.0.0

Add test suite ovp.1.0.0 and set it to be the default test suite.

Comment out bottlenecks CLI for initial release.

JIRA: DOVETAIL-580

Change-Id: I956e49e43fc7ba0176c14079b7228089db5dc108
Signed-off-by: xudan <xudan16@huawei.com>
(cherry picked from commit c47b8dde0e39e273372b091a3d8da1cc15b7ae9f)

7 files changed, 20 insertions, 87 deletions

diff --git a/dovetail/compliance/cvp.0.9.0.yml b/dovetail/compliance/cvp.0.9.0.yml
deleted file mode 100644
index 8b9da9e1..00000000
--- a/dovetail/compliance/cvp.0.9.0.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-cvp.0.9.0:
-  name: cvp.0.9.0
-  testcases_list:
-  # mandatory test cases
-    # osinterop
-    - dovetail.osinterop.tc001
-    # vping
-    - dovetail.vping.tc001
-    - dovetail.vping.tc002
-    # HA
-    - dovetail.ha.tc001
-    - dovetail.ha.tc002
-    - dovetail.ha.tc003
-    - dovetail.ha.tc004
-    - dovetail.ha.tc005
-    - dovetail.ha.tc006
-    - dovetail.ha.tc007
-    - dovetail.ha.tc008
-  # optional test cases
-    # ipv6
-    - dovetail.ipv6.tc001
-    - dovetail.ipv6.tc002
-    - dovetail.ipv6.tc003
-    - dovetail.ipv6.tc004
-    - dovetail.ipv6.tc005
-    - dovetail.ipv6.tc006
-    - dovetail.ipv6.tc007
-    - dovetail.ipv6.tc008
-    - dovetail.ipv6.tc009
-    - dovetail.ipv6.tc010
-    - dovetail.ipv6.tc011
-    - dovetail.ipv6.tc012
-    - dovetail.ipv6.tc013
-    - dovetail.ipv6.tc014
-    - dovetail.ipv6.tc015
-    - dovetail.ipv6.tc016
-    - dovetail.ipv6.tc017
-    - dovetail.ipv6.tc018
-    - dovetail.ipv6.tc019
-    - dovetail.ipv6.tc020
-    - dovetail.ipv6.tc021
-    - dovetail.ipv6.tc022
-    - dovetail.ipv6.tc023
-    - dovetail.ipv6.tc024
-    - dovetail.ipv6.tc025
-    # tempest
-    - dovetail.tempest.tc001
-    - dovetail.tempest.tc002
-    - dovetail.tempest.tc003
-    - dovetail.tempest.tc004
-    - dovetail.tempest.tc005
-    # sdnvpn
-    - dovetail.sdnvpn.tc001
-    - dovetail.sdnvpn.tc002
-    - dovetail.sdnvpn.tc004
-    - dovetail.sdnvpn.tc008
diff --git a/dovetail/compliance/cvp.0.8.0.yml b/dovetail/compliance/ovp.1.0.0.yml
index 942215b9..71f2198d 100644
--- a/dovetail/compliance/cvp.0.8.0.yml
+++ b/dovetail/compliance/ovp.1.0.0.yml
@@ -1,6 +1,6 @@
 ---
-cvp.0.8.0:
-  name: cvp.0.8.0
+ovp.1.0.0:
+  name: ovp.1.0.0
   testcases_list:
   # mandatory test cases
     # osinterop
diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml
index 957a279f..03455be1 100644
--- a/dovetail/conf/cmd_config.yml
+++ b/dovetail/conf/cmd_config.yml
@@ -28,19 +28,19 @@ cli:
           - '-f'
         path:
           - 'functest/docker_tag'
-        help: 'Overwrite tag for functest docker container (e.g. cvp.0.5.0)'
-      bott_tag:
-        flags:
-          - '--bott_tag'
-          - '-b'
-        path:
-          - 'bottlenecks/docker_tag'
-        help: 'Overwrite tag for bottlenecks docker container (e.g. cvp.0.4.0)'
+        help: 'Overwrite tag for functest docker container (e.g. ovp.1.0.0)'
+      # bott_tag:
+      #   flags:
+      #     - '--bott_tag'
+      #     - '-b'
+      #   path:
+      #     - 'bottlenecks/docker_tag'
+      #   help: 'Overwrite tag for bottlenecks docker container (e.g. cvp.0.4.0)'
     control:
       testsuite:
         flags:
           - '--testsuite'
-        default: 'cvp.0.9.0'
+        default: 'ovp.1.0.0'
         help: 'compliance testsuite.'
       testarea:
         flags:
diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml
index 300e8fee..89084e23 100644
--- a/dovetail/conf/dovetail_config.yml
+++ b/dovetail/conf/dovetail_config.yml
@@ -27,8 +27,7 @@ testsuite_supported:
   - compliance_set
   - proposed_tests
   - debug
-  - cvp.0.8.0
-  - cvp.0.9.0
+  - ovp.1.0.0
 # testarea supported, should adjust accordingly
 testarea_supported:
   - osinterop
@@ -87,17 +86,8 @@ validate_input:
   valid_docker_tag:
     - 'stable'
     - 'latest'
-    - 'danube.1.0'
-    - 'danube.2.0'
-    - 'danube.3.0'
-    - 'danube.3.1'
     - 'danube.3.2'
-    - 'cvp.0.1.0'
-    - 'cvp.0.2.0'
-    - 'cvp.0.3.0'
-    - 'cvp.0.4.0'
-    - 'cvp.0.5.0'
-    - 'cvp.0.6.0'
+    - 'ovp.1.0.0'
 
 mandatory:
   - osinterop
diff --git a/dovetail/conf/functest_config.yml b/dovetail/conf/functest_config.yml
index 11c49e32..232b0747 100644
--- a/dovetail/conf/functest_config.yml
+++ b/dovetail/conf/functest_config.yml
@@ -1,7 +1,7 @@
 ---
 functest:
   image_name: opnfv/functest
-  docker_tag: cvp.0.5.0
+  docker_tag: ovp.1.0.0
   opts: '-id --privileged=true'
   config:
     dir: '/home/opnfv/userconfig'
diff --git a/dovetail/run.py b/dovetail/run.py
index 4778fa51..e5154ad1 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -105,7 +105,7 @@ def validate_input(input_dict, check_dict, logger):
     # for 'func_tag' and 'yard_tag' options
     func_tag = input_dict['func_tag']
     yard_tag = input_dict['yard_tag']
-    bott_tag = input_dict['bott_tag']
+    # bott_tag = input_dict['bott_tag']
     valid_tag = check_dict['valid_docker_tag']
     if func_tag is not None and func_tag not in valid_tag:
         logger.error("The input option 'func_tag' can't be {}, "
@@ -115,10 +115,10 @@ def validate_input(input_dict, check_dict, logger):
         logger.error("The input option 'yard_tag' can't be {}, "
                      "valid values are {}.".format(yard_tag, valid_tag))
         raise SystemExit(1)
-    if bott_tag is not None and bott_tag not in valid_tag:
-        logger.error("The input option 'bott_tag' can't be {}, "
-                     "valid values are {}.".format(bott_tag, valid_tag))
-        raise SystemExit(1)
+    # if bott_tag is not None and bott_tag not in valid_tag:
+    #     logger.error("The input option 'bott_tag' can't be {}, "
+    #                  "valid values are {}.".format(bott_tag, valid_tag))
+    #     raise SystemExit(1)
 
     # for 'report' option
     report = input_dict['report']
diff --git a/dovetail/utils/local_db/launch_db.sh b/dovetail/utils/local_db/launch_db.sh
index cad0f365..7d80cc7a 100755
--- a/dovetail/utils/local_db/launch_db.sh
+++ b/dovetail/utils/local_db/launch_db.sh
@@ -52,7 +52,7 @@ echo "Create the testapi service."
 echo "=========================="
 
 set +e
-testapi_img="opnfv/testapi:cvp.0.3.0"
+testapi_img="opnfv/testapi:ovp.1.0.0"
 echo "Step1: pull the image $testapi_img."
 sudo docker pull $testapi_img
 set -e