From 74f213834210d6354c57f3c9fe4decf6b9d4b673 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 1 Jun 2016 14:30:40 +0200
Subject: Check correctly arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It fixes argument parsing and verifies all mandatory arguments are
provided. It also prevents UnboundLocalError exceptions.

Change-Id: Iec3403533b312c95dd453236ccadb1fe495d61cd
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 testcases/Controllers/ODL/odlreport2db.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/testcases/Controllers/ODL/odlreport2db.py b/testcases/Controllers/ODL/odlreport2db.py
index 50c8b096..8eb78b19 100644
--- a/testcases/Controllers/ODL/odlreport2db.py
+++ b/testcases/Controllers/ODL/odlreport2db.py
@@ -33,9 +33,9 @@ import functest.utils.functest_utils as functest_utils
 
 def usage():
     print """Usage:
-    get-json-from-robot.py --xml=<output.xml> --pod=<pod_name>
-                           --installer=<installer> --database=<Database URL>
-                           --scenaro=SCENARIO
+    python odlreport2db.py --xml=<output.xml> --pod=<pod name>
+                           --installer=<installer> --database=<database url>
+                           --scenario=<scenario>
     -x, --xml   xml file generated by robot test
     -p, --pod   POD name where the test come from
     -i, --installer
@@ -76,6 +76,7 @@ def parse_suites(suites):
 
 
 def main(argv):
+    (xml_file, pod, installer, scenario) = None, None, None, None
     try:
         opts, args = getopt.getopt(argv,
                                    'x:p:i:s:h',
@@ -100,6 +101,9 @@ def main(argv):
         else:
             usage()
 
+    if not all(x is not None for x in (xml_file, pod, installer, scenario)):
+        usage()
+
     with open(xml_file, "r") as myfile:
         xml_input = myfile.read().replace('\n', '')
 
-- 
cgit 1.2.3-korg