X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fclient.py;h=56570b4d6861f875e4abaccbe43dffac85e33fde;hb=f6a4f77b98e5f05b74938b44bcbb2ed148e4941a;hp=1016608463535bf13492fc6aea14041e0bf4c891;hpb=4c7e237e45bc6fe209006b4837a8e6b031e78e1c;p=osm%2Fosmclient.git

diff --git a/osmclient/client.py b/osmclient/client.py
index 1016608..56570b4 100644
--- a/osmclient/client.py
+++ b/osmclient/client.py
@@ -1,4 +1,5 @@
-# Copyright 2017 Sandvine
+# Copyright 2017-2018 Sandvine
+# Copyright 2018 Telefonica
 #
 # All Rights Reserved.
 #
@@ -18,11 +19,41 @@
 OSM client entry point
 """
 
-from osmclient.v1 import client
+from osmclient.v1 import client as client
+from osmclient.sol005 import client as sol005client
+import logging
+import verboselogs
+verboselogs.install()
 
 
-def Client(version=1, host=None, *args, **kwargs):
-    if version == 1:
-        return client.Client(host, *args, **kwargs)
+def Client(version=1, host=None, sol005=True, *args, **kwargs):
+    log_format_simple = "%(levelname)s %(message)s"
+    log_format_complete = "%(asctime)s %(levelname)s %(name)s %(filename)s:%(lineno)s %(funcName)s(): %(message)s"
+    log_formatter_simple = logging.Formatter(log_format_simple, datefmt='%Y-%m-%dT%H:%M:%S')
+    handler = logging.StreamHandler()
+    handler.setFormatter(log_formatter_simple)
+    logger = logging.getLogger('osmclient')
+    logger.setLevel(level=logging.WARNING)
+    logger.addHandler(handler)
+    verbose = kwargs.get('verbose',0)
+    if verbose>0:
+        log_formatter = logging.Formatter(log_format_complete, datefmt='%Y-%m-%dT%H:%M:%S')
+        #handler = logging.StreamHandler()
+        handler.setFormatter(log_formatter)
+        #logger.addHandler(handler)
+        if verbose==1:
+            logger.setLevel(level=logging.INFO)
+        elif verbose==2:
+            logger.setLevel(level=logging.VERBOSE)
+        elif verbose>2:
+            logger.setLevel(level=logging.DEBUG)
+    if not sol005:
+        if version == 1:
+            return client.Client(host, *args, **kwargs)
+        else:
+            raise Exception("Unsupported client version")
     else:
-        raise Exception("Unsupported client version")
+        if version == 1:
+            return sol005client.Client(host, *args, **kwargs)
+        else:
+            raise Exception("Unsupported client version")