Tests for s3 and swift resources were extended

According to the description of the bug, the problem
is in the mechanism of dependencies. That is an internal
function Ref is not working properly. To repeat it, check
was added to the test templates (s3_test, swift_test). Thus,
the bug has not been reproduced.

Also, the method FnGetRefId in s3 and swift resources,
despite its name, returns the resource name in the format
'stack_name-resource_name-resource_id'. This is achieved
by the method physical_resource_name, that implemented in
superclass resource.Resource.

Bug 1202987

Change-Id: I0f85c39e10e8b455f93fdd768cd5e6ee14497277
This commit is contained in:
Maksym Iarmak 2013-08-14 18:20:12 +03:00
parent c92aa027fa
commit bfddf669cc
2 changed files with 12 additions and 0 deletions

View File

@ -44,6 +44,12 @@ swift_template = '''
}
}
},
"SwiftContainer": {
"Type": "OS::Swift::Container",
"Properties": {
"S3Bucket": {"Ref" : "S3Bucket"},
}
},
"S3Bucket" : {
"Type" : "AWS::S3::Bucket",
"Properties" : {

View File

@ -45,6 +45,12 @@ swift_template = '''
}
}
},
"S3Bucket" : {
"Type" : "AWS::S3::Bucket",
"Properties" : {
"SwiftContainer" : {"Ref" : "SwiftContainer"}
}
},
"SwiftContainer" : {
"Type" : "OS::Swift::Container",
"Properties" : {