Revert "Return Environment from validate_template"
validate_template return format was changed in Queens release, which causes testsi
verifying this API call to fail.
Reverting the change allows failing tests to pass on Pike.
Change-Id: I4906b93282be3e93f2047db6db4a913ed6502b36
Closes-Bug: https://mirantis.jira.com/browse/PROD-19199
diff --git a/heat_tempest_plugin/tests/functional/test_template_validate.py b/heat_tempest_plugin/tests/functional/test_template_validate.py
index e41f952..3dcc39a 100644
--- a/heat_tempest_plugin/tests/functional/test_template_validate.py
+++ b/heat_tempest_plugin/tests/functional/test_template_validate.py
@@ -96,12 +96,7 @@
'Description': 'the param description',
'Label': 'aparam',
'NoEcho': 'false',
- 'Type': 'Number'}},
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {},
- 'resource_registry': {u'resources': {}}}}
+ 'Type': 'Number'}}}
self.assertEqual(expected, ret)
@decorators.idempotent_id('bf27371d-e202-4bae-9f13-2ef137958517')
@@ -116,12 +111,7 @@
'Description': 'the param description',
'Label': 'aparam',
'NoEcho': 'false',
- 'Type': 'Number'}},
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {'aparam': 5},
- 'resource_registry': {u'resources': {}}}}
+ 'Type': 'Number'}}}
self.assertEqual(expected, ret)
@decorators.idempotent_id('0278e03d-ed50-4909-b29d-9c4267d3fcd6')
@@ -136,14 +126,7 @@
'Description': 'the param description',
'Label': 'aparam',
'NoEcho': 'false',
- 'Type': 'Number'}},
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {},
- 'resource_registry': {
- 'OS::Heat::RandomString': 'OS::Heat::None',
- u'resources': {}}}}
+ 'Type': 'Number'}}}
self.assertEqual(expected, ret)
@decorators.idempotent_id('acb1435b-f1db-4427-9121-7e3144ddb81e')
@@ -155,12 +138,7 @@
'aparam': {'Description': 'the param description',
'Label': 'aparam',
'NoEcho': 'false',
- 'Type': 'Number'}},
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {},
- 'resource_registry': {u'resources': {}}}}
+ 'Type': 'Number'}}}
self.assertEqual(expected, ret)
@decorators.idempotent_id('7aac1feb-8256-4f70-8459-5e9780d28904')
@@ -197,12 +175,7 @@
'Description': '',
'Label': 'cparam',
'NoEcho': 'true',
- 'Type': 'String'}},
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {},
- 'resource_registry': {u'resources': {}}}}
+ 'Type': 'String'}}}
self.assertEqual(expected, ret)
@decorators.idempotent_id('5100cf18-f52a-47a2-880c-d540edad149f')
@@ -216,14 +189,7 @@
'Description': 'the param description',
'Label': 'pparam',
'NoEcho': 'false',
- 'Type': 'Number'}},
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {},
- 'resource_registry': {
- u'mynested.yaml': u'mynested.yaml',
- u'resources': {}}}}
+ 'Type': 'Number'}}}
self.assertEqual(expected, ret)
@decorators.idempotent_id('480bcf64-25ae-49c7-b147-7cbc27d09cea')
@@ -243,14 +209,7 @@
'Label': 'aparam',
'NoEcho': 'false',
'Type': 'Number'}},
- 'Type': 'mynested.yaml'}},
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {},
- 'resource_registry': {
- u'mynested.yaml': u'mynested.yaml',
- u'resources': {}}}}
+ 'Type': 'mynested.yaml'}}}
self.assertEqual(expected, ret)
@decorators.idempotent_id('a0bb07f0-2e10-4226-a205-a7eb04df415f')
@@ -291,12 +250,5 @@
'NoEcho': 'false',
'Type': 'Number'}},
'NestedParameters': n_param2,
- 'Type': 'mynested.yaml'}},
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {},
- 'resource_registry': {
- u'mynested.yaml': u'mynested.yaml',
- 'resources': {}}}}
+ 'Type': 'mynested.yaml'}}}
self.assertEqual(expected, ret)
diff --git a/heat_tempest_plugin/tests/functional/test_unicode_template.py b/heat_tempest_plugin/tests/functional/test_unicode_template.py
index 02bad65..47aec43 100644
--- a/heat_tempest_plugin/tests/functional/test_unicode_template.py
+++ b/heat_tempest_plugin/tests/functional/test_unicode_template.py
@@ -75,12 +75,6 @@
'Label': u'\u6807\u7b7e',
'NoEcho': 'false',
'Type': 'Number'}
- },
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {},
- 'resource_registry': {u'resources': {}}
}
}
self.assertEqual(expected, ret)
@@ -100,12 +94,6 @@
'Label': u'\u6807\u7b7e',
'NoEcho': 'false',
'Type': 'Number'}
- },
- 'Environment': {
- 'event_sinks': [],
- 'parameter_defaults': {},
- 'parameters': {u'\u53c2\u6570': 5},
- 'resource_registry': {u'resources': {}}
}
}
self.assertEqual(expected, ret)