openstack
/
heat
Code Issues Proposed changes

Use default_client_name for swift 

Change-Id: I2c1177c7862275d5400e5fffaa34a5050a0b4628
This commit is contained in:
Oleksii Chuprykov 2015-07-20 10:47:11 +03:00
parent d42e4bdc42
commit d1fd08a85b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
heat/engine/resources/openstack/swift/swift.py
View File

@ -154,16 +154,16 @@ class SwiftContainer(resource.Resource):
'account_headers': account_headers,
'container_headers': container_headers})
self.swift().put_container(container, container_headers)
self.client().put_container(container, container_headers)
if account_headers:
self.swift().post_account(account_headers)
self.client().post_account(account_headers)
self.resource_id_set(container)
def _get_objects(self):
try:
container, objects = self.swift().get_container(self.resource_id)
container, objects = self.client().get_container(self.resource_id)
except Exception as ex:
self.client_plugin().ignore_not_found(ex)
return None
@ -173,10 +173,10 @@ class SwiftContainer(resource.Resource):
"""Delete the underlying container or an object inside it."""
args = [self.resource_id]
if obj:
deleter = self.swift().delete_object
deleter = self.client().delete_object
args.append(obj['name'])
else:
deleter = self.swift().delete_container
deleter = self.client().delete_container
try:
deleter(*args)
except Exception as ex:
@ -218,13 +218,13 @@ class SwiftContainer(resource.Resource):
return True
def handle_check(self):
self.swift().get_container(self.resource_id)
self.client().get_container(self.resource_id)
def FnGetRefId(self):
return six.text_type(self.resource_id)
def _resolve_attribute(self, key):
parsed = list(urlparse.urlparse(self.swift().url))
parsed = list(urlparse.urlparse(self.client().url))
if key == self.DOMAIN_NAME:
return parsed[1].split(':')[0]
elif key == self.WEBSITE_URL:
@ -235,7 +235,7 @@ class SwiftContainer(resource.Resource):
elif self.resource_id and key in (
self.OBJECT_COUNT, self.BYTES_USED, self.HEAD_CONTAINER):
try:
headers = self.swift().head_container(self.resource_id)
headers = self.client().head_container(self.resource_id)
except Exception as ex:
if self.client_plugin().is_client_exception(ex):
LOG.warn(_LW("Head container failed: %s"), ex)

4
heat/tests/test_swift.py
View File

@ -365,7 +365,7 @@ class swiftTest(common.HeatTestCase):
t = template_format.parse(swift_template)
self.stack = utils.parse_stack(t)
res = self.create_resource(t, self.stack, 'SwiftContainer')
res.swift = mock.Mock()
res.client = mock.Mock()
return res
def test_check(self):
@ -375,7 +375,7 @@ class swiftTest(common.HeatTestCase):
def test_check_fail(self):
res = self._get_check_resource()
res.swift().get_container.side_effect = Exception('boom')
res.client().get_container.side_effect = Exception('boom')
exc = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(res.check))