Merge "Remove instances of _base_url"

6 files changed, 12 insertions, 16 deletions

diff --git a/barbicanclient/base.py b/barbicanclient/base.py
index 541db0e..56313ad 100644
--- a/barbicanclient/base.py
+++ b/barbicanclient/base.py
@@ -52,8 +52,7 @@ class BaseEntityManager(object):
         """
         Returns the total number of entities stored in Barbican.
         """
-        href = '{0}/{1}'.format(self._api._base_url, self._entity)
         params = {'limit': 0, 'offset': 0}
-        resp = self._api.get(href, params=params)
+        resp = self._api.get(self._entity, params=params)
 
         return resp['total']
diff --git a/barbicanclient/client.py b/barbicanclient/client.py
index 5b3085e..939f8fb 100644
--- a/barbicanclient/client.py
+++ b/barbicanclient/client.py
@@ -47,8 +47,6 @@ class _HTTPClient(adapter.Adapter):
 
         self.endpoint_override = '{0}/{1}'.format(endpoint,
                                                   _DEFAULT_API_VERSION)
-        self._base_url = self.endpoint_override
-
         if project_id is None:
             self._default_headers = dict()
         else:
diff --git a/barbicanclient/containers.py b/barbicanclient/containers.py
index 8fa7716..b318779 100644
--- a/barbicanclient/containers.py
+++ b/barbicanclient/containers.py
@@ -707,14 +707,13 @@ class ContainerManager(base.BaseEntityManager):
         """
         LOG.debug('Listing containers - offset {0} limit {1} name {2} type {3}'
                   .format(offset, limit, name, type))
-        href = '{0}/{1}'.format(self._api._base_url, self._entity)
         params = {'limit': limit, 'offset': offset}
         if name:
             params['name'] = name
         if type:
             params['type'] = type
 
-        response = self._api.get(href, params=params)
+        response = self._api.get(self._entity, params=params)
 
         return [self._generate_typed_container(container)
                 for container in response.get('containers', [])]
@@ -755,9 +754,8 @@ class ContainerManager(base.BaseEntityManager):
         """
         LOG.debug('Deleting consumer registration for container '
                   '{0} as {1}: {2}'.format(container_ref, name, url))
-        href = '{0}/{1}/{2}/consumers'.format(self._api._base_url,
-                                              self._entity,
-                                              container_ref.split('/')[-1])
+        href = '{0}/{1}/consumers'.format(self._entity,
+                                          container_ref.split('/')[-1])
         consumer_dict = {
             'name': name,
             'URL': url
diff --git a/barbicanclient/tests/test_client.py b/barbicanclient/tests/test_client.py
index c34c817..22b104b 100644
--- a/barbicanclient/tests/test_client.py
+++ b/barbicanclient/tests/test_client.py
@@ -41,7 +41,7 @@ class WhenTestingClientInit(TestClient):
         c = client._HTTPClient(session=self.session,
                                endpoint=self.endpoint,
                                project_id=self.project_id)
-        self.assertEqual(c._base_url, 'http://localhost:9311/v1')
+        self.assertEqual(c.endpoint_override, 'http://localhost:9311/v1')
 
     def test_default_headers_are_empty(self):
         c = client._HTTPClient(session=self.session, endpoint=self.endpoint)
@@ -63,17 +63,18 @@ class WhenTestingClientInit(TestClient):
         self.assertRaises(ValueError, client.Client,
                           **{"endpoint": self.endpoint})
 
-    def test_base_url_starts_with_endpoint_url(self):
+    def test_endpoint_override_starts_with_endpoint_url(self):
         c = client._HTTPClient(session=self.session,
                                endpoint=self.endpoint,
                                project_id=self.project_id)
-        self.assertTrue(c._base_url.startswith(self.endpoint))
+        self.assertTrue(c.endpoint_override.startswith(self.endpoint))
 
-    def test_base_url_ends_with_default_api_version(self):
+    def test_endpoint_override_ends_with_default_api_version(self):
         c = client._HTTPClient(session=self.session,
                                endpoint=self.endpoint,
                                project_id=self.project_id)
-        self.assertTrue(c._base_url.endswith(client._DEFAULT_API_VERSION))
+        self.assertTrue(
+            c.endpoint_override.endswith(client._DEFAULT_API_VERSION))
 
 
 class WhenTestingClientPost(TestClient):
diff --git a/functionaltests/client/v1/behaviors/base_behaviors.py b/functionaltests/client/v1/behaviors/base_behaviors.py
index 9192f98..da642dd 100644
--- a/functionaltests/client/v1/behaviors/base_behaviors.py
+++ b/functionaltests/client/v1/behaviors/base_behaviors.py
@@ -23,7 +23,7 @@ class BaseBehaviors(object):
         self.LOG = logging.getLogger(type(self).__name__)
         self.client = client
         self.created_entities = []
-        self.base_url = client.secrets._api._base_url
+        self.base_url = client.secrets._api.endpoint_override
 
     def get_json(self, response):
         json_data = dict()
diff --git a/functionaltests/client/v1/functional/test_containers.py b/functionaltests/client/v1/functional/test_containers.py
index 2c7c284..a721c28 100644
--- a/functionaltests/client/v1/functional/test_containers.py
+++ b/functionaltests/client/v1/functional/test_containers.py
@@ -186,7 +186,7 @@ class GenericContainersTestCase(BaseContainersTestCase):
         This should return a 404.
         """
         uuid = 'de305d54-75b4-431b-cccc-eb6b9e546013'
-        base_url = self.barbicanclient.secrets._api._base_url
+        base_url = self.behaviors.base_url
         url = base_url + '/containers/' + uuid
 
         e = self.assertRaises(