HOT: update for OpenStack Wallaby

tliron · Apr 20, 2021 · 5db6eb2 · 5db6eb2
1 parent 89642fa
commit 5db6eb2
Show file tree

Hide file tree

Showing 65 changed files with 70 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Puccini can parse all versions of TOSCA:
 Additionally, Puccini can parse the following TOSCA-like dialects:
 
 * [Cloudify DSL 1.3](https://docs.cloudify.co/5.0.5/developer/blueprints/)
-* [OpenStack Heat HOT 2018-08-31](https://docs.openstack.org/heat/stein/template_guide/hot_guide.html)
+* [OpenStack Heat HOT 2021-04-16](https://docs.openstack.org/heat/wallaby/template_guide/hot_guide.html)
 
 TOSCA is a complex object-oriented language. We put considerable effort into adhering to every
 aspect of the grammar, especially in regards to value type checking and type inheritance contracts,

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/and.js b/assets/tosca/profiles/hot/1.0/js/functions/and.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#and]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#and]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/contains.js b/assets/tosca/profiles/hot/1.0/js/functions/contains.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#contains]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#contains]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/digest.js b/assets/tosca/profiles/hot/1.0/js/functions/digest.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#digest]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#digest]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/equals.js b/assets/tosca/profiles/hot/1.0/js/functions/equals.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#equals]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#equals]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/filter.js b/assets/tosca/profiles/hot/1.0/js/functions/filter.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#filter]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#filter]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/get_attr.js b/assets/tosca/profiles/hot/1.0/js/functions/get_attr.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#get_attr]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#get_attr]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/get_file.js b/assets/tosca/profiles/hot/1.0/js/functions/get_file.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#get_file]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#get_file]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/get_param.js b/assets/tosca/profiles/hot/1.0/js/functions/get_param.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#get_param]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#get_param]
 
 clout.exec('tosca.lib.utils');
 

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/get_resource.js b/assets/tosca/profiles/hot/1.0/js/functions/get_resource.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#get_resource]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#get_resource]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/if.js b/assets/tosca/profiles/hot/1.0/js/functions/if.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#if]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#if]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/list_concat.js b/assets/tosca/profiles/hot/1.0/js/functions/list_concat.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#list-concat]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#list-concat]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/list_concat_unique.js b/assets/tosca/profiles/hot/1.0/js/functions/list_concat_unique.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#list_concat_unique]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#list_concat_unique]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/list_join.js b/assets/tosca/profiles/hot/1.0/js/functions/list_join.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#list_join]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#list_join]
 
 function evaluate() {
 	var length = arguments.length;

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/make_url.js b/assets/tosca/profiles/hot/1.0/js/functions/make_url.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#make_url]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#make_url]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/map_merge.js b/assets/tosca/profiles/hot/1.0/js/functions/map_merge.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#map_merge]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#map_merge]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/map_replace.js b/assets/tosca/profiles/hot/1.0/js/functions/map_replace.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#map_replace]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#map_replace]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/not.js b/assets/tosca/profiles/hot/1.0/js/functions/not.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#not]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#not]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/or.js b/assets/tosca/profiles/hot/1.0/js/functions/or.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#or]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#or]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/repeat.js b/assets/tosca/profiles/hot/1.0/js/functions/repeat.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#repeat]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#repeat]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/resource_facade.js b/assets/tosca/profiles/hot/1.0/js/functions/resource_facade.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#resource_facade]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#resource_facade]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/str_replace.js b/assets/tosca/profiles/hot/1.0/js/functions/str_replace.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#str_replace]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#str_replace]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/str_replace_strict.js b/assets/tosca/profiles/hot/1.0/js/functions/str_replace_strict.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#str_replace_strict]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#str_replace_strict]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/str_replace_vstrict.js b/assets/tosca/profiles/hot/1.0/js/functions/str_replace_vstrict.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#str_replace_vstrict]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#str_replace_vstrict]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/str_split.js b/assets/tosca/profiles/hot/1.0/js/functions/str_split.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#str_split]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#str_split]
 
 function evaluate() {
 	return 'TODO';

diff --git a/assets/tosca/profiles/hot/1.0/js/functions/yaql.js b/assets/tosca/profiles/hot/1.0/js/functions/yaql.js
@@ -1,5 +1,5 @@
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#yaql]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#yaql]
 
 function evaluate() {
 	return 'TODO';

diff --git a/examples/hot/hello-world.yaml b/examples/hot/hello-world.yaml
@@ -1,6 +1,6 @@
-heat_template_version: 2018-08-31
+heat_template_version: 2021-04-16
 
-# See: https://docs.openstack.org/heat/stein/template_guide/hot_guide.html
+# See: https://docs.openstack.org/heat/wallaby/template_guide/hot_guide.html
 
 description: >-
   Hello World stack

diff --git a/examples/openstack/README.md b/examples/openstack/README.md
@@ -7,7 +7,7 @@ For [OpenStack](https://www.openstack.org/) Puccini can generate
 Custom operation artifacts, if included, are deployed to the virtual machines and executed.
 
 Effectively, the combination of TOSCA + Ansible provides an equivalent set of features to
-[Heat](https://docs.openstack.org/heat/stein/)/[Mistral](https://docs.openstack.org/mistral/stein/).
+[Heat](https://docs.openstack.org/heat/wallaby/)/[Mistral](https://docs.openstack.org/mistral/wallaby/).
 However, Ansible is a general-purpose orchestrator that can do a lot more than Heat. The generated
 playbooks comprise roles that can be imported and used in other playbooks, allowing for custom
 orchestration integrations.

diff --git a/examples/openstack/profile/nodes.yaml b/examples/openstack/profile/nodes.yaml
@@ -8,7 +8,7 @@ imports:
 
 node_types:
 
-  # https://docs.openstack.org/heat/stein/template_guide/openstack.html#OS::Nova::Server
+  # https://docs.openstack.org/heat/wallaby/template_guide/openstack.html#OS::Nova::Server
   nova.Server:
     metadata:
       heat_name: OS::Nova::Server

diff --git a/examples/tosca/substitution-mapping.yaml b/examples/tosca/substitution-mapping.yaml
@@ -53,7 +53,8 @@ topology_template:
       admin_host: [ admin, host ]
       db_host: [ db, host ]
     properties:
-      # Properties are mapped to inputs, *not* node template properties
+      # Properties are mapped to inputs
+      # (You can also map properties to note template properties, though this use is deprecated in TOSCA 1.3)
       # The data types must be compatible
       redundancy: [ scale ]
     attributes:

diff --git a/tosca/grammars/hot/common.go b/tosca/grammars/hot/common.go
@@ -14,13 +14,16 @@ var Grammar = tosca.NewGrammar()
 var DefaultScriptletNamespace = tosca.NewScriptletNamespace()
 
 func init() {
+	// https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html
+	Grammar.RegisterVersion("heat_template_version", "wallaby", "")
 	Grammar.RegisterVersion("heat_template_version", "train", "") // not mentioned in spec, but probably supported
 	Grammar.RegisterVersion("heat_template_version", "stein", "") // not mentioned in spec, but probably supported
 	Grammar.RegisterVersion("heat_template_version", "rocky", "")
 	Grammar.RegisterVersion("heat_template_version", "queens", "")
 	Grammar.RegisterVersion("heat_template_version", "pike", "")
 	Grammar.RegisterVersion("heat_template_version", "newton", "")
 	Grammar.RegisterVersion("heat_template_version", "ocata", "")
+	Grammar.RegisterVersion("heat_template_version", "2021-04-16", "") // wallaby
 	Grammar.RegisterVersion("heat_template_version", "2018-08-31", "") // train, stein, rocky
 	Grammar.RegisterVersion("heat_template_version", "2018-03-02", "") // queens
 	Grammar.RegisterVersion("heat_template_version", "2017-09-01", "") // pike

diff --git a/tosca/grammars/hot/condition-definition.go b/tosca/grammars/hot/condition-definition.go
@@ -9,7 +9,7 @@ import (
 //
 // ConditionDefinition
 //
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#conditions-section]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#conditions-section]
 //
 
 type ConditionDefinition struct {

diff --git a/tosca/grammars/hot/constraint.go b/tosca/grammars/hot/constraint.go
@@ -23,7 +23,7 @@ var ConstraintNativeArgumentIndexes = map[string][]uint{}
 //
 // Constraint
 //
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#parameter-constraints]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#parameter-constraints]
 //
 
 type Constraint struct {

diff --git a/tosca/grammars/hot/functions.go b/tosca/grammars/hot/functions.go
@@ -11,7 +11,7 @@ import (
 //
 // Built-in functions
 //
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#intrinsic-functions]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#intrinsic-functions]
 //
 
 var FunctionScriptlets = map[string]string{
@@ -71,7 +71,7 @@ func ToFunctionCall(context *tosca.Context) bool {
 		}
 
 		// The "list_join" function has a nested argument structure that we need to flatten
-		// https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#list-join
+		// https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#list-join
 		if name == "list_join" {
 			newArguments := ard.List{originalArguments[0]}
 			for _, argument := range originalArguments[1:] {

diff --git a/tosca/grammars/hot/output.go b/tosca/grammars/hot/output.go
@@ -8,7 +8,7 @@ import (
 //
 // Output
 //
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#outputs-section]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#outputs-section]
 //
 
 type Output struct {

diff --git a/tosca/grammars/hot/parameter-group.go b/tosca/grammars/hot/parameter-group.go
@@ -7,7 +7,7 @@ import (
 //
 // ParameterGroup
 //
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#parameter-groups-section]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#parameter-groups-section]
 //
 
 type ParameterGroup struct {

diff --git a/tosca/grammars/hot/parameter.go b/tosca/grammars/hot/parameter.go
@@ -8,7 +8,7 @@ import (
 //
 // Parameter
 //
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#parameters-section]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#parameters-section]
 //
 
 type Parameter struct {

diff --git a/tosca/grammars/hot/resource.go b/tosca/grammars/hot/resource.go
@@ -24,7 +24,7 @@ func GetDeletionPolicy(policy string) (string, bool) {
 //
 // Resource
 //
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#resources-section]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#resources-section]
 //
 
 type Resource struct {

diff --git a/tosca/grammars/hot/template.go b/tosca/grammars/hot/template.go
@@ -11,7 +11,7 @@ import (
 //
 // Template
 //
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#template-structure]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#template-structure]
 //
 
 type Template struct {

diff --git a/tosca/grammars/hot/types.go b/tosca/grammars/hot/types.go
@@ -90,7 +90,7 @@ func (self *Value) CoerceParameterType(type_ string) {
 //
 // Resource types
 //
-// [https://docs.openstack.org/heat/stein/template_guide/openstack.html]
+// [https://docs.openstack.org/heat/wallaby/template_guide/openstack.html]
 //
 
 var ResourceTypes = map[string]string{

diff --git a/tosca/profiles/hot/v1_0/js-functions-and.go b/tosca/profiles/hot/v1_0/js-functions-and.go
@@ -5,7 +5,7 @@ package v1_0
 func init() {
 	Profile["/hot/1.0/js/functions/and.js"] = `
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#and]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#and]
 
 function evaluate() {
 	return 'TODO';

diff --git a/tosca/profiles/hot/v1_0/js-functions-contains.go b/tosca/profiles/hot/v1_0/js-functions-contains.go
@@ -5,7 +5,7 @@ package v1_0
 func init() {
 	Profile["/hot/1.0/js/functions/contains.js"] = `
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#contains]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#contains]
 
 function evaluate() {
 	return 'TODO';

diff --git a/tosca/profiles/hot/v1_0/js-functions-digest.go b/tosca/profiles/hot/v1_0/js-functions-digest.go
@@ -5,7 +5,7 @@ package v1_0
 func init() {
 	Profile["/hot/1.0/js/functions/digest.js"] = `
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#digest]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#digest]
 
 function evaluate() {
 	return 'TODO';

diff --git a/tosca/profiles/hot/v1_0/js-functions-equals.go b/tosca/profiles/hot/v1_0/js-functions-equals.go
@@ -5,7 +5,7 @@ package v1_0
 func init() {
 	Profile["/hot/1.0/js/functions/equals.js"] = `
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#equals]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#equals]
 
 function evaluate() {
 	return 'TODO';

diff --git a/tosca/profiles/hot/v1_0/js-functions-filter.go b/tosca/profiles/hot/v1_0/js-functions-filter.go
@@ -5,7 +5,7 @@ package v1_0
 func init() {
 	Profile["/hot/1.0/js/functions/filter.js"] = `
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#filter]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#filter]
 
 function evaluate() {
 	return 'TODO';

diff --git a/tosca/profiles/hot/v1_0/js-functions-get_attr.go b/tosca/profiles/hot/v1_0/js-functions-get_attr.go
@@ -5,7 +5,7 @@ package v1_0
 func init() {
 	Profile["/hot/1.0/js/functions/get_attr.js"] = `
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#get_attr]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#get_attr]
 
 function evaluate() {
 	return 'TODO';

diff --git a/tosca/profiles/hot/v1_0/js-functions-get_file.go b/tosca/profiles/hot/v1_0/js-functions-get_file.go
@@ -5,7 +5,7 @@ package v1_0
 func init() {
 	Profile["/hot/1.0/js/functions/get_file.js"] = `
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#get_file]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#get_file]
 
 function evaluate() {
 	return 'TODO';

diff --git a/tosca/profiles/hot/v1_0/js-functions-get_param.go b/tosca/profiles/hot/v1_0/js-functions-get_param.go
@@ -5,7 +5,7 @@ package v1_0
 func init() {
 	Profile["/hot/1.0/js/functions/get_param.js"] = `
 
-// [https://docs.openstack.org/heat/stein/template_guide/hot_spec.html#get_param]
+// [https://docs.openstack.org/heat/wallaby/template_guide/hot_spec.html#get_param]
 
 clout.exec('tosca.lib.utils');