diff options
3 files changed, 25 insertions, 17 deletions
diff --git a/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst b/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst index a0c1edc..96d0b1b 100644 --- a/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst +++ b/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst @@ -563,21 +563,26 @@ be provided in place, or via a function .. req:: :id: R-10834 :target: VNF - :keyword: MUST + :keyword: MUST NOT :validation_mode: static :updated: dublin - If a VNF's Heat Orchestration Template resource attribute - ``property:`` uses a nested ``get_param``, the nested - ``get_param`` **MUST** reference an index. + A VNF's Heat Orchestration Template resource attribute ``property:`` + **MUST NOT** use more than two levels of nested ``get_param`` intrinsic + functions when deriving a property value. SDC does not support nested + ``get_param`` with recursive lists (i.e., a list inside list). + The second ``get_param`` in a nested lookup must directly derive its value + without further calls to ``get_param`` functions. + + * Example of valid nesting: + + * ``name: {get_param: [ {vm-type}_names, {get_param : index } ] }`` - That is, to obtain a property value, two ``get_param`` intrinsic - functions are used. The second ``get_param`` must be used - to obtain an index value used to reference a parameter value in - a parameter defined as ``type: comma_delimited_list``. For - example: + * Examples of invalid nesting. SDC will not support these examples since + there is an array inside array. - * ``name: {get_param: [ name, get_param: index ] }`` + * ``name: {get_param: [ {vm-type}_names, { get_param: [ indexlist, 0 ] } ] }`` + * ``name: {get_param: [ {vm-type}_names, { get_param: [ indexlist1, { get_param: indexlist2 } ] } ] }`` metadata diff --git a/docs/Chapter5/Heat/ONAP Heat Orchestration Templates Overview.rst b/docs/Chapter5/Heat/ONAP Heat Orchestration Templates Overview.rst index a550ffe..d7511a1 100644 --- a/docs/Chapter5/Heat/ONAP Heat Orchestration Templates Overview.rst +++ b/docs/Chapter5/Heat/ONAP Heat Orchestration Templates Overview.rst @@ -280,7 +280,8 @@ Base Modules 4.) ``<text>_base_<text>``.y[a]ml where ``<text>`` **MUST** contain only alphanumeric characters and - underscores '_' and **MUST NOT** contain the case insensitive word ``base``. + underscores '_' and **MUST NOT** contain the case insensitive string + ``base`` or ``volume``. .. req:: :id: R-91342 @@ -305,7 +306,7 @@ Incremental Modules VNF Heat Orchestration Template's Incremental Module file name **MUST** contain only alphanumeric characters and underscores - '_' and **MUST NOT** contain the case insensitive word ``base``. + '_' and **MUST NOT** contain the case insensitive string ``base``. .. req:: :id: R-94509 @@ -350,7 +351,8 @@ Cinder Volume Modules :validation_mode: static :introduced: dublin - A VNF Heat Orchestration Template's Cinder Volume Module resources section + A VNF Heat Orchestration Template's Cinder Volume Module ``resources:`` + section **MUST** only be defined using one of the following: * one of more ``OS::Cinder::Volume`` resources @@ -383,7 +385,7 @@ Nested Heat file VNF Heat Orchestration Template's Nested YAML file name **MUST** contain only alphanumeric characters and underscores '_' and - **MUST NOT** contain the case insensitive word ``base``. + **MUST NOT** contain the case insensitive string ``base``. .. req:: :id: R-70276 diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst index 826049f..e5c3189 100644 --- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst +++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Parameters.rst @@ -38,15 +38,16 @@ Requirement R-01455 defines how the ``{vm-type]`` is defined. * property ``image`` parameter name (defined in R-58670) * property ``flavor`` parameter name (defined in R-45188) * property ``name`` parameter name (defined in R-54171 & R-87817) - * property port referenced OS::Neutron::Port Resource ID - (defined in R-20453) + * property ``networks`` map property ``port`` value which is a + ``OS::Neutron::Port`` Resource ID (defined in R-20453) + referenced using the intrinsic function ``get_attr`` **MUST** contain the identical ``{vm-type}`` and **MUST** follow the naming conventions defined in R-58670, R-45188, R-54171, R-87817, and R-29751. And the ``{index}`` in the ``OS::Nova::Server`` Resource ID (defined in R-29751) **MUST** match the ``{vm-type_index}`` defined in - the ``OS::Nova::Server`` property ``port`` + the ``OS::Nova::Server`` property ``networks`` map property ``port`` referenced ``OS::Neutron::Port`` Resource ID (defined in R-20453). |