From 2cc3e9501afbf087517f80f4f30881bb9631315f Mon Sep 17 00:00:00 2001 From: "weinstock, alan" Date: Fri, 3 Jan 2020 19:30:57 +0000 Subject: [VNFRQTS] clarifying R-67793 & R-08775 Issue-ID: VNFRQTS-787 Signed-off-by: weinstock, alan Change-Id: I75953ad74118086c1724919689e46050bbde5da5 --- .../Neutron Parameters.rst | 2 +- .../Resource IDs.rst | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'docs/Chapter5') diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst index 1305f80..16205dd 100644 --- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst +++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Neutron Parameters.rst @@ -232,7 +232,7 @@ The output parameter name will be declared as a parameter in the When the VNF's Heat Orchestration Template's resource ``OS::Neutron::Port`` is in the base module and -is attaching to an internal network (per the +is attaching to an ONAP internal network (per the ONAP definition, see Requirements R-52425 and R-46461 and R-35666), and the ONAP internal network is 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 518fd2a..492f859 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 @@ -117,8 +117,6 @@ Heat Orchestration Template resources are described in :ref:`resources`. ONAP external network (per the ONAP definition, see Requirement R-57424 and R-16968), the Resource ID **MUST NOT** contain the ``{vm-type}`` and/or ``{network-role}``/``int_{network-role}``. - It also should contain the - term ``shared`` and/or contain text that identifies the VNF. .. req:: :id: R-27970 @@ -456,8 +454,9 @@ OS::Neutron::SecurityGroup A VNF's Heat Orchestration Template's Resource ``OS::Neutron::SecurityGroup`` - that is applicable to one ``{vm-type}`` and more than one network (internal - and/or external), the ``OS::Neutron::SecurityGroup`` + that is applicable to one ``{vm-type}`` and more than one network + (ONAP internal network + and/or ONAP external network), the ``OS::Neutron::SecurityGroup`` Resource ID **SHOULD** use the naming convention * ``{vm-type}_security_group`` -- cgit 1.2.3-korg