Support verbose logging

The previous verbose logging switch '-v' doesn't work as we expected.
Change the code to follow python conventions to make it work.

Issue-ID: VNFSDK-297
Change-Id: Ia0c41b5067d9c28acccabc4137797310052fce5e
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>

1 files changed, 23 insertions, 10 deletions

diff --git a/vnfsdk_pkgtools/cli/__main__.py b/vnfsdk_pkgtools/cli/__main__.py
index fee321c..23dbe02 100644
--- a/vnfsdk_pkgtools/cli/__main__.py
+++ b/vnfsdk_pkgtools/cli/__main__.py
@@ -28,19 +28,18 @@ def csar_create_func(namespace):
     csar.write(namespace.source,
                         namespace.entry,
                         namespace.destination,
-                        logging,
                         args=namespace)
+
 def csar_open_func(namespace):
     csar.read(namespace.source,
-                       namespace.destination,
-                       logging)
+                       namespace.destination)
+
 def csar_validate_func(namespace):
     workdir = tempfile.mkdtemp()
     try:
         reader = None
         reader = csar.read(namespace.source,
-                           workdir,
-                           logging)
+                           workdir)
 
         driver = validator.get_validator(namespace.parser)
         driver.validate(reader)
@@ -53,15 +52,15 @@ def parse_args(args_list):
     CLI entry point
     """
     parser = argparse.ArgumentParser(description='VNF SDK CSAR manipulation tool')
-
-    subparsers = parser.add_subparsers(help='csar-create')
-    csar_create = subparsers.add_parser('csar-create')
-    csar_create.set_defaults(func=csar_create_func)
-    csar_create.add_argument('-v', '--verbose',
+    parser.add_argument('-v', '--verbose',
             dest='verbosity',
             action='count',
             default=0,
             help='Set verbosity level (can be passed multiple times)')
+
+    subparsers = parser.add_subparsers(help='csar-create')
+    csar_create = subparsers.add_parser('csar-create')
+    csar_create.set_defaults(func=csar_create_func)
     csar_create.add_argument(
         'source',
         help='Service template directory')
@@ -112,8 +111,22 @@ def parse_args(args_list):
 
     return parser.parse_args(args_list)
 
+
+def init_logging(args):
+    verbosity = [logging.WARNING, logging.INFO, logging.DEBUG]
+
+    logging.basicConfig()
+    logger = logging.getLogger('vnfsdk_pkgtools')
+    if args.verbosity >= len(verbosity):
+        verbose = verbosity[-1]
+    else:
+        verbose = verbosity[args.verbosity]
+    logger.setLevel(verbose)
+
+
 def main():
     args = parse_args(sys.argv[1:])
+    init_logging(args)
     args.func(args)