* Add new HOT version for Queens release
The new version is "2018-03-02" or "queens". Change-Id: Icbb7ff4d717dd10d18a93387edfdb8fcee3d7927
This commit is contained in:
parent
20a0a48d74
commit
c3546d9309
|
@ -334,6 +334,44 @@ for the ``heat_template_version`` key:
|
||||||
yaql
|
yaql
|
||||||
contains
|
contains
|
||||||
|
|
||||||
|
2018-03-02 | queens
|
||||||
|
-------------------
|
||||||
|
The key with value ``2018-03-02`` or ``queens`` indicates that the YAML
|
||||||
|
document is a HOT template and it may contain features added and/or removed
|
||||||
|
up until the Queens release. The complete list of supported functions is::
|
||||||
|
|
||||||
|
digest
|
||||||
|
filter
|
||||||
|
get_attr
|
||||||
|
get_file
|
||||||
|
get_param
|
||||||
|
get_resource
|
||||||
|
list_join
|
||||||
|
make_url
|
||||||
|
list_concat
|
||||||
|
list_concat_unique
|
||||||
|
contains
|
||||||
|
map_merge
|
||||||
|
map_replace
|
||||||
|
repeat
|
||||||
|
resource_facade
|
||||||
|
str_replace
|
||||||
|
str_replace_strict
|
||||||
|
str_replace_vstrict
|
||||||
|
str_split
|
||||||
|
yaql
|
||||||
|
if
|
||||||
|
|
||||||
|
The complete list of supported condition functions is::
|
||||||
|
|
||||||
|
equals
|
||||||
|
get_param
|
||||||
|
not
|
||||||
|
and
|
||||||
|
or
|
||||||
|
yaql
|
||||||
|
contains
|
||||||
|
|
||||||
.. _hot_spec_parameter_groups:
|
.. _hot_spec_parameter_groups:
|
||||||
|
|
||||||
Parameter groups section
|
Parameter groups section
|
||||||
|
|
|
@ -625,3 +625,66 @@ class HOTemplate20170901(HOTemplate20170224):
|
||||||
'yaql': hot_funcs.Yaql,
|
'yaql': hot_funcs.Yaql,
|
||||||
'contains': hot_funcs.Contains
|
'contains': hot_funcs.Contains
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class HOTemplate20180302(HOTemplate20170901):
|
||||||
|
functions = {
|
||||||
|
'get_attr': hot_funcs.GetAttAllAttributes,
|
||||||
|
'get_file': hot_funcs.GetFile,
|
||||||
|
'get_param': hot_funcs.GetParam,
|
||||||
|
'get_resource': hot_funcs.GetResource,
|
||||||
|
'list_join': hot_funcs.JoinMultiple,
|
||||||
|
'repeat': hot_funcs.RepeatWithNestedLoop,
|
||||||
|
'resource_facade': hot_funcs.ResourceFacade,
|
||||||
|
'str_replace': hot_funcs.ReplaceJson,
|
||||||
|
|
||||||
|
# functions added in 2015-04-30
|
||||||
|
'digest': hot_funcs.Digest,
|
||||||
|
|
||||||
|
# functions added in 2015-10-15
|
||||||
|
'str_split': hot_funcs.StrSplit,
|
||||||
|
|
||||||
|
# functions added in 2016-04-08
|
||||||
|
'map_merge': hot_funcs.MapMerge,
|
||||||
|
|
||||||
|
# functions added in 2016-10-14
|
||||||
|
'yaql': hot_funcs.Yaql,
|
||||||
|
'map_replace': hot_funcs.MapReplace,
|
||||||
|
'if': hot_funcs.If,
|
||||||
|
|
||||||
|
# functions added in 2017-02-24
|
||||||
|
'filter': hot_funcs.Filter,
|
||||||
|
'str_replace_strict': hot_funcs.ReplaceJsonStrict,
|
||||||
|
|
||||||
|
# functions added in 2017-09-01
|
||||||
|
'make_url': hot_funcs.MakeURL,
|
||||||
|
'list_concat': hot_funcs.ListConcat,
|
||||||
|
'str_replace_vstrict': hot_funcs.ReplaceJsonVeryStrict,
|
||||||
|
'list_concat_unique': hot_funcs.ListConcatUnique,
|
||||||
|
'contains': hot_funcs.Contains,
|
||||||
|
|
||||||
|
# functions removed from 2015-10-15
|
||||||
|
'Fn::Select': hot_funcs.Removed,
|
||||||
|
|
||||||
|
# functions removed from 2014-10-16
|
||||||
|
'Fn::GetAZs': hot_funcs.Removed,
|
||||||
|
'Fn::Join': hot_funcs.Removed,
|
||||||
|
'Fn::Split': hot_funcs.Removed,
|
||||||
|
'Fn::Replace': hot_funcs.Removed,
|
||||||
|
'Fn::Base64': hot_funcs.Removed,
|
||||||
|
'Fn::MemberListToMap': hot_funcs.Removed,
|
||||||
|
'Fn::ResourceFacade': hot_funcs.Removed,
|
||||||
|
'Ref': hot_funcs.Removed,
|
||||||
|
}
|
||||||
|
|
||||||
|
condition_functions = {
|
||||||
|
'get_param': hot_funcs.GetParam,
|
||||||
|
'equals': hot_funcs.Equals,
|
||||||
|
'not': hot_funcs.Not,
|
||||||
|
'and': hot_funcs.And,
|
||||||
|
'or': hot_funcs.Or,
|
||||||
|
|
||||||
|
# functions added in 2017-09-01
|
||||||
|
'yaql': hot_funcs.Yaql,
|
||||||
|
'contains': hot_funcs.Contains
|
||||||
|
}
|
||||||
|
|
|
@ -734,7 +734,8 @@ class TemplateTest(common.HeatTestCase):
|
||||||
valid_versions = ['2013-05-23', '2014-10-16',
|
valid_versions = ['2013-05-23', '2014-10-16',
|
||||||
'2015-04-30', '2015-10-15', '2016-04-08',
|
'2015-04-30', '2015-10-15', '2016-04-08',
|
||||||
'2016-10-14', '2017-02-24', '2017-09-01',
|
'2016-10-14', '2017-02-24', '2017-09-01',
|
||||||
'newton', 'ocata', 'pike']
|
'2018-03-02',
|
||||||
|
'newton', 'ocata', 'pike', 'queens']
|
||||||
ex_error_msg = ('The template version is invalid: '
|
ex_error_msg = ('The template version is invalid: '
|
||||||
'"heat_template_version: 2012-12-12". '
|
'"heat_template_version: 2012-12-12". '
|
||||||
'"heat_template_version" should be one of: %s'
|
'"heat_template_version" should be one of: %s'
|
||||||
|
|
|
@ -53,7 +53,8 @@ class TemplateAPITest(functional_base.FunctionalTestsBase):
|
||||||
"2012-12-12", "2010-09-09",
|
"2012-12-12", "2010-09-09",
|
||||||
"2016-04-08", "2016-10-14", "newton",
|
"2016-04-08", "2016-10-14", "newton",
|
||||||
"2017-02-24", "ocata",
|
"2017-02-24", "ocata",
|
||||||
"2017-09-01", "pike"]
|
"2017-09-01", "pike",
|
||||||
|
"2018-03-02", "queens"]
|
||||||
for template in template_versions:
|
for template in template_versions:
|
||||||
self.assertIn(template.version.split(".")[1],
|
self.assertIn(template.version.split(".")[1],
|
||||||
supported_template_versions)
|
supported_template_versions)
|
||||||
|
|
|
@ -175,6 +175,8 @@ heat.templates =
|
||||||
heat_template_version.ocata = heat.engine.hot.template:HOTemplate20170224
|
heat_template_version.ocata = heat.engine.hot.template:HOTemplate20170224
|
||||||
heat_template_version.2017-09-01 = heat.engine.hot.template:HOTemplate20170901
|
heat_template_version.2017-09-01 = heat.engine.hot.template:HOTemplate20170901
|
||||||
heat_template_version.pike = heat.engine.hot.template:HOTemplate20170901
|
heat_template_version.pike = heat.engine.hot.template:HOTemplate20170901
|
||||||
|
heat_template_version.2018-03-02 = heat.engine.hot.template:HOTemplate20180302
|
||||||
|
heat_template_version.queens = heat.engine.hot.template:HOTemplate20180302
|
||||||
|
|
||||||
tempest.test_plugins =
|
tempest.test_plugins =
|
||||||
heat_tests = heat_integrationtests.plugin:HeatTempestPlugin
|
heat_tests = heat_integrationtests.plugin:HeatTempestPlugin
|
||||||
|
|
Loading…
Reference in New Issue