Change NFVI version of Dovetail tool from 2019.0x to 2019.12

JIRA: DOVETAIL-788

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

diff --git a/dovetail/api/swagger.yaml b/dovetail/api/swagger.yaml
index 98291d2..54695d7 100644 (file)
--- a/dovetail/api/swagger.yaml
+++ b/dovetail/api/swagger.yaml
@@ -265,7 +265,7 @@ definitions:
         - "yardstick.ha.rabbitmq"
       testsuite:
         type: "string"
-        example: "ovp.2019.0x"
+        example: "ovp.2019.12"
       testarea:
         type: "array"
         items:
@@ -333,7 +333,7 @@ definitions:
         example: "functest.vping.ssh"
       testSuiteName:
         type: "string"
-        example: "ovp.2019.0x"
+        example: "ovp.2019.12"
       timestart:
         type: "string"
         format: "date-time"

diff --git a/etc/compliance/ovp.2019.0x.yaml b/etc/compliance/ovp.2019.12.yaml
similarity index 96%
rename from etc/compliance/ovp.2019.0x.yaml
rename to etc/compliance/ovp.2019.12.yaml
index c0d9fe2..a1f7a50 100644 (file)
--- a/etc/compliance/ovp.2019.0x.yaml
+++ b/etc/compliance/ovp.2019.12.yaml
@@ -8,9 +8,9 @@
 ##############################################################################
 
 ---
-ovp.2019.0x:
-  name: ovp.2019.0x
-  version: '2019.0x'
+ovp.2019.12:
+  name: ovp.2019.12
+  version: '2019.12'
   testcases_list:
     mandatory:
       - functest.vping.userdata

diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml
index 5d41992..63c8734 100644 (file)
--- a/etc/conf/cmd_config.yml
+++ b/etc/conf/cmd_config.yml
@@ -28,7 +28,7 @@ cli:
       testsuite:
         flags:
           - '--testsuite'
-        default: 'ovp.2019.0x'
+        default: 'ovp.2019.12'
         help: 'compliance testsuite.'
       testarea:
         flags:

diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml
index 3cf4c6f..10b81fb 100644 (file)
--- a/etc/conf/dovetail_config.yml
+++ b/etc/conf/dovetail_config.yml
@@ -8,6 +8,7 @@
 ##############################################################################
 
 ---
+version: '2019.12'
 cli_file_name: 'cmd_config.yml'
 result_file: 'results.json'
 
@@ -26,7 +27,7 @@ testsuite_supported:
   - proposed_tests
   - debug
   - healthcheck
-  - ovp.2019.0x
+  - ovp.2019.12
   - onap.tosca.2019.04
   - onap.heat.2019.04