[VNFRQTS] Update R-86182 & convert R-93177 to txt

Change-Id: I21d50c4708142ac84229470d5340fd753853442f
Issue-ID: VNFRQTS-622
Signed-off-by: weinstock, alan <aw2574@att.com>

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 ccf203f..55527c8 100644 (file)
--- 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
@@ -202,13 +202,16 @@ the port is attached to.
     :target: VNF
     :keyword: MUST
     :validation_mode: static
-    :updated: casablanca
+    :updated: dublin
+
 
     When the VNF's Heat Orchestration Template's Resource
-    ``OS::Neutron::Port`` is attaching to an internal network (per the
+    ``OS::Neutron::Port``
+    is in an incremental module and
+    is attaching to an internal network (per the
     ONAP definition, see Requirements R-52425 and R-46461),
-    and the internal network is created in a
-    different Heat Orchestration Template than the ``OS::Neutron::Port``,
+    and the internal network is created in
+    the base module,
     the ``network`` parameter name **MUST**
 
       * follow the naming convention ``int_{network-role}_net_id`` if the Neutron
@@ -219,29 +222,28 @@ the port is attached to.
     where ``{network-role}`` is the network-role of the internal network and
     a ``get_param`` **MUST** be used as the intrinsic function.
 
+
 In Requirement R-86182, the internal network is created in the VNF's
 Base Module (Heat Orchestration Template) and the parameter name is
 declared in the Base Module's ``outputs`` section.
 The output parameter name will be declared as a parameter in the
 ``parameters`` section of the incremental module.
 
+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
+ONAP definition, see Requirements R-52425 and R-46461),
+and the internal network is
 
-.. req::
-    :id: R-93177
-    :target: VNF
-    :keyword: MUST
-    :validation_mode: static
-    :updated: casablanca
+ * created in the base module,
+   the ``network`` property value can obtain the UUID
+   of the internal network by using the intrinsic function
+   ``get_resource`` and referencing the Resource ID of the internal network.
+ * created in the base module by invoking a Nested YAML file, the network
+   property value can obtain the UUID of the internal network by using the
+   intrinsic function get_attr and referencing the Resource ID of the internal
+   network.
 
-    When the VNF's Heat Orchestration Template's resource
-    ``OS::Neutron::Port`` is attaching to an internal network (per the
-    ONAP definition, see Requirements R-52425 and R-46461),
-    and the internal network is created in the
-    same Heat Orchestration Template as the ``OS::Neutron::Port``,
-    the ``network`` property value **MUST** obtain the UUID
-    of the internal network by using the intrinsic function
-    ``get_resource``
-    and referencing the Resource ID of the internal network.
 
 .. req::
     :id: R-29872
@@ -1466,9 +1468,9 @@ VIP Assignment, External Networks, Supported by Automation
 
     When the VNF's Heat Orchestration Template's Resource
     ``OS::Neutron::Port`` is attaching to an external network (per the
-    ECOMP definition, see Requirement R-57424),
+    ONAP definition, see Requirement R-57424),
     and an IPv4 and/or IPv6 Virtual IP (VIP)
-    address is assigned via ECOMP automation
+    address is assigned via ONAP automation
     using the property ``allowed_address_pairs``
     map property ``ip_address``, the
     parameter **MUST NOT** be declared as ``type: comma_deliited_list``.
@@ -1484,7 +1486,7 @@ VIP Assignment, External Networks, Supported by Automation
 
     When the VNF's Heat Orchestration Template's Resource
     ``OS::Neutron::Port`` is attaching to an internal network (per the
-    ECOMP definition, see Requirements R-52425 and R-46461),
+    ONAP definition, see Requirements R-52425 and R-46461),
     and an IPv4 Virtual IP (VIP)
     address is assigned using the property ``allowed_address_pairs``
     map property ``ip_address``,
@@ -1530,11 +1532,11 @@ VIP Assignment, External Networks, Supported by Automation
 
     When the VNF's Heat Orchestration Template's Resource
     ``OS::Neutron::Port`` is attaching to an internal network (per the
-    ECOMP definition, see Requirements R-52425 and R-46461),
+    ONAP definition, see Requirements R-52425 and R-46461),
     and an IPv6 Virtual IP (VIP)
     address is assigned
     using the property ``allowed_address_pairs``
-    map property ``ip_address``, 
+    map property ``ip_address``,
     the parameter name **MUST** follow the
     naming convention