aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstark, steven <steven.stark@att.com>2020-07-06 08:43:50 -0700
committerstark, steven <steven.stark@att.com>2020-07-06 08:43:50 -0700
commit3b96f670aad978447056a379085206470e61af07 (patch)
treea5d0ac80e044e7f2f8a7e73d0e6d0c454d101f7d
parent0b0495cf84c2972a5a5e9ecc1bc5f0cd7ee24fe1 (diff)
[VVP] Bug fix for test_port_resource_ids
Test was skipping if unable to determine network role or network type. Now it will fail them. Issue-ID: VVP-346 Signed-off-by: stark, steven <steven.stark@att.com> Change-Id: I63cd3d911d976adfa4faaaf88de0498c3d86174c
-rw-r--r--ice_validator/tests/fixtures/test_port_resource_ids/fail/no_network_role.yaml92
-rw-r--r--ice_validator/tests/test_port_resource_ids.py8
2 files changed, 100 insertions, 0 deletions
diff --git a/ice_validator/tests/fixtures/test_port_resource_ids/fail/no_network_role.yaml b/ice_validator/tests/fixtures/test_port_resource_ids/fail/no_network_role.yaml
new file mode 100644
index 0000000..0fb8e60
--- /dev/null
+++ b/ice_validator/tests/fixtures/test_port_resource_ids/fail/no_network_role.yaml
@@ -0,0 +1,92 @@
+# -*- 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============================================
+#
+#
+---
+heat_template_version: 2015-04-30
+
+description: Heat template description
+
+parameters:
+
+ vnf_id:
+ type: string
+ description: Unique ID for this VNF instance
+
+ vf_module_id:
+ type: string
+ description: Unique ID for this VF module
+
+ vnf_name:
+ type: string
+ description: Unique name for this VNF instance
+
+ admin_names:
+ type: comma_delimited_list
+ description: Names attribute for the VMs
+
+ availability_zone_0:
+ type: string
+ description: availability zone to be used
+
+ admin_flavor_name:
+ type: string
+ description: flavor to be used to create this vm must be one of the following flavors
+
+ exnet_net_name:
+ type: string
+ description: network name for the external network extnet
+
+resources:
+
+ admin_server_1:
+ type: OS::Nova::Server
+ properties:
+ availability_zone: { get_param: availability_zone_0 }
+ name: { get_param: [admin_names, 1] }
+ flavor: { get_param: admin_flavor_name}
+ networks:
+ - port: { get_resource: port_0 }
+ metadata:
+ vnf_name: { get_param: vnf_name }
+ vnf_id: { get_param: vnf_id }
+ vf_module_id: { get_param: vf_module_id }
+
+ port_0:
+ type: OS::Neutron::Port
+ properties:
+ network: { get_param: exnet_net_name }
diff --git a/ice_validator/tests/test_port_resource_ids.py b/ice_validator/tests/test_port_resource_ids.py
index 6bd2a4e..d587743 100644
--- a/ice_validator/tests/test_port_resource_ids.py
+++ b/ice_validator/tests/test_port_resource_ids.py
@@ -108,14 +108,22 @@ def test_port_resource_ids(yaml_file):
if property_uses_get_resource(v, "network"):
continue
+
network_role = get_network_role_from_port(port_resource)
if not network_role:
+ invalid_ports.append(
+ (port_id, "Unable to determine network role for port.")
+ )
continue
network_role = network_role.lower()
network_type = get_network_type_from_port(port_resource)
if not network_type:
+ invalid_ports.append(
+ (port_id, "Unable to determine network type for port (internal or external).")
+ )
continue
+
if network_type == "external":
expected_r_id = r"{}_\d+_{}_port_\d+".format(vm_type, network_role)
else: