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, 55 insertions, 56 deletions

diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
index ae4013fc..1ca07f3a 100644
--- a/openstackclient/object/v1/container.py
+++ b/openstackclient/object/v1/container.py
@@ -45,7 +45,7 @@ class CreateContainer(show.ShowOne):
         self.log.debug('take_action(%s)', parsed_args)
 
         data = lib_container.create_container(
-            self.app.restapi,
+            self.app.client_manager.session,
             self.app.client_manager.object_store.endpoint,
             parsed_args.container,
         )
@@ -71,7 +71,7 @@ class DeleteContainer(command.Command):
         self.log.debug('take_action(%s)', parsed_args)
 
         lib_container.delete_container(
-            self.app.restapi,
+            self.app.client_manager.session,
             self.app.client_manager.object_store.endpoint,
             parsed_args.container,
         )
@@ -140,7 +140,7 @@ class ListContainer(lister.Lister):
             kwargs['full_listing'] = True
 
         data = lib_container.list_containers(
-            self.app.restapi,
+            self.app.client_manager.session,
             self.app.client_manager.object_store.endpoint,
             **kwargs
         )
@@ -170,7 +170,7 @@ class ShowContainer(show.ShowOne):
         self.log.debug('take_action(%s)', parsed_args)
 
         data = lib_container.show_container(
-            self.app.restapi,
+            self.app.client_manager.session,
             self.app.client_manager.object_store.endpoint,
             parsed_args.container,
         )
diff --git a/openstackclient/object/v1/lib/container.py b/openstackclient/object/v1/lib/container.py
index bd509555..65a9fe4d 100644
--- a/openstackclient/object/v1/lib/container.py
+++ b/openstackclient/object/v1/lib/container.py
@@ -23,46 +23,46 @@ except ImportError:
 
 
 def create_container(
-    api,
+    session,
     url,
     container,
 ):
     """Create a container
 
-    :param api: a restapi object
+    :param session: a restapi object
     :param url: endpoint
     :param container: name of container to create
     :returns: dict of returned headers
     """
 
-    response = api.put("%s/%s" % (url, container))
+    response = session.put("%s/%s" % (url, container))
     url_parts = urlparse(url)
     data = {
         'account': url_parts.path.split('/')[-1],
         'container': container,
+        'x-trans-id': response.headers.get('x-trans-id', None),
     }
-    data['x-trans-id'] = response.headers.get('x-trans-id', None)
 
     return data
 
 
 def delete_container(
-    api,
+    session,
     url,
     container,
 ):
     """Delete a container
 
-    :param api: a restapi object
+    :param session: a restapi object
     :param url: endpoint
     :param container: name of container to delete
     """
 
-    api.delete("%s/%s" % (url, container))
+    session.delete("%s/%s" % (url, container))
 
 
 def list_containers(
-    api,
+    session,
     url,
     marker=None,
     limit=None,
@@ -72,7 +72,7 @@ def list_containers(
 ):
     """Get containers in an account
 
-    :param api: a restapi object
+    :param session: a restapi object
     :param url: endpoint
     :param marker: marker query
     :param limit: limit query
@@ -85,7 +85,7 @@ def list_containers(
 
     if full_listing:
         data = listing = list_containers(
-            api,
+            session,
             url,
             marker,
             limit,
@@ -95,7 +95,7 @@ def list_containers(
         while listing:
             marker = listing[-1]['name']
             listing = list_containers(
-                api,
+                session,
                 url,
                 marker,
                 limit,
@@ -117,34 +117,35 @@ def list_containers(
         params['end_marker'] = end_marker
     if prefix:
         params['prefix'] = prefix
-    return api.list(url, params=params)
+    return session.get(url, params=params).json()
 
 
 def show_container(
-    api,
+    session,
     url,
     container,
 ):
     """Get container details
 
-    :param api: a restapi object
+    :param session: a restapi object
     :param url: endpoint
     :param container: name of container to show
     :returns: dict of returned headers
     """
 
-    response = api.head("%s/%s" % (url, container))
-    url_parts = urlparse(url)
+    response = session.head("%s/%s" % (url, container))
     data = {
-        'account': url_parts.path.split('/')[-1],
+        'account': response.headers.get('x-container-meta-owner', None),
         'container': container,
+        'object_count': response.headers.get(
+            'x-container-object-count',
+            None,
+        ),
+        'bytes_used': response.headers.get('x-container-bytes-used', None),
+        'read_acl': response.headers.get('x-container-read', None),
+        'write_acl': response.headers.get('x-container-write', None),
+        'sync_to': response.headers.get('x-container-sync-to', None),
+        'sync_key': response.headers.get('x-container-sync-key', None),
     }
-    data['object_count'] = response.headers.get(
-        'x-container-object-count', None)
-    data['bytes_used'] = response.headers.get('x-container-bytes-used', None)
-    data['read_acl'] = response.headers.get('x-container-read', None)
-    data['write_acl'] = response.headers.get('x-container-write', None)
-    data['sync_to'] = response.headers.get('x-container-sync-to', None)
-    data['sync_key'] = response.headers.get('x-container-sync-key', None)
 
     return data
diff --git a/openstackclient/object/v1/lib/object.py b/openstackclient/object/v1/lib/object.py
index 2473caa3..0ded0dad 100644
--- a/openstackclient/object/v1/lib/object.py
+++ b/openstackclient/object/v1/lib/object.py
@@ -25,14 +25,14 @@ except ImportError:
 
 
 def create_object(
-    api,
+    session,
     url,
     container,
     object,
 ):
     """Create an object, upload it to a container
 
-    :param api: a restapi object
+    :param session: a restapi object
     :param url: endpoint
     :param container: name of container to store object
     :param object: local path to object
@@ -40,38 +40,38 @@ def create_object(
     """
 
     full_url = "%s/%s/%s" % (url, container, object)
-    response = api.put(full_url, data=open(object))
+    response = session.put(full_url, data=open(object))
     url_parts = urlparse(url)
     data = {
         'account': url_parts.path.split('/')[-1],
         'container': container,
         'object': object,
+        'x-trans-id': response.headers.get('X-Trans-Id', None),
+        'etag': response.headers.get('Etag', None),
     }
-    data['x-trans-id'] = response.headers.get('X-Trans-Id', None)
-    data['etag'] = response.headers.get('Etag', None)
 
     return data
 
 
 def delete_object(
-    api,
+    session,
     url,
     container,
     object,
 ):
     """Delete an object stored in a container
 
-    :param api: a restapi object
+    :param session: a restapi object
     :param url: endpoint
     :param container: name of container that stores object
     :param container: name of object to delete
     """
 
-    api.delete("%s/%s/%s" % (url, container, object))
+    session.delete("%s/%s/%s" % (url, container, object))
 
 
 def list_objects(
-    api,
+    session,
     url,
     container,
     marker=None,
@@ -84,7 +84,7 @@ def list_objects(
 ):
     """Get objects in a container
 
-    :param api: a restapi object
+    :param session: a restapi object
     :param url: endpoint
     :param container: container name to get a listing for
     :param marker: marker query
@@ -101,7 +101,7 @@ def list_objects(
 
     if full_listing:
         data = listing = list_objects(
-            api,
+            session,
             url,
             container,
             marker,
@@ -117,7 +117,7 @@ def list_objects(
             else:
                 marker = listing[-1]['name']
             listing = list_objects(
-                api,
+                session,
                 url,
                 container,
                 marker,
@@ -131,7 +131,6 @@ def list_objects(
                 data.extend(listing)
         return data
 
-    object_url = url
     params = {
         'format': 'json',
     }
@@ -147,32 +146,31 @@ def list_objects(
         params['prefix'] = prefix
     if path:
         params['path'] = path
-    url = "%s/%s" % (object_url, container)
-    return api.list(url, params=params)
+    requrl = "%s/%s" % (url, container)
+    return session.get(requrl, params=params).json()
 
 
 def show_object(
-    api,
+    session,
     url,
     container,
     obj,
 ):
     """Get object details
 
-    :param api: a restapi object
+    :param session: a restapi object
     :param url: endpoint
     :param container: container name to get a listing for
     :returns: dict of object properties
     """
 
-    response = api.head("%s/%s/%s" % (url, container, obj))
-    url_parts = urlparse(url)
+    response = session.head("%s/%s/%s" % (url, container, obj))
     data = {
-        'account': url_parts.path.split('/')[-1],
+        'account': response.headers.get('x-container-meta-owner', None),
         'container': container,
         'object': obj,
+        'content-type': response.headers.get('content-type', None),
     }
-    data['content-type'] = response.headers.get('content-type', None)
     if 'content-length' in response.headers:
         data['content-length'] = response.headers.get('content-length', None)
     if 'last-modified' in response.headers:
@@ -184,10 +182,10 @@ def show_object(
             'x-object-manifest', None)
     for key, value in six.iteritems(response.headers):
         if key.startswith('x-object-meta-'):
-            data[key[len('x-object-meta-'):].title()] = value
+            data[key[len('x-object-meta-'):].lower()] = value
         elif key not in (
                 'content-type', 'content-length', 'last-modified',
-                'etag', 'date', 'x-object-manifest'):
-            data[key.title()] = value
+                'etag', 'date', 'x-object-manifest', 'x-container-meta-owner'):
+            data[key.lower()] = value
 
     return data
diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
index 4a99a8f1..812ad6e1 100644
--- a/openstackclient/object/v1/object.py
+++ b/openstackclient/object/v1/object.py
@@ -50,7 +50,7 @@ class CreateObject(show.ShowOne):
         self.log.debug('take_action(%s)', parsed_args)
 
         data = lib_object.create_object(
-            self.app.restapi,
+            self.app.client_manager.session,
             self.app.client_manager.object_store.endpoint,
             parsed_args.container,
             parsed_args.object,
@@ -82,7 +82,7 @@ class DeleteObject(command.Command):
         self.log.debug('take_action(%s)', parsed_args)
 
         lib_object.delete_object(
-            self.app.restapi,
+            self.app.client_manager.session,
             self.app.client_manager.object_store.endpoint,
             parsed_args.container,
             parsed_args.object,
@@ -170,7 +170,7 @@ class ListObject(lister.Lister):
             kwargs['full_listing'] = True
 
         data = lib_object.list_objects(
-            self.app.restapi,
+            self.app.client_manager.session,
             self.app.client_manager.object_store.endpoint,
             parsed_args.container,
             **kwargs
@@ -206,7 +206,7 @@ class ShowObject(show.ShowOne):
         self.log.debug('take_action(%s)', parsed_args)
 
         data = lib_object.show_object(
-            self.app.restapi,
+            self.app.client_manager.session,
             self.app.client_manager.object_store.endpoint,
             parsed_args.container,
             parsed_args.object,