From 0477a089f61531224dece061bc9f1262e38520c8 Mon Sep 17 00:00:00 2001 From: "weinstock, alan" Date: Tue, 21 Jan 2020 22:01:21 +0000 Subject: [VNFRQTS] Update R-55307 & R-35414 Issue-ID: VNFRQTS-799 Signed-off-by: weinstock, alan Change-Id: Icf626efeb1fe36f0d164e3f188e26fe51e33eafe --- .../ONAP Heat Orchestration Template Format.rst | 29 ++++++++++++++++++---- .../Nova Metadata Parameters.rst | 5 ++++ .../Resource IDs.rst | 4 +-- 3 files changed, 31 insertions(+), 7 deletions(-) (limited to 'docs/Chapter5') diff --git a/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst b/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst index 5ec1664..c9fd6c4 100644 --- a/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst +++ b/docs/Chapter5/Heat/ONAP Heat Orchestration Template Format.rst @@ -89,14 +89,31 @@ contain the section "parameter_groups:". parameters ~~~~~~~~~~~~~~~~~~~~~~ +.. req:: + :id: R-35413 + :target: VNF + :keyword: MAY + :validation_mode: static + :introduced: frankfurt + + A VNF Heat Orchestration's template's base module **MAY** (or **MAY NOT**) + contain the section ``parameters:``. + +When a VNF is composed of two or more Heat Orchestration Templates (i.e., a +base module and one or more incremental modules), +it is valid for the base module to not declare +any input parameters. + + .. req:: :id: R-35414 :target: VNF :keyword: MUST :validation_mode: static + :updated: frankfurt - A VNF Heat Orchestration's template **MUST** contain the - section ``parameters:``. + A VNF Heat Orchestration's template's incremental module and volume module + **MUST** contain the section ``parameters:``. .. code-block:: yaml @@ -467,9 +484,11 @@ resources **MAY** (or **MAY NOT**) contain the section ``resources:``. -When a VNF's Heat Orchestration Template is composed of a base module and -one or more incremental modules, it is valid for the base module -to have no resources. +When a VNF is composed of two or more Heat Orchestration Templates (i.e., a +base module and one or more incremental modules), +it is valid for the base module to not declare +a resource. + .. req:: :id: R-23664 diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Metadata Parameters.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Metadata Parameters.rst index 8dabc7e..69b9e03 100644 --- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Metadata Parameters.rst +++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Nova Metadata Parameters.rst @@ -579,6 +579,11 @@ R-46461 and R-35666). An example is provided below. parameter (when defined as a ``comma_delimited_list``) when the port is attaching to an ONAP external network (per the ONAP definition, see Requirement R-57424 and R-16968) + - ``OS::ContrailV2::InstanceIp`` property ``instance_ip_address`` + parameter (when defined as a ``comma_delimited_list``) when the port + (i.e, ``OS::ContrailV2::VirtualMachineInterface``) is + attaching to an ONAP external network (per the ONAP + definition, see Requirement R-57424 and R-16968) The ``vf_module_index`` will start at 0 for the first instance of a module type. Subsequent instances of the same module type will receive the diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst index 492f859..d7922b3 100644 --- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst +++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Resource IDs.rst @@ -600,7 +600,7 @@ OS::Nova::Keypair :updated: frankfurt A VNF's Heat Orchestration Template's Resource ``OS::Nova::Keypair`` - applies to one ``{vm-type}``, the ``OS::Nova::Keypair`` + that applies to one ``{vm-type}``, the ``OS::Nova::Keypair`` Resource ID **SHOULD** use the naming convention * ``{vm-type}_keypair_{index}`` @@ -619,7 +619,7 @@ OS::Nova::Keypair :updated: frankfurt A VNF's Heat Orchestration Template's Resource ``OS::Nova::Keypair`` - applies to all Virtual Machines in the VNF, the + that applies to all Virtual Machines in the VNF, the ``OS::Nova::Keypair`` Resource ID **SHOULD** use the naming convention -- cgit 1.2.3-korg