Fix bug 1721: charms can include reference to .charm files

[osm/osmclient.git] / osmclient / client.py

diff --git a/osmclient/client.py b/osmclient/client.py
index 0c244ed..fe64f1c 100644 (file)
--- 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,46 @@
 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")