Merge "Bug fix: pass auth parameters to Client in order to get the authentication."

README.rst

@@ -103,9 +103,11 @@ There's also a complete Python API, but it has not yet been documented.
 
 Quick-start using keystone::
 
-    # use v3 auth with http://controller:5000/v3
-    >>> from cyborgclient import client
-    >>> nt = client.Client(USERNAME, PASSWORD, PROJECT_ID, AUTH_URL)
+    # pass auth plugin and session to Client init.
+    # service_parameters contains servive_name, service_type, interface and
+    # region name.
+    >>> from cyborgclient.v1 import client
+    >>> nt = client.Client(auth=auth,session=_SESSION,**service_parameters)
     >>> nt.accelerators.list()
     [...]
 

cyborgclient/shell.py

@@ -60,7 +60,7 @@ from cyborgclient import version
 
 LATEST_API_VERSION = ('1', 'latest')
 DEFAULT_INTERFACE = 'public'
-DEFAULT_SERVICE_TYPE = 'acceleration'
+DEFAULT_SERVICE_TYPE = 'accelerator'
 
 logger = logging.getLogger(__name__)
 

cyborgclient/v1/client.py

@@ -44,7 +44,7 @@ def _load_session(cloud=None, insecure=False, timeout=None, **kwargs):
 
 def _load_service_type(session,
                        service_type=None, service_name=None,
-                       interface=None, region_name=None):
+                       interface=None, region_name=None, **kwargs):
     try:
         # Trigger an auth error so that we can throw the exception
         # we always have
@@ -52,7 +52,8 @@ def _load_service_type(session,
             service_type=service_type,
             service_name=service_name,
             interface=interface,
-            region_name=region_name)
+            region_name=region_name,
+            **kwargs)
     except Exception as e:
         raise RuntimeError(str(e))
 
@@ -93,6 +94,7 @@ def _load_session_client(session=None, endpoint_override=None, username=None,
             service_name=service_name,
             interface=interface,
             region_name=region_name,
+            **kwargs
         )
 
     return httpclient.SessionClient(
@@ -103,6 +105,7 @@ def _load_session_client(session=None, endpoint_override=None, username=None,
         session=session,
         endpoint_override=endpoint_override,
         api_version=api_version,
+        **kwargs
     )