From 4bbd03210f82d8f9a89627e08a546ba9841ff7fb Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 8 Aug 2014 17:38:44 -0500
Subject: 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
---
 openstackclient/tests/object/v1/test_object.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'openstackclient/tests/object/v1/test_object.py')

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,
-- 
cgit v1.2.1