openstack
/
heat
Code Issues Proposed changes

Merge "Fix showing events on swift."

This commit is contained in:
Jenkins 2014-01-14 02:32:41 +00:00 committed by Gerrit Code Review
parent 1b8c1b2091 1bcd6625b4
commit 0c83ac25a9
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/resources/swift.py
View File

@ -136,8 +136,7 @@ class SwiftContainer(resource.Resource):
return unicode(self.resource_id)
def FnGetAtt(self, key):
url, token_id = self.swift().get_auth()
parsed = list(urlutils.urlparse(url))
parsed = list(urlutils.urlparse(self.swift().url))
if key == 'DomainName':
return parsed[1].split(':')[0]
elif key == 'WebsiteURL':

6
heat/tests/test_swift.py
View File

@ -138,8 +138,6 @@ class swiftTest(HeatTestCase):
container_name = utils.PhysName('test_stack', 'test_resource')
swiftclient.Connection.put_container(
container_name, {}).AndReturn(None)
swiftclient.Connection.get_auth().MultipleTimes().AndReturn(
('http://server.test:8080/v_2', None))
swiftclient.Connection.head_container(
mox.IgnoreArg()).MultipleTimes().AndReturn(headers)
swiftclient.Connection.delete_container(container_name).AndReturn(None)
@ -152,8 +150,8 @@ class swiftTest(HeatTestCase):
ref_id = rsrc.FnGetRefId()
self.assertEqual(container_name, ref_id)
self.assertEqual('server.test', rsrc.FnGetAtt('DomainName'))
url = 'http://server.test:8080/v_2/%s' % ref_id
self.assertEqual('example.com', rsrc.FnGetAtt('DomainName'))
url = 'http://example.com:1234/v1/%s' % ref_id
self.assertEqual(url, rsrc.FnGetAtt('WebsiteURL'))
self.assertEqual('82', rsrc.FnGetAtt('ObjectCount'))