X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fclient.py;h=a076fc47330c4cd79545e64a0cfd03cae53d4c97;hb=d1ccf0e88aeacb065b97a6c5cb82e6de53537b94;hp=fe4869a8f9e4609d1224cc22f41b869409e5d708;hpb=ea593ec357b5e83ac373f3f3fe341449116e5e2d;p=osm%2Fosmclient.git diff --git a/osmclient/client.py b/osmclient/client.py index fe4869a..a076fc4 100644 --- a/osmclient/client.py +++ b/osmclient/client.py @@ -19,6 +19,7 @@ OSM client entry point """ +from osmclient.v1 import client as client from osmclient.sol005 import client as sol005client import logging import verboselogs @@ -27,7 +28,7 @@ import verboselogs verboselogs.install() -def Client(version=1, host=None, *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( @@ -52,7 +53,13 @@ def Client(version=1, host=None, *args, **kwargs): logger.setLevel(level=logging.VERBOSE) elif verbose > 2: logger.setLevel(level=logging.DEBUG) - if version == 1: - return sol005client.Client(host, *args, **kwargs) + 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")