[VNFRQTS] deleted 4 redundant requirements

Change-Id: I2f20fdc46dde0dab128dcf2e2af3a49d64eea0c4
Issue-ID: VNFRQTS-471
Signed-off-by: weinstock, alan <aw2574@att.com>
Signed-off-by: stark, steven <steven.stark@att.com>

5 files changed, 4 insertions, 55 deletions

diff --git a/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst b/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
index 6677a06..6ce2cad 100644
--- a/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
@@ -48,20 +48,9 @@ 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``.
 
-A single volume module must create only the volumes
-required by a single Incremental module or Base module.
-
-The following rules apply to independent volume Heat templates:
-
-.. req::
-    :id: R-79531
-    :target: VNF
-    :keyword: MUST
-
-    The VNF Heat Orchestration Template **MUST** define
-    "outputs" in the volume template for each Cinder volume
-    resource universally unique identifier (UUID) (i.e. ONAP
-    Volume Template Output Parameters).
+A volume template must define ``outputs`` for each Cinder volume resource
+universally unique identifier (UUID) (i.e. ECOMP Volume Template Output
+Parameters.
 
 -  The VNF Incremental Module or Base Module must define input
    parameters that match each Volume output parameter (i.e., ONAP Volume
diff --git a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst
index 523bf8b..1fbdec7 100644
--- a/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Resource ID and Parameter Naming Convention/Contrail Resource Parameters.rst
@@ -36,17 +36,6 @@ External Networks
       Environment File
 
 .. req::
-    :id: R-73228
-    :target: VNF
-    :keyword: MUST
-    :validation_mode: static
-    :updated: casablanca
-
-    A VNF's Heat Orchestration Template's parameter
-    ``{network-role}_net_fqdn``
-    **MUST** be declared as type ``string``.
-
-.. req::
     :id: R-92193
     :target: VNF
     :keyword: MUST NOT
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 7055e6e..5a4463e 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
@@ -399,25 +399,6 @@ available for use by other ONAP components and/or north bound systems.
     property ``metadata`` key/value pair ``vm_role`` parameter ``vm_role``
     **MUST NOT** have parameter constraints defined.
 
-.. req::
-    :id: R-46823
-    :target: VNF
-    :keyword: MUST
-    :validation_mode: static
-    :updated: casablanca
-
-    A VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource
-    ``metadata`` map value parameter ``vm_role`` **MUST**
-    be either
-
-     * enumerated in the VNF's Heat Orchestration Template's environment
-       file.
-
-     * hard coded in the VNF's
-       Heat Orchestration Template's ``OS::Nova::Server`` Resource
-       ``metadata`` property.
-
-
 Defining the ``vm_role`` as the ``{vm-type}`` is a recommended convention
 
 
diff --git a/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst b/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
index 07d9151..ce2c1e4 100644
--- a/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
@@ -662,16 +662,6 @@ that contains the VNF's complete Heat Orchestration Template.
     ``get_file`` **MUST NOT** utilize URL-based file retrieval.
 
 .. req::
-    :id: R-62177
-    :target: VNF
-    :keyword: MUST
-    :validation_mode: static
-    :updated: casablanca
-
-    When using the intrinsic function get_file, the included files
-    **MUST** have unique file names within the scope of the VNF.
-
-.. req::
     :id: R-87848
     :target: VNF
     :keyword: MUST
diff --git a/docs/Chapter5/Heat/ONAP Heat VNF Modularity.rst b/docs/Chapter5/Heat/ONAP Heat VNF Modularity.rst
index bbb706c..23ce06b 100644
--- a/docs/Chapter5/Heat/ONAP Heat VNF Modularity.rst
+++ b/docs/Chapter5/Heat/ONAP Heat VNF Modularity.rst
@@ -67,7 +67,7 @@ Incremental Module.
 
     A shared Heat Orchestration Template resource is a resource that **MUST**
     be defined in the base module and will be referenced by one or
-    more resources in one more more incremental modules.
+    more resources in one or more incremental modules.
 
     The UUID of the shared resource (created in the base module) **MUST** be
     exposed by declaring a parameter in the