openstack/deb-heat
Code Issues Proposed changes

Use default_client_name in aws s3 resource

Browse Source 
Change-Id: I82f56b8deef3e3eddce9ae5d445ccc81bfb08051
This commit is contained in:
Oleksii Chuprykov 2015-07-23 14:43:52 +03:00
parent 4cd5369fc4
commit 5eea39a45d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/engine/resources/aws/s3/s3.py
View File

@ -145,7 +145,7 @@ class S3Bucket(resource.Resource):
else: else:
headers['X-Container-Write'] = tenant_username headers['X-Container-Write'] = tenant_username
self.swift().put_container(container, headers) self.client().put_container(container, headers)
self.resource_id_set(container) self.resource_id_set(container)
def handle_delete(self): def handle_delete(self):
@ -153,10 +153,10 @@ class S3Bucket(resource.Resource):
if self.resource_id is None: if self.resource_id is None:
return return
try: try:
self.swift().delete_container(self.resource_id) self.client().delete_container(self.resource_id)
except Exception as ex: except Exception as ex:
if self.client_plugin().is_conflict(ex): if self.client_plugin().is_conflict(ex):
container, objects = self.swift().get_container( container, objects = self.client().get_container(
self.resource_id) self.resource_id)
if objects: if objects:
msg = _("The bucket you tried to delete is not empty (%s)." msg = _("The bucket you tried to delete is not empty (%s)."
@ -168,7 +168,7 @@ class S3Bucket(resource.Resource):
return six.text_type(self.resource_id) return six.text_type(self.resource_id)
def _resolve_attribute(self, name): def _resolve_attribute(self, name):
url = self.swift().get_auth()[0] url = self.client().get_auth()[0]
parsed = list(urlparse.urlparse(url)) parsed = list(urlparse.urlparse(url))
if name == self.DOMAIN_NAME: if name == self.DOMAIN_NAME:
return parsed[1].split(':')[0] return parsed[1].split(':')[0]