Revert "Remove v1 version of osmclient which was used with old NBI (pre-Release FOUR)"

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

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index 74bb84b..e5be118 100755 (executable)
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -41,8 +41,9 @@ from osmclient.cli_commands import (
     wim,
 )
 import yaml
+import pycurl
+import os
 import logging
-from requests import RequestException
 
 
 @click.group(
@@ -114,7 +115,8 @@ def cli_osm(ctx, **kwargs):
         exit(1)
     # Remove None values
     kwargs = {k: v for k, v in kwargs.items() if v is not None}
-    ctx.obj = client.Client(version=1, host=hostname, **kwargs)
+    sol005 = os.getenv("OSM_SOL005", True)
+    ctx.obj = client.Client(host=hostname, sol005=sol005, **kwargs)
     logger = logging.getLogger("osmclient")
 
 
@@ -290,7 +292,7 @@ def cli():
 
         cli_osm()
         exit(0)
-    except RequestException as exc:
+    except pycurl.error as exc:
         print(exc)
         print(
             'Maybe "--hostname" option or OSM_HOSTNAME environment variable needs to be specified'