[VNFRQTS] updated heat requirements

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

5 files changed, 12 insertions, 41 deletions

diff --git a/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst b/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
index fe5c877..447768b 100644
--- a/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
@@ -45,8 +45,7 @@ while others **MAY** be included.
 As stated in :need:`R-07443`, a VNF's Heat Orchestration Templates' Cinder
 Volume Module Output Parameter's name and type **MUST** match the input
 parameter name and type in the corresponding Base Module or Incremental
-Module unless the Output Parameter is of the type ``comma_delimited_list``,
-then the corresponding input parameter **MUST** be declared as type ``json``.
+Module.
 
 A volume template must define ``outputs`` for each Cinder volume resource
 universally unique identifier (UUID) (i.e. ONAP Volume Template Output
diff --git a/docs/Chapter5/Heat/ONAP Heat Orchestration Templates Overview.rst b/docs/Chapter5/Heat/ONAP Heat Orchestration Templates Overview.rst
index f1e2b4e..7f6045a 100644
--- a/docs/Chapter5/Heat/ONAP Heat Orchestration Templates Overview.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Orchestration Templates Overview.rst
@@ -426,15 +426,7 @@ other VNFs.
 
     VNF's Heat Orchestration Template's Base Module's output parameter's
     name and type **MUST** match the VNF's Heat Orchestration Template's
-    incremental Module's name and type unless the output parameter is of
-    type ``comma_delimited_list``, then the corresponding input parameter
-    **MUST** be declared as type ``json``.
-
-If the Output parameter has a comma_delimited_list value (e.g., a collection
-of UUIDs from a Resource Group), then the corresponding input parameter must
-be declared as type ``json`` and not a ``comma_delimited_list``,
-which is actually a string value with embedded commas.
-
+    incremental Module's name and type.
 
 .. req::
     :id: R-22608
@@ -480,15 +472,7 @@ template is associated with.
 
     A VNF's Heat Orchestration Templates' Cinder Volume Module Output
     Parameter's name and type **MUST** match the input parameter name and type
-    in the corresponding Base Module or Incremental Module unless the Output
-    Parameter is of the type ``comma_delimited_list``, then the corresponding
-    input parameter **MUST** be declared as type ``json``.
-
-If the Output parameter has a comma_delimited_list value (e.g., a collection
-of UUIDs from a Resource Group), then the corresponding input parameter must
-be declared as type json and not a comma_delimited_list, which is actually
-a string value with embedded commas.
-
+    in the corresponding Base Module or Incremental Module.
 
 .. req::
     :id: R-20547
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 4342bb0..7fe73e5 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
@@ -1294,18 +1294,12 @@ Note that the management of the VIP IP addresses (i.e. transferring
 ownership between active and standby VMs) is the responsibility of
 the VNF application.
 
-.. req::
-    :id: R-62300
-    :target: VNF
-    :keyword: MUST
-    :validation_mode: static
-    :updated: casablanca
 
-    If a VNF has two or more ports that require a Virtual IP Address (VIP),
-    a VNF's Heat Orchestration Template's Resource
-    ``OS::Neutron::Port`` property ``allowed_address_pairs``
-    map property ``ip_address`` parameter
-    **MUST** be used.
+If a VNF has two or more ports that require a Virtual IP Address (VIP),
+a VNF's Heat Orchestration Template's Resource
+``OS::Neutron::Port`` property ``allowed_address_pairs``
+map property ``ip_address`` parameter
+must be used.
 
 The ``allowed_address_pairs`` is an optional property. It is not required.
 
diff --git a/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst b/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
index 1af326e..e08ad9d 100644
--- a/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
@@ -57,16 +57,10 @@ Module may use nested heat.
     A VNF's Heat Orchestration Template **MUST** have no more than
     two levels of nesting.
 
-.. req::
-    :id: R-70112
-    :target: VNF
-    :keyword: MUST
-    :validation_mode: static
-    :introduced: casablanca
 
-    A VNF's Heat Orchestration Template **MUST** reference a Nested YAML
-    file by name. The use of ``resource_registry`` in the VNF's Heat
-    Orchestration Templates Environment File **MUST NOT** be used.
+A VNF's Heat Orchestration Template must reference a Nested YAML
+file by name. The use of ``resource_registry`` in the VNF's Heat
+Orchestration Templates Environment File must not be used.
 
 Two levels of nesting is defined as follows:  A base module, incremental
 module, or cinder volume module references a nested heat file either
diff --git a/docs/Chapter5/Heat/ONAP Heat VNF Modularity.rst b/docs/Chapter5/Heat/ONAP Heat VNF Modularity.rst
index ae44870..fd6608e 100644
--- a/docs/Chapter5/Heat/ONAP Heat VNF Modularity.rst
+++ b/docs/Chapter5/Heat/ONAP Heat VNF Modularity.rst
@@ -287,7 +287,7 @@ base.yaml
 
   resources:
     int_oam_network:
-      type: OS::Neutron::Network
+      type: OS::Neutron::Net
       properties:
         name: {… }
   . . .