[VNFRQTS] updates to the heat requirements

Issue-ID: VNFRQTS-454

Change-Id: I72edf1fb0151b62937010d134b360411569d18f2
Signed-off-by: weinstock, alan <aw2574@att.com>

2 files changed, 65 insertions, 0 deletions

diff --git a/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst b/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
index 8c10e4b..aff0e91 100644
--- a/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Cinder Volumes.rst
@@ -72,6 +72,23 @@ The following rules apply to independent volume Heat templates:
 
 -  Volume modules may utilize nested Heat templates.
 
+.. req:: 
+    :id: R-270358
+    :target: VNF 
+    :keyword: MUST 
+    :validation_mode: static 
+    :updated: casablanca
+
+    A VNF's Heat Orchestration Template's Cinder Volume Template **MUST**
+    contain either
+
+    * An ``OS::Cinder::Volume`` resource
+    * An ``OS::Heat::ResourceGroup`` resource that references a Nested YAML
+      file that contains an ``OS::Cinder::Volume`` resource
+    * A resource that defines the property ``type`` as a Nested YAML file
+      (i.e., static nesting) and the Nested YAML contains
+      an ``OS::Cinder::Volume`` resource
+
 Optional Property availability_zone
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
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 6c890a5..ca66db2 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
@@ -26,6 +26,24 @@ 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 
+    :keyword: MUST 
+    :validation_mode: static 
+    :updated: casablanca
+
+    A VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource's
+
+    * Resource ID
+    * property ``image`` parameter name
+    * property ``flavor`` parameter name
+    * property ``name`` parameter name
+    
+    **MUST** contain the identical ``{vm-type}``
+    and **MUST** follow the naming conventions defined
+    in R-58670, R-45188, R-54171, R-87817, and R-29751.
+
 The table below provides a summary. The sections that follow provides
 the detailed requirements.
 
@@ -47,6 +65,16 @@ Property: image
 
 
 .. req::
+    :id: R-901331
+    :target: VNF
+    :keyword: MUST
+    :validation_mode: static
+    :updated: casablanca
+
+    The VNF's Heat Orchestration Template's Resource ``OS::Nova::Server``
+    property ``image`` value **MUST** be be obtained via a ``get_param``.
+
+.. req::
     :id: R-71152
     :target: VNF
     :keyword: MUST
@@ -108,6 +136,16 @@ Property: flavor
 
 
 .. req::
+    :id: R-481670
+    :target: VNF
+    :keyword: MUST
+    :validation_mode: static
+    :updated: casablanca
+
+    The VNF's Heat Orchestration Template's Resource ``OS::Nova::Server``
+    property ``flavor`` value **MUST** be be obtained via a ``get_param``.
+
+.. req::
     :id: R-50436
     :target: VNF
     :keyword: MUST
@@ -166,6 +204,16 @@ Property: Name
 
 
 .. req::
+    :id: R-663631
+    :target: VNF
+    :keyword: MUST
+    :validation_mode: static
+    :updated: casablanca
+
+    The VNF's Heat Orchestration Template's Resource ``OS::Nova::Server``
+    property ``name`` value **MUST** be be obtained via a ``get_param``.
+
+.. req::
     :id: R-51430
     :target: VNF
     :keyword: MUST