Change app.restapi to app.client_manager.session

This is step 1 toward using Keystone client's session.Session as the
primary session/requests interface in OSC.

* Move the session create into ClientManager and rename 'restapi' attribute to 'session'
* Set up ClientManager and session loggers
* Fix container and object command references to restapi/api

Change-Id: I013d81520b336c7a6422cd22c05d1d65655e64f8

4 files changed, 107 insertions, 102 deletions

diff --git a/openstackclient/tests/object/v1/lib/test_container.py b/openstackclient/tests/object/v1/lib/test_container.py
index f7355592..ce70b835 100644
--- a/openstackclient/tests/object/v1/lib/test_container.py
+++ b/openstackclient/tests/object/v1/lib/test_container.py
@@ -18,7 +18,7 @@
 import mock
 
 from openstackclient.object.v1.lib import container as lib_container
-from openstackclient.tests.common import test_restapi as restapi
+from openstackclient.tests import fakes
 from openstackclient.tests.object.v1 import fakes as object_fakes
 
 
@@ -39,156 +39,158 @@ class TestContainer(object_fakes.TestObjectv1):
 
     def setUp(self):
         super(TestContainer, self).setUp()
-        self.app.restapi = mock.MagicMock()
+        self.app.client_manager.session = mock.MagicMock()
 
 
 class TestContainerList(TestContainer):
 
     def test_container_list_no_options(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_marker(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             marker='next',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'marker': 'next',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_limit(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             limit=5,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'limit': 5,
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_end_marker(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             end_marker='last',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'end_marker': 'last',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_prefix(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             prefix='foo/',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'prefix': 'foo/',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_container_list_full_listing(self):
+        sess = self.app.client_manager.session
 
         def side_effect(*args, **kwargs):
-            rv = self.app.restapi.list.return_value
-            self.app.restapi.list.return_value = []
-            self.app.restapi.list.side_effect = None
+            rv = sess.get().json.return_value
+            sess.get().json.return_value = []
+            sess.get().json.side_effect = None
             return rv
 
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
-        self.app.restapi.list.side_effect = side_effect
+        sess.get().json.return_value = resp
+        sess.get().json.side_effect = side_effect
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             full_listing=True,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        sess.get.assert_called_with(
             fake_url,
             params={
                 'format': 'json',
                 'marker': 'is-name',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
 
 class TestContainerShow(TestContainer):
 
     def test_container_show_no_options(self):
         resp = {
+            'X-Container-Meta-Owner': fake_account,
             'x-container-object-count': 1,
             'x-container-bytes-used': 577,
         }
-        self.app.restapi.head.return_value = \
-            restapi.FakeResponse(headers=resp)
+        self.app.client_manager.session.head.return_value = \
+            fakes.FakeResponse(headers=resp)
 
         data = lib_container.show_container(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             'is-name',
         )
 
         # Check expected values
-        self.app.restapi.head.assert_called_with(
+        self.app.client_manager.session.head.assert_called_with(
             fake_url + '/is-name',
         )
 
@@ -202,4 +204,4 @@ class TestContainerShow(TestContainer):
             'sync_to': None,
             'sync_key': None,
         }
-        self.assertEqual(data, data_expected)
+        self.assertEqual(data_expected, data)
diff --git a/openstackclient/tests/object/v1/lib/test_object.py b/openstackclient/tests/object/v1/lib/test_object.py
index 064efb53..f96732b4 100644
--- a/openstackclient/tests/object/v1/lib/test_object.py
+++ b/openstackclient/tests/object/v1/lib/test_object.py
@@ -18,7 +18,7 @@
 import mock
 
 from openstackclient.object.v1.lib import object as lib_object
-from openstackclient.tests.common import test_restapi as restapi
+from openstackclient.tests import fakes
 from openstackclient.tests.object.v1 import fakes as object_fakes
 
 
@@ -40,99 +40,99 @@ class TestObject(object_fakes.TestObjectv1):
 
     def setUp(self):
         super(TestObject, self).setUp()
-        self.app.restapi = mock.MagicMock()
+        self.app.client_manager.session = mock.MagicMock()
 
 
 class TestObjectListObjects(TestObject):
 
     def test_list_objects_no_options(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url + '/' + fake_container,
             params={
                 'format': 'json',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_list_objects_marker(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
             marker='next',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url + '/' + fake_container,
             params={
                 'format': 'json',
                 'marker': 'next',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_list_objects_limit(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
             limit=5,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url + '/' + fake_container,
             params={
                 'format': 'json',
                 'limit': 5,
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_list_objects_end_marker(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
             end_marker='last',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url + '/' + fake_container,
             params={
                 'format': 'json',
                 'end_marker': 'last',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_list_objects_delimiter(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
             delimiter='|',
@@ -142,85 +142,86 @@ class TestObjectListObjects(TestObject):
         # NOTE(dtroyer): requests handles the URL encoding and we're
         #                mocking that so use the otherwise-not-legal
         #                pipe '|' char in the response.
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url + '/' + fake_container,
             params={
                 'format': 'json',
                 'delimiter': '|',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_list_objects_prefix(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
             prefix='foo/',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url + '/' + fake_container,
             params={
                 'format': 'json',
                 'prefix': 'foo/',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_list_objects_path(self):
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
+        self.app.client_manager.session.get().json.return_value = resp
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
             path='next',
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        self.app.client_manager.session.get.assert_called_with(
             fake_url + '/' + fake_container,
             params={
                 'format': 'json',
                 'path': 'next',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
     def test_list_objects_full_listing(self):
+        sess = self.app.client_manager.session
 
         def side_effect(*args, **kwargs):
-            rv = self.app.restapi.list.return_value
-            self.app.restapi.list.return_value = []
-            self.app.restapi.list.side_effect = None
+            rv = sess.get().json.return_value
+            sess.get().json.return_value = []
+            sess.get().json.side_effect = None
             return rv
 
         resp = [{'name': 'is-name'}]
-        self.app.restapi.list.return_value = resp
-        self.app.restapi.list.side_effect = side_effect
+        sess.get().json.return_value = resp
+        sess.get().json.side_effect = side_effect
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            sess,
             fake_url,
             fake_container,
             full_listing=True,
         )
 
         # Check expected values
-        self.app.restapi.list.assert_called_with(
+        sess.get.assert_called_with(
             fake_url + '/' + fake_container,
             params={
                 'format': 'json',
                 'marker': 'is-name',
             }
         )
-        self.assertEqual(data, resp)
+        self.assertEqual(resp, data)
 
 
 class TestObjectShowObjects(TestObject):
@@ -228,19 +229,20 @@ class TestObjectShowObjects(TestObject):
     def test_object_show_no_options(self):
         resp = {
             'content-type': 'text/alpha',
+            'x-container-meta-owner': fake_account,
         }
-        self.app.restapi.head.return_value = \
-            restapi.FakeResponse(headers=resp)
+        self.app.client_manager.session.head.return_value = \
+            fakes.FakeResponse(headers=resp)
 
         data = lib_object.show_object(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
             fake_object,
         )
 
         # Check expected values
-        self.app.restapi.head.assert_called_with(
+        self.app.client_manager.session.head.assert_called_with(
             fake_url + '/%s/%s' % (fake_container, fake_object),
         )
 
@@ -250,7 +252,7 @@ class TestObjectShowObjects(TestObject):
             'object': fake_object,
             'content-type': 'text/alpha',
         }
-        self.assertEqual(data, data_expected)
+        self.assertEqual(data_expected, data)
 
     def test_object_show_all_options(self):
         resp = {
@@ -258,22 +260,23 @@ class TestObjectShowObjects(TestObject):
             'content-length': 577,
             'last-modified': '20130101',
             'etag': 'qaz',
+            'x-container-meta-owner': fake_account,
             'x-object-manifest': None,
             'x-object-meta-wife': 'Wilma',
             'x-tra-header': 'yabba-dabba-do',
         }
-        self.app.restapi.head.return_value = \
-            restapi.FakeResponse(headers=resp)
+        self.app.client_manager.session.head.return_value = \
+            fakes.FakeResponse(headers=resp)
 
         data = lib_object.show_object(
-            self.app.restapi,
+            self.app.client_manager.session,
             fake_url,
             fake_container,
             fake_object,
         )
 
         # Check expected values
-        self.app.restapi.head.assert_called_with(
+        self.app.client_manager.session.head.assert_called_with(
             fake_url + '/%s/%s' % (fake_container, fake_object),
         )
 
@@ -286,7 +289,7 @@ class TestObjectShowObjects(TestObject):
             'last-modified': '20130101',
             'etag': 'qaz',
             'x-object-manifest': None,
-            'Wife': 'Wilma',
-            'X-Tra-Header': 'yabba-dabba-do',
+            'wife': 'Wilma',
+            'x-tra-header': 'yabba-dabba-do',
         }
-        self.assertEqual(data, data_expected)
+        self.assertEqual(data_expected, data)
diff --git a/openstackclient/tests/object/v1/test_container.py b/openstackclient/tests/object/v1/test_container.py
index 4afb1006..b72c79d6 100644
--- a/openstackclient/tests/object/v1/test_container.py
+++ b/openstackclient/tests/object/v1/test_container.py
@@ -77,7 +77,7 @@ class TestContainerList(TestObject):
         kwargs = {
         }
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             **kwargs
         )
@@ -113,7 +113,7 @@ class TestContainerList(TestObject):
             'prefix': 'bit',
         }
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             **kwargs
         )
@@ -148,7 +148,7 @@ class TestContainerList(TestObject):
             'marker': object_fakes.container_name,
         }
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             **kwargs
         )
@@ -183,7 +183,7 @@ class TestContainerList(TestObject):
             'end_marker': object_fakes.container_name_3,
         }
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             **kwargs
         )
@@ -218,7 +218,7 @@ class TestContainerList(TestObject):
             'limit': 2,
         }
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             **kwargs
         )
@@ -252,7 +252,7 @@ class TestContainerList(TestObject):
         kwargs = {
         }
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             **kwargs
         )
@@ -296,7 +296,7 @@ class TestContainerList(TestObject):
             'full_listing': True,
         }
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             **kwargs
         )
@@ -341,7 +341,7 @@ class TestContainerShow(TestObject):
         }
         # lib.container.show_container(api, url, container)
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name,
             **kwargs
diff --git a/openstackclient/tests/object/v1/test_object.py b/openstackclient/tests/object/v1/test_object.py
index bea0d270..26d07b2c 100644
--- a/openstackclient/tests/object/v1/test_object.py
+++ b/openstackclient/tests/object/v1/test_object.py
@@ -71,7 +71,7 @@ class TestObjectList(TestObject):
         columns, data = self.cmd.take_action(parsed_args)
 
         o_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name,
         )
@@ -107,7 +107,7 @@ class TestObjectList(TestObject):
             'prefix': 'floppy',
         }
         o_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name_2,
             **kwargs
@@ -143,7 +143,7 @@ class TestObjectList(TestObject):
             'delimiter': '=',
         }
         o_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name_2,
             **kwargs
@@ -179,7 +179,7 @@ class TestObjectList(TestObject):
             'marker': object_fakes.object_name_2,
         }
         o_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name_2,
             **kwargs
@@ -215,7 +215,7 @@ class TestObjectList(TestObject):
             'end_marker': object_fakes.object_name_2,
         }
         o_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name_2,
             **kwargs
@@ -251,7 +251,7 @@ class TestObjectList(TestObject):
             'limit': 2,
         }
         o_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name_2,
             **kwargs
@@ -287,7 +287,7 @@ class TestObjectList(TestObject):
         kwargs = {
         }
         o_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name,
             **kwargs
@@ -337,7 +337,7 @@ class TestObjectList(TestObject):
             'full_listing': True,
         }
         o_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name,
             **kwargs
@@ -384,7 +384,7 @@ class TestObjectShow(TestObject):
         }
         # lib.container.show_container(api, url, container)
         c_mock.assert_called_with(
-            self.app.restapi,
+            self.app.client_manager.session,
             AUTH_URL,
             object_fakes.container_name,
             object_fakes.object_name_1,