[VVP] Allow lists in test_availability_zone

Change-Id: I590830db83b0c7dd5df2ac59992a7771483eab03
Issue-ID: VVP-165
Signed-off-by: Lovett, Trevor (tl2972) <tl2972@att.com>

diff --git a/ice_validator/tests/fixtures/test_availability_zone/fail/using_list_instead_of_get_param.yaml b/ice_validator/tests/fixtures/test_availability_zone/fail/using_list_instead_of_get_param.yaml
deleted file mode 100644 (file)
index 45ae89f..0000000
--- a/ice_validator/tests/fixtures/test_availability_zone/fail/using_list_instead_of_get_param.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf8 -*-
-# ============LICENSE_START=======================================================
-# org.onap.vvp/validation-scripts
-# ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-# ===================================================================
-#
-# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the "License");
-# you may not use this software except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-#
-# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
-# you may not use this documentation except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#             https://creativecommons.org/licenses/by/4.0/
-#
-# Unless required by applicable law or agreed to in writing, documentation
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ============LICENSE_END============================================
-#
-#
----
-resources:
-  vm_type_b_server_0:
-      type: OS::Nova::Server
-      properties:
-        availability_zone: { get_param: [availability_zones, 0] }
-        name: { get_param: vm_type_b_name_0  }
-        flavor: { get_param: vm_type_b_flavor_name}
-        image: { get_param: vm_type_b_image_name}
-        metadata:
-          vnf_name: { get_param: vnf_name }
-          vnf_id: { get_param: vnf_id }
-          vf_module_id: { get_param: vf_module_id }
-        key_name: { get_param: vm_type_b_key_name }

diff --git a/ice_validator/tests/test_availability_zone.py b/ice_validator/tests/test_availability_zone.py
index f22111a..7feefc9 100644 (file)
--- a/ice_validator/tests/test_availability_zone.py
+++ b/ice_validator/tests/test_availability_zone.py
@@ -80,7 +80,10 @@ def test_availability_zone_naming(yaml_file):
                     continue
                 if "get_param" not in v2:
                     invalid_availability_zones.add(k1)
-                elif not re.match(r"availability_zone_\d+", v2["get_param"]):
+                    continue
+                if not isinstance(v2["get_param"], str):
+                    continue
+                if not re.match(r"availability_zone_\d+", v2["get_param"]):
                     invalid_availability_zones.add(v2["get_param"])
 
     assert not invalid_availability_zones, "invalid availability zones %s" % list(