From 811bd30f6222afe182abd8da302e7498fa71355e Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 30 May 2013 11:37:37 -0500 Subject: [PATCH 1/2] get rid of a stray debug print --- barbicanclient/client.py | 1 - 1 file changed, 1 deletion(-) diff --git a/barbicanclient/client.py b/barbicanclient/client.py index 2be8ab90..c96f644d 100644 --- a/barbicanclient/client.py +++ b/barbicanclient/client.py @@ -133,7 +133,6 @@ class Connection(object): def get_secret_by_id(self, secret_id): href = "{0}/{1}/{2}".format(self._tenant, self.SECRETS_PATH, secret_id) - print href return self.get_secret(href) def get_secret(self, href): From 60a1101041d734f53b57fce26b644185bcc3b800 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 31 May 2013 08:51:19 -0500 Subject: [PATCH 2/2] remove last marconi refs --- barbicanclient/common/auth.py | 6 +++--- tox.ini | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/barbicanclient/common/auth.py b/barbicanclient/common/auth.py index 65248134..ab2a979c 100644 --- a/barbicanclient/common/auth.py +++ b/barbicanclient/common/auth.py @@ -14,7 +14,7 @@ def authenticate(auth_url, user, key, tenant, **kwargs): :param auth_url: The keystone auth endpoint to use :param user: The username to use for auth :param key: The apikey to use for authentiation - :param endpoint: The Marconi endpoint to use. IOW, don't + :param endpoint: The Barbican endpoint to use. IOW, don't look up an endpoint in the service catalog, just use this one instead. :param tenant_name: The optional tenant-name to use @@ -26,7 +26,7 @@ def authenticate(auth_url, user, key, tenant, **kwargs): the service catalog :param region_name The region to pass for authentication - :returns: Tuple containing Marconi endpoint and token + :returns: Tuple containing Barbican endpoint and token :raises: ClientException """ @@ -67,4 +67,4 @@ def authenticate(auth_url, user, key, tenant, **kwargs): except exceptions.EndpointNotFound as ex: raise ClientException('Endpoint not found in service catalog') - return endpoint, _ksclient.auth_token \ No newline at end of file + return endpoint, _ksclient.auth_token diff --git a/tox.ini b/tox.ini index 53e3241c..2a3e4941 100644 --- a/tox.ini +++ b/tox.ini @@ -24,7 +24,7 @@ commands = flake8 commands = {posargs} [testenv:cover] -commands = nosetests --with-coverage --cover-package=marconiclient +commands = nosetests --with-coverage --cover-package=barbicanclient [tox:jenkins] downloadcache = ~/cache/pip