From 05f5129c37393886c802649876105bd0e1c8a7ea Mon Sep 17 00:00:00 2001 From: "weinstock, alan" Date: Thu, 4 Apr 2019 20:50:42 +0000 Subject: [VNFRQTS] R-82481 - make requirement text Change-Id: Icaefd41b61cf77b784b3bd62f88ad78da697db30 Issue-ID: VNFRQTS-615 Signed-off-by: weinstock, alan --- .../Nova Parameters.rst | 2 -- .../{vm-type}.rst | 39 ++++++++++------------ 2 files changed, 17 insertions(+), 24 deletions(-) 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 12fa33f..0876628 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 @@ -24,8 +24,6 @@ ONAP specified naming convention. Requirement R-01455 defines how the ``{vm-type]`` is defined. -Requirement R-82481 defines how the ``{vm-type}`` is used. - .. req:: :id: R-304011 :target: VNF diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst index 272a618..88339a7 100644 --- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst +++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/{vm-type}.rst @@ -40,34 +40,29 @@ The ``{vm-type}`` will be used in a VNF's Heat Orchestration Template's * Resource IDs * Resource property parameter names -Requirements in this document will explain it in further detail. +A VNF's Heat Orchestration Template's Resource property parameter that is +associated with a unique Virtual Machine type **MUST** include +``{vm-type}`` as part of the parameter name with two exceptions: -.. req:: - :id: R-82481 - :target: VNF - :keyword: MUST - :validation_mode: none - :updated: dublin +1.) The Resource ``OS::Nova::Server`` property ``availability_zone`` +parameter **MUST NOT** be prefixed with a common ``{vm-type}`` identifier, - A VNF's Heat Orchestration Template's Resource property parameter that is - associated with a unique Virtual Machine type **MUST** include - ``{vm-type}`` as part of the parameter name with two exceptions: +2.) The Resource ``OS::Nova::Server`` mandatory and optional +``metadata`` parameters - 1.) The Resource ``OS::Nova::Server`` property ``availability_zone`` - parameter **MUST NOT** be prefixed with a common ``{vm-type}`` identifier, + * ``vnf_name`` + * ``vnf_id`` + * ``vf_module_id`` + * ``vf_module_name`` + * ``vf_module_index`` + * ``environment_context`` + * ``workload_context`` - 2.) The Resource ``OS::Nova::Server`` mandatory and optional - ``metadata`` parameters +**MUST NOT** be prefixed with a common ``{vm-type}`` identifier. - * ``vnf_name`` - * ``vnf_id`` - * ``vf_module_id`` - * ``vf_module_name`` - * ``vf_module_index`` - * ``environment_context`` - * ``workload_context`` +Requirements for specific resource property parameter names can be +found in later sections of this document. - **MUST NOT** be prefixed with a common ``{vm-type}`` identifier. .. req:: :id: R-98407 -- cgit 1.2.3-korg