summaryrefslogtreecommitdiff
path: root/openstackclient/object
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2014-08-22 17:26:07 -0500
committerDean Troyer <dtroyer@gmail.com>2014-09-08 00:06:52 -0500
commitae957b176e5918f41024c00cbc39ea371a0c37c6 (patch)
treef087abc03197bdbfbfe07ab46cefde083a487c56 /openstackclient/object
parent3317e0abf694c56cb3b24bdf2b2b10577ea47f6b (diff)
downloadpython-openstackclient-ae957b176e5918f41024c00cbc39ea371a0c37c6.tar.gz
Use Keystone client session.Session
This replaces the restapi requests wrapper with the one from Keystone client so we can take advantage of the auth plugins. As a first step only the v2 and v3 token and password plugins are supported. This maintainis no changes to the command options or environment variables. The next steps will include reworking the other API client interfaces to fully utilize the single auth session. Blueprint: ksc-session-auth Change-Id: I47ec63291e4c3cf36c8061299a4764f60b36ab89
Diffstat (limited to 'openstackclient/object')
-rw-r--r--openstackclient/object/v1/lib/container.py8
-rw-r--r--openstackclient/object/v1/lib/object.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/openstackclient/object/v1/lib/container.py b/openstackclient/object/v1/lib/container.py
index 65a9fe4d..63711838 100644
--- a/openstackclient/object/v1/lib/container.py
+++ b/openstackclient/object/v1/lib/container.py
@@ -29,7 +29,7 @@ def create_container(
):
"""Create a container
- :param session: a restapi object
+ :param session: an authenticated keystoneclient.session.Session object
:param url: endpoint
:param container: name of container to create
:returns: dict of returned headers
@@ -53,7 +53,7 @@ def delete_container(
):
"""Delete a container
- :param session: a restapi object
+ :param session: an authenticated keystoneclient.session.Session object
:param url: endpoint
:param container: name of container to delete
"""
@@ -72,7 +72,7 @@ def list_containers(
):
"""Get containers in an account
- :param session: a restapi object
+ :param session: an authenticated keystoneclient.session.Session object
:param url: endpoint
:param marker: marker query
:param limit: limit query
@@ -127,7 +127,7 @@ def show_container(
):
"""Get container details
- :param session: a restapi object
+ :param session: an authenticated keystoneclient.session.Session object
:param url: endpoint
:param container: name of container to show
:returns: dict of returned headers
diff --git a/openstackclient/object/v1/lib/object.py b/openstackclient/object/v1/lib/object.py
index 0ded0dad..5000c79d 100644
--- a/openstackclient/object/v1/lib/object.py
+++ b/openstackclient/object/v1/lib/object.py
@@ -32,7 +32,7 @@ def create_object(
):
"""Create an object, upload it to a container
- :param session: a restapi object
+ :param session: an authenticated keystoneclient.session.Session object
:param url: endpoint
:param container: name of container to store object
:param object: local path to object
@@ -61,7 +61,7 @@ def delete_object(
):
"""Delete an object stored in a container
- :param session: a restapi object
+ :param session: an authenticated keystoneclient.session.Session object
:param url: endpoint
:param container: name of container that stores object
:param container: name of object to delete
@@ -84,7 +84,7 @@ def list_objects(
):
"""Get objects in a container
- :param session: a restapi object
+ :param session: an authenticated keystoneclient.session.Session object
:param url: endpoint
:param container: container name to get a listing for
:param marker: marker query
@@ -158,7 +158,7 @@ def show_object(
):
"""Get object details
- :param session: a restapi object
+ :param session: an authenticated keystoneclient.session.Session object
:param url: endpoint
:param container: container name to get a listing for
:returns: dict of object properties