diff options
| author | Steve Martinelli <stevemar@ca.ibm.com> | 2015-09-10 16:10:55 -0500 |
|---|---|---|
| committer | Lin Hua Cheng <os.lcheng@gmail.com> | 2015-10-02 01:20:40 +0000 |
| commit | faece91756fd37c02e1d16e2a7f1176621d7e896 (patch) | |
| tree | 03384dd8237d2bc305dffcb32923848debc9a98e /openstackclient/api | |
| parent | 4733fd0d3cd328a8abbd62cbfabd973b0986c58c (diff) | |
| download | python-openstackclient-faece91756fd37c02e1d16e2a7f1176621d7e896.tar.gz | |
cleanup account ids from container commands
use a common function to determine account ID instead of different
ways - depending on the response and command
Change-Id: I95adc5dc7d5a82a2cffc570d1ded24d1fc754a11
Diffstat (limited to 'openstackclient/api')
| -rw-r--r-- | openstackclient/api/object_store_v1.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openstackclient/api/object_store_v1.py b/openstackclient/api/object_store_v1.py index afc5b4c1..fab470e5 100644 --- a/openstackclient/api/object_store_v1.py +++ b/openstackclient/api/object_store_v1.py @@ -44,9 +44,8 @@ class APIv1(api.BaseAPI): """ response = self.create(container, method='PUT') - url_parts = urlparse(self.endpoint) data = { - 'account': url_parts.path.split('/')[-1], + 'account': self._find_account_id(), 'container': container, 'x-trans-id': response.headers.get('x-trans-id', None), } @@ -154,12 +153,13 @@ class APIv1(api.BaseAPI): response = self._request('HEAD', container) data = { - 'account': response.headers.get('x-container-meta-owner', None), + 'account': self._find_account_id(), 'container': container, 'object_count': response.headers.get( 'x-container-object-count', None, ), + 'meta-owner': response.headers.get('x-container-meta-owner', 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), @@ -194,9 +194,8 @@ class APIv1(api.BaseAPI): method='PUT', data=f, ) - url_parts = urlparse(self.endpoint) data = { - 'account': url_parts.path.split('/')[-1], + 'account': self._find_account_id(), 'container': container, 'object': object, 'x-trans-id': response.headers.get('X-Trans-Id', None), @@ -352,10 +351,11 @@ class APIv1(api.BaseAPI): response = self._request('HEAD', "%s/%s" % (container, object)) data = { - 'account': response.headers.get('x-container-meta-owner', None), + 'account': self._find_account_id(), 'container': container, 'object': object, 'content-type': response.headers.get('content-type', None), + 'meta-owner': response.headers.get('x-container-meta-owner', None), } if 'content-length' in response.headers: data['content-length'] = response.headers.get( |