[VNFRQTS] updated 6 req in Heat Sec

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

2 files changed, 36 insertions, 27 deletions

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 274418e..964288b 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
@@ -56,8 +56,9 @@ Template at orchestration time.
 
     A VNF's Heat Orchestration Template's ``OS::Nova::Server``
     resource property
-    ``metadata`` key/value pair ``vnf_id`` parameter ``vnf_id`` **MUST**
-    be declared as type: ``string``.
+    ``metadata`` key/value pair ``vnf_id`` parameter
+    **MUST** be declared as ``vnf_id`` and the parameter **MUST**
+    be defined as type: ``string``.
 
 .. req::
     :id: R-55218
@@ -145,8 +146,9 @@ Template at orchestration time.
     :validation_mode: static
     :updated: casablanca
 
-    A VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource
-    ``metadata`` map value parameter ``vf_module_id`` **MUST NOT**
+    A VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource property
+    ``metadata`` key/value pair ``vf_module_id`` parameter ``vf_module_id``
+    **MUST NOT**
     have parameter constraints defined.
 
 .. req::
@@ -249,9 +251,11 @@ Template at orchestration time.
     :validation_mode: static
     :updated: casablanca
 
-    If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource
-    ``metadata`` map value parameter ``vnf_name`` is passed into a Nested YAML
-    file, the parameter name ``vnf_name`` **MUST NOT** change.
+
+    If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource
+    property 
+    ``metadata`` key/value pair ``vnf_name`` is passed into a Nested YAML
+    file, the key/value pair name ``vnf_name`` **MUST NOT** change.
 
 *Example 'vnf_name' Parameter Definition*
 
@@ -330,9 +334,10 @@ part of the orchestration process.
     :validation_mode: static
     :updated: casablanca
 
-    If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource
-    metadata map value parameter ``vf_module_name`` is passed into a Nested YAML
-    file, the parameter name ``vf_module_name`` **MUST NOT** change.
+    If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource
+    property ``metadata`` key/value pair ``vf_module_name`` is passed into a
+    Nested YAML
+    file, the key/value pair name ``vf_module_name`` **MUST NOT** change.
 
 *Example 'vf_module_name' Parameter Definition*
 
@@ -373,9 +378,11 @@ available for use by other ONAP components and/or north bound systems.
     :validation_mode: static
     :updated: casablanca
 
-    A VNF's Heat Orchestration Template's OS::Nova::Server Resource
-    ``metadata`` map value parameter ``vm_role`` **MUST**
-    be declared as type: ``string``.
+    If a VNF's Heat Orchestration Template's ``OS::Nova::Server``
+    resource property
+    ``metadata`` key/value pair ``vm_role`` value is obtained via 
+    ``get_param``, the parameter **MUST** be declared as ``vm_role`` 
+    and the parameter **MUST** be defined as type: ``string``.
 
 .. req::
     :id: R-67597
@@ -582,10 +589,11 @@ vf_module_index
     :validation_mode: static
     :updated: casablanca
 
-    If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource
-    ``metadata`` map value parameter ``vf_module_index`` **MUST NOT**
-    be used in a
-    VNF's Volume Template; it is not supported.
+    A VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource
+    property ``metadata`` key/value pair ``vf_module_index`` **MUST NOT**
+    be used in a ``OS::Cinder::Volume`` resource and **MUST NOT** be
+    used in VNF's Volume template;
+    it is not supported.
 
 The ``vf_module_index`` parameter indicates which instance of the module is
 being deployed into the VNF.
@@ -782,8 +790,9 @@ environment_context
     :validation_mode: static
     :updated: casablanca
 
-    A VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource
-    ``metadata`` map value parameter ``environment_context`` **MUST NOT**
+    A VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource
+    property ``metadata``key/value pair ``environment_context``
+    parameter ``environment_context`` **MUST NOT**
     have parameter constraints defined.
 
 .. req::
diff --git a/docs/data/needs.json b/docs/data/needs.json
index c926298..81a1b94 100644
--- a/docs/data/needs.json
+++ b/docs/data/needs.json
@@ -23344,7 +23344,7 @@
                     "validation_mode": "static"
                 },
                 "R-07507": {
-                    "description": "A VNF's Heat Orchestration Template's ``OS::Nova::Server``\nresource property\n``metadata`` key/value pair ``vnf_id`` parameter ``vnf_id`` **MUST**\nbe declared as type: ``string``.",
+                    "description": "A VNF's Heat Orchestration Template's ``OS::Nova::Server``\nresource property\n``metadata`` key/value pair ``vnf_id`` parameter\n**MUST** be declared as ``vnf_id`` and the parameter **MUST**\nbe defined as type: ``string``.",
                     "full_title": "",
                     "hide_links": "",
                     "id": "R-07507",
@@ -25205,7 +25205,7 @@
                     "validation_mode": ""
                 },
                 "R-16576": {
-                    "description": "If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource\n``metadata`` map value parameter ``vnf_name`` is passed into a Nested YAML\nfile, the parameter name ``vnf_name`` **MUST NOT** change.",
+                    "description": "If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource\nproperty\n``metadata`` key/value pair ``vnf_name`` is passed into a Nested YAML\nfile, the key/value pair name ``vnf_name`` **MUST NOT** change.",
                     "full_title": "",
                     "hide_links": "",
                     "id": "R-16576",
@@ -32841,7 +32841,7 @@
                     "validation_mode": ""
                 },
                 "R-49177": {
-                    "description": "If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource\nmetadata map value parameter ``vf_module_name`` is passed into a Nested YAML\nfile, the parameter name ``vf_module_name`` **MUST NOT** change.",
+                    "description": "If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource\nproperty ``metadata`` key/value pair ``vf_module_name`` is passed into a\nNested YAML\nfile, the key/value pair name ``vf_module_name`` **MUST NOT** change.",
                     "full_title": "",
                     "hide_links": "",
                     "id": "R-49177",
@@ -33987,7 +33987,7 @@
                     "validation_mode": "static"
                 },
                 "R-55306": {
-                    "description": "If a VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource\n``metadata`` map value parameter ``vf_module_index`` **MUST NOT**\nbe used in a\nVNF's Volume Template; it is not supported.",
+                    "description": "A VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource\nproperty ``metadata`` key/value pair ``vf_module_index`` **MUST NOT**\nbe used in a ``OS::Cinder::Volume`` resource and **MUST NOT** be\nused in VNF's Volume template;\nit is not supported.",
                     "full_title": "",
                     "hide_links": "",
                     "id": "R-55306",
@@ -34099,7 +34099,7 @@
                     "validation_mode": ""
                 },
                 "R-56183": {
-                    "description": "A VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource\n``metadata`` map value parameter ``environment_context`` **MUST NOT**\nhave parameter constraints defined.",
+                    "description": "A VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource\nproperty ``metadata``key/value pair ``environment_context``\nparameter ``environment_context`` **MUST NOT**\nhave parameter constraints defined.",
                     "full_title": "",
                     "hide_links": "",
                     "id": "R-56183",
@@ -42370,7 +42370,7 @@
                     "validation_mode": ""
                 },
                 "R-95430": {
-                    "description": "A VNF's Heat Orchestration Template's OS::Nova::Server Resource\n``metadata`` map value parameter ``vm_role`` **MUST**\nbe declared as type: ``string``.",
+                    "description": "If a VNF's Heat Orchestration Template's ``OS::Nova::Server``\nresource property\n``metadata`` key/value pair ``vm_role`` value is obtained via\n``get_param``, the parameter **MUST** be declared as ``vm_role``\nand the parameter **MUST** be defined as type: ``string``.",
                     "full_title": "",
                     "hide_links": "",
                     "id": "R-95430",
@@ -42967,7 +42967,7 @@
                     "validation_mode": ""
                 },
                 "R-98374": {
-                    "description": "A VNF's Heat Orchestration Template's ``OS::Nova::Server`` Resource\n``metadata`` map value parameter ``vf_module_id`` **MUST NOT**\nhave parameter constraints defined.",
+                    "description": "A VNF's Heat Orchestration Template's ``OS::Nova::Server`` resource property\n``metadata`` key/value pair ``vf_module_id`` parameter ``vf_module_id``\n**MUST NOT**\nhave parameter constraints defined.",
                     "full_title": "",
                     "hide_links": "",
                     "id": "R-98374",
@@ -43531,4 +43531,4 @@
             "needs_amount": 761
         }
     }
-}
\ No newline at end of file
+}