[VNFRQTS] update OS::Nova::Server az req

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

2 files changed, 30 insertions, 14 deletions

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 e5c3189..01edae9 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
@@ -375,10 +375,11 @@ Property: availability_zone
     :target: VNF
     :keyword: MUST
     :validation_mode: static
-    :updated: dublin
+    :updated: el alto
 
-    The VNF's Heat Orchestration Template's Resource ``OS::Nova::Server``
-    property ``availability_zone`` parameter name
+    A VNF's Heat Orchestration Template's base module or incremental module
+    resource ``OS::Nova::Server``
+    property ``availability_zone`` parameter
     **MUST** follow the naming convention
 
     * ``availability_zone_{index}``
@@ -392,10 +393,10 @@ Property: availability_zone
     :target: VNF
     :keyword: MUST
     :validation_mode: static
-    :updated: casablanca
+    :updated: el alto
 
-    The VNF's Heat Orchestration Template's Resource
-    ``OS::Nova::Server`` property
+    The VNF's Heat Orchestration Template's base module or incremental module
+    resource ``OS::Nova::Server`` property
     ``availability_zone`` parameter **MUST** be declared as type: ``string``.
 
 The parameter must not be declared as type ``comma_delimited_list``, ONAP does
@@ -414,6 +415,19 @@ not support it.
     Orchestration
     Template's Environment File.
 
+
+.. req::
+    :id: R-256790
+    :target: VNF
+    :keyword: MAY
+    :validation_mode: none
+    :introduced: el alto
+
+    A VNF's Heat Orchestration Template's Resource ``OS::Nova::Server``
+    property ``availability_zone`` parameter name **MAY** change when
+    past into a nested YAML file.
+
+
 Example Parameter Definition
 
 .. code-block:: yaml
@@ -435,7 +449,7 @@ for the OS::Nova::Server resource property availability_zone.
     :updated: casablanca
 
     A VNF's Heat Orchestration Template that contains an ``OS::Nova:Server``
-    Resource **MAY** define a parameter for the property
+    resource **MAY** define a parameter for the property
     ``availability_zone`` that is not utilized in any ``OS::Nova::Server``
     resources in the Heat Orchestration Template.
 
diff --git a/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst b/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
index 16a2118..174cd74 100644
--- a/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
+++ b/docs/Chapter5/Heat/ONAP Heat Template Constructs.rst
@@ -330,19 +330,21 @@ This is required for ONAP to build the TOSCA model for the VNF.
 Availability Zone and ResourceGroups
 ++++++++++++++++++++++++++++++++++++
 
-The resource OS::Heat::ResourceGroup and the property availability_zone
+The resource ``OS::Heat::ResourceGroup`` and the ``OS::Nova::Server``
+property ``availability_zone`` parameter
 has been an "issue" with a few VNFs since ONAP only supports
-availability_zone as a string parameter and not as a
+the ``availability_zone`` parameter as a string and not as a
 comma_delimited_list. This makes it difficult to use a
-OS::Heat::ResourceGroup to create Virtual Machines in more than one
+``OS::Heat::ResourceGroup`` to create ``OS::Nova::Server`` in more than one
 availability zone.
 
 There are numerous solutions to this issue. Below are two suggested
 usage patterns.
 
-**Option 1:** create a CDL in the OS::Heat::ResourceGroup. In the
-resource type: OS::Heat::ResourceGroup, create a comma_delimited_list
-availability_zones by using the intrinsic function list_join.
+**Option 1:** create a comma delimited list in the ``OS::Heat::ResourceGroup``.
+In the resource ``OS::Heat::ResourceGroup``, create a comma_delimited_list
+property ``availability_zones`` by concatenating the string
+``availability_zone`` parameters.
 
 .. code-block:: yaml
 
@@ -355,7 +357,7 @@ availability_zones by using the intrinsic function list_join.
         type: nested.yaml
         properties:
           index: index
-          availability_zones: { list_join: [',', [ { get_param: availability_zone_0 }, { get_param: availability_zone_1 } ] ] }
+          availability_zones: [ { get_param: availability_zone_0 }, { get_param: availability_zone_1 } ]
 
 In the nested heat