Commit test list join for availability_zone

These changes were imported from upstream @ commit
	e38076e29ef8c86c510fca3141954d10602040bb
- Updated `nested_iterables` to parse list_join if available in
	 the templates
- Updated `test_volume_resource_ids` to allow volume ids
	to be provided as a parameter list
- Appropriate fixture additions and changes

Change-Id: Ia2187fe4eb7a389c8df01061be229246262d9a24
Issue-Id: VVP-29
Signed-off-by: Edan Binshtok <eb578m@intl.att.com>

1 files changed, 16 insertions, 2 deletions

diff --git a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_2.yaml b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_2.yaml
index 46ea4cd..8f1e3bb 100644
--- a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_2.yaml
+++ b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_2.yaml
@@ -77,7 +77,7 @@ parameters:
   ex1_flavor_name:
     type: string
     label: Flavor
-    description: Type of instance (flavor) to be used  
+    description: Type of instance (flavor) to be used
   ex1_key:
     type: string
     label: key pair
@@ -92,6 +92,12 @@ parameters:
     description: Index of server
     constraint:
       - range: { min: 1, max: 100 }
+  availability_zone_0:
+    type: string
+    description: availabilityzone name
+  availability_zone_1:
+    type: string
+    description: availabilityzone name
 
 resources:
   ex_software_config_0:
@@ -102,6 +108,14 @@ resources:
           params:
             $stack_name: { get_param: 'OS::stack_name' }
 
+  ex_nova_serverGroup:
+    type: OS::Nova::ServerGroup
+    properties:
+      vnf_id: { get_param: vnf_id }
+      vf_module_id:  { get_param: vf_module_id }
+      vnf_name:  { get_param: vnf_name }
+      availability_zones: { list_join: [',', [ { get_param: availability_zone_0 }, { get_param: availability_zone_1 } ] ] }
+
   ex_nova_server_0:
     type: OS::Nova::Server
     properties:
@@ -140,4 +154,4 @@ resources:
         vnf_name: { get_param: vnf_name }
       image: { get_param: ex1_image_name}
       flavor: { get_param: ex1_flavor_name }
-      key_name: { get_param: ex1_key }
\ No newline at end of file
+      key_name: { get_param: ex1_key }