Fix invalid syntax in HOT templates
This patch fixes invalid syntax in HOT templates where keywords
starting with uppercase characters are used (e.g. 'Type') in
the resources section. According to the HOT spec, though, those
keywords are all lowercase (e.g. 'type').
Change https://review.openstack.org/#/c/73580 in heat adds
stricter validation which makes the respective testcases fail.
Change-Id: Iffb79e5bb362bfd02b028166ce6ddfa616f2909f
Closes-Bug: #1288114
diff --git a/tempest/api/orchestration/stacks/test_neutron_resources.py b/tempest/api/orchestration/stacks/test_neutron_resources.py
index 291f0d1..18ba37b 100644
--- a/tempest/api/orchestration/stacks/test_neutron_resources.py
+++ b/tempest/api/orchestration/stacks/test_neutron_resources.py
@@ -73,7 +73,7 @@
subnet_id: {get_resource: Subnet}
Server:
type: AWS::EC2::Instance
- Metadata:
+ metadata:
Name: SmokeServerNeutron
properties:
ImageId: {get_param: ImageId}
@@ -93,7 +93,7 @@
type: AWS::CloudFormation::WaitConditionHandle
WaitCondition:
type: AWS::CloudFormation::WaitCondition
- DependsOn: Server
+ depends_on: Server
properties:
Handle: {get_resource: WaitHandleNeutron}
Timeout: '600'
diff --git a/tempest/api/orchestration/stacks/test_swift_resources.py b/tempest/api/orchestration/stacks/test_swift_resources.py
index 5921a7a..713cfd4 100644
--- a/tempest/api/orchestration/stacks/test_swift_resources.py
+++ b/tempest/api/orchestration/stacks/test_swift_resources.py
@@ -27,20 +27,20 @@
_interface = 'json'
template = """
heat_template_version: 2013-05-23
-description: Template which creates a Swift container ressource
+description: Template which creates a Swift container resource
resources:
SwiftContainerWebsite:
- DeletionPolicy: "Delete"
- Type: OS::Swift::Container
- Properties:
+ deletion_policy: "Delete"
+ type: OS::Swift::Container
+ properties:
X-Container-Read: ".r:*"
X-Container-Meta:
web-index: "index.html"
web-error: "error.html"
SwiftContainer:
- Type: OS::Swift::Container
+ type: OS::Swift::Container
outputs:
WebsiteURL: