summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdmond Kotowski <ekotowski@gmail.com>2015-01-12 18:04:07 -0800
committerEdmond Kotowski <ekotowski@gmail.com>2015-01-12 18:11:34 -0800
commit976f57444402178148cc0100b7a2abe9d6b8c453 (patch)
treecd85e69b68d493b9bb0a58e7997665d9d16a9f3a
parent7a06f8632e638510bc00df4e96801ecd295aeb8e (diff)
downloadpython-troveclient-976f57444402178148cc0100b7a2abe9d6b8c453.tar.gz
default endpoint_type to 'publicURL'
When trying to create a troveclient.v1.client.Client without specifying endpoint_type explicitly it will raise an AuthorizationFailure exception. This was because troveclient.v1.client.Client defaulted endpoint_type=None which overrides the troveclient.client.HTTPClient default value of 'publicURL' to None. Fix was to default the endpoint_type to 'publicURL' in the troveclient.v1.client.Client __init__ method. Also updated the documentation and README.rst for creating a trove client object because it was out of date and incorrect. Change-Id: I64dfbaa4eefc73d01468470dbe9eba5e209ff157 Closes-Bug: 1409982
-rw-r--r--README.rst5
-rw-r--r--troveclient/v1/client.py7
2 files changed, 9 insertions, 3 deletions
diff --git a/README.rst b/README.rst
index de4df1f..2c3cde0 100644
--- a/README.rst
+++ b/README.rst
@@ -204,6 +204,9 @@ Quick-start using keystone::
# use v2.0 auth with http://example.com:5000/v2.0/")
>>> from troveclient.v1 import client
- >>> nt = client.Client(USER, PASS, TENANT, AUTH_URL, service_type="database")
+ >>> nt = client.Client(USERNAME,
+ PASSWORD,
+ project_id=TENANT_NAME,
+ auth_url=AUTH_URL))
>>> nt.instances.list()
[...]
diff --git a/troveclient/v1/client.py b/troveclient/v1/client.py
index 886b396..7e61780 100644
--- a/troveclient/v1/client.py
+++ b/troveclient/v1/client.py
@@ -35,7 +35,10 @@ class Client(object):
Create an instance with your creds::
- >> client = Client(USERNAME, PASSWORD, PROJECT_ID, AUTH_URL)
+ >> client = Client(USERNAME,
+ PASSWORD,
+ project_id=TENANT_NAME,
+ auth_url=AUTH_URL)
Then call methods on its managers::
@@ -47,7 +50,7 @@ class Client(object):
def __init__(self, username, password, project_id=None, auth_url='',
insecure=False, timeout=None, tenant_id=None,
proxy_tenant_id=None, proxy_token=None, region_name=None,
- endpoint_type=None, extensions=None,
+ endpoint_type='publicURL', extensions=None,
service_type='database', service_name=None,
database_service_name=None, retries=None,
http_log_debug=False,