1 files changed, 48 insertions, 24 deletions

diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml
index 4dbfbbc8..63c87343 100644
--- a/etc/conf/cmd_config.yml
+++ b/etc/conf/cmd_config.yml
@@ -1,3 +1,12 @@
+##############################################################################
+# Copyright (c) 2019 opnfv.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
 ---
 cli:
   arguments:
@@ -15,38 +24,22 @@ cli:
 
   options:
     config:
-      yard_tag:
-        flags:
-          - '--yardstick_tag'
-          - '-y'
-        path:
-          - 'yardstick/docker_tag'
-        help: 'Overwrite tag for yardstick docker container (e.g. opnfv-5.1.0)'
-      func_tag:
-        flags:
-          - '--functest_tag'
-          - '-f'
-        path:
-          - 'functest/docker_tag'
-        help: 'Overwrite tag for functest docker container (e.g. euphrates)'
-      bott_tag:
-        flags:
-          - '--bottlenecks_tag'
-          - '-b'
-        path:
-          - 'bottlenecks/docker_tag'
-        help: 'Overwrite tag for bottlenecks docker container (e.g. stable)'
     control:
       testsuite:
         flags:
           - '--testsuite'
-        default: 'ovp.1.0.0'
+        default: 'ovp.2019.12'
         help: 'compliance testsuite.'
       testarea:
         flags:
           - '--testarea'
         multiple: 'True'
-        help: 'compliance testarea within testsuite'
+        help: 'Compliance testarea within testsuite. Specify option multiple times to include multiple test areas.'
+      testcase:
+        flags:
+          - '--testcase'
+        multiple: 'True'
+        help: 'Compliance testcase. Specify option multiple times to include multiple test cases.'
       debug:
         flags:
           - '--debug'
@@ -63,9 +56,40 @@ cli:
         flags:
           - '--report'
           - '-r'
-        help: 'push results to DB (e.g. --report http://192.168.135.2:8000/api/v1/results)'
+        is_flag: 'True'
+        help: 'Create a tarball file to upload to OVP web portal'
       offline:
         flags:
           - '--offline'
         is_flag: 'True'
         help: 'run in offline method, which means not to update the docker upstream images, functest, yardstick, etc.'
+      noapivalidation:
+        flags:
+          - '--no-api-validation'
+        is_flag: 'True'
+        help: 'disable strict API response validation'
+      noclean:
+        flags:
+          - '--no-clean'
+          - '-n'
+        is_flag: 'True'
+        help: 'Keep all Containers created for debuging.'
+      deployscenario:
+        flags:
+          - '--deploy-scenario'
+        help: 'Specify the DEPLOY_SCENARIO which will be used as input by each testcase respectively'
+      mandatory:
+        flags:
+          - '--mandatory'
+        is_flag: 'True'
+        help: 'Run all mandatory test cases.'
+      optional:
+        flags:
+          - '--optional'
+        is_flag: 'True'
+        help: 'Run all optional test cases.'
+      opnfvci:
+        flags:
+          - '--opnfv-ci'
+        is_flag: 'True'
+        help: 'Only enabled when running with OPNFV CI jobs and pushing results to TestAPI DB'