From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 18 Aug 2016 07:34:04 +0000 (+0200)
Subject: Remove useless odlreport2db args
X-Git-Tag: colorado.1.0~119^2~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=447819bd807b963ea5fbeb14ac4f4ef97f55f0f1;p=functest.git

Remove useless odlreport2db args

It removes useless odlreport2db args as functest_utils parses env vars
too and erases this previous values.
All mandatory env vars are still checked in exec_test.sh.

Change-Id: I3dd299dcad1758b994cf9d53ef65a5b83dc46b97
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/ci/exec_test.sh b/ci/exec_test.sh
old mode 100755
new mode 100644
index 98d54f205..d7883307b
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -93,8 +93,7 @@ function run_test(){
                env | grep NODE_NAME > /dev/null; then
                 odl_logs="/home/opnfv/functest/results/odl/"
                 odl_path="${FUNCTEST_REPO_DIR}/testcases/Controllers/ODL/"
-                node_name=$(env | grep NODE_NAME | cut -f2 -d'=')
-                python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml -i ${INSTALLER_TYPE} -p ${node_name} -s ${DEPLOY_SCENARIO}
+                python ${odl_path}/odlreport2db.py -x ${odl_logs}/output.xml
             fi
         ;;
         "tempest_smoke_serial")
diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py
old mode 100755
new mode 100644
index 368d26611..86f3c5c7e
--- a/testcases/Controllers/ODL/odlreport2db.py
+++ b/testcases/Controllers/ODL/odlreport2db.py
@@ -33,13 +33,8 @@ import functest.utils.functest_utils as functest_utils
 
 def usage():
     print """Usage:
-    python odlreport2db.py --xml=<output.xml> --pod=<pod name>
-                           --installer=<installer> --database=<database url>
-                           --scenario=<scenario>
+    python odlreport2db.py --xml=<output.xml> --help
     -x, --xml   xml file generated by robot test
-    -p, --pod   POD name where the test come from
-    -i, --installer
-    -s, --scenario
     -h, --help  this message
     """
     sys.exit(2)
@@ -80,32 +75,21 @@ def parse_suites(suites):
 
 
 def main(argv):
-    (xml_file, pod, installer, scenario) = None, None, None, None
+    xml_file = None
     try:
         opts, args = getopt.getopt(argv,
-                                   'x:p:i:s:h',
-                                   ['xml=', 'pod=',
-                                    'installer=',
-                                    'scenario=',
-                                    'help'])
+                                   'x:h',
+                                   ['xml=', 'help'])
     except getopt.GetoptError:
         usage()
 
     for opt, arg in opts:
-        if opt in ('-h', '--help'):
-            usage()
-        elif opt in ('-x', '--xml'):
+        if opt in ('-x', '--xml'):
             xml_file = arg
-        elif opt in ('-p', '--pod'):
-            pod = arg
-        elif opt in ('-i', '--installer'):
-            installer = arg
-        elif opt in ('-s', '--scenario'):
-            scenario = arg
         else:
             usage()
 
-    if not all(x is not None for x in (xml_file, pod, installer, scenario)):
+    if xml_file is None:
         usage()
 
     with open(xml_file, "r") as myfile:
@@ -120,17 +104,9 @@ def main(argv):
         data['version'] = all_data['@generator']
         data['test_project'] = "functest"
         data['case_name'] = "odl"
-        data['pod_name'] = pod
-        data['installer'] = installer
 
         json.dumps(data, indent=4, separators=(',', ': '))
 
-        # example:
-        # python odlreport2db.py -x ~/Pictures/Perso/odl/output3.xml
-        #                        -i fuel
-        #                        -p opnfv-jump-2
-        #                        -s os-odl_l2-ha
-
         # success criteria for ODL = 100% of tests OK
         status = "FAIL"
         # TODO as part of the tests are executed before in the bash