From: steven stark Date: Fri, 7 Jun 2019 18:52:10 +0000 (+0000) Subject: Merge "[VVP] Improved readability of reports" X-Git-Tag: 5.0.0~22 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=commitdiff_plain;h=ca689124b4e957a7a683a7c49eb4e12703afa09c;hp=2f5bed51e4b120e2efffe6a6298c24270e862ad4 Merge "[VVP] Improved readability of reports" --- diff --git a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/fail/unique_resource_stack_name_without_vnf_name_or_module.yml b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/fail/unique_resource_stack_name_without_vnf_name_or_module.yml deleted file mode 100644 index 42dab4d..0000000 --- a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/fail/unique_resource_stack_name_without_vnf_name_or_module.yml +++ /dev/null @@ -1,70 +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: - lb_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [vm_type_a_names, 0] } - flavor: { get_param: vm_type_a_flavor_name} - image: { get_param: vm_type_a_image_name} - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : vm_type_a_cinder_volume_id_0 }, delete_on_termination : "false" }] - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - lb_volume_0: - type: OS::Cinder::Volume - properties: - name: - str_replace: - template: VNF_NAME_STACK_NAME_oam_volume - params: - STACK_NAME: { get_param: 'OS::stack_name' } - my_keypair: - type: OS::Nova::Keypair - properties: - name: - str_replace: - template: VNF_NAME_key_pair - params: - VNF_NAME: { get_param: vnf_name } - public_key: {get_param: ssh_public_key} - save_private_key: false diff --git a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/pass/unique_resource_template.yml b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/pass/unique_resource_template.yml deleted file mode 100644 index 71db181..0000000 --- a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/pass/unique_resource_template.yml +++ /dev/null @@ -1,90 +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: - lb_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [vm_type_a_names, 0] } - flavor: { get_param: vm_type_a_flavor_name} - image: { get_param: vm_type_a_image_name} - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : vm_type_a_cinder_volume_id_0 }, delete_on_termination : "false" }] - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - lb_volume_0: - type: OS::Cinder::Volume - properties: - name: - str_replace: - template: VNF_NAME_STACK_NAME_oam_volume - params: - VNF_NAME: { get_param: vnf_name } - STACK_NAME: { get_param: 'OS::stack_name' } - lb_volume_1: - type: OS::Cinder::Volume - properties: - name: - str_replace: - template: VNF_NAME_STACK_NAME_oam_volume - params: - STACK_NAME: { get_param: 'OS::stack_name' } - MODULE_ID: { get_param: vf_module_id } - lb_volume_1: - type: OS::Cinder::Volume - properties: - name: - str_replace: - template: VNF_NAME_STACK_NAME_oam_volume - params: - VNF_NAME: { get_param: vnf_name } - STACK_NAME: { get_param: 'OS::stack_name' } - MODULE_ID: { get_param: vf_module_id } - my_keypair: - type: OS::Nova::Keypair - properties: - name: - str_replace: - template: VNF_NAME_key_pair - params: - VNF_NAME: { get_param: vnf_name } - public_key: {get_param: ssh_public_key} - save_private_key: false diff --git a/ice_validator/tests/utils/ports.py b/ice_validator/tests/utils/ports.py index 8c25df7..d65202c 100644 --- a/ice_validator/tests/utils/ports.py +++ b/ice_validator/tests/utils/ports.py @@ -141,10 +141,10 @@ def check_parameter_format( regx_dict = regx[resource_intext].get(parameter_type) if not regx_dict: msg = ( - "{} {} parameter {} defined as type {} " + "{} {} {} parameter {} defined as type {} " "which is required by platform data model for proper " "assignment and inventory." - ).format(resource_type, properties, parameter, parameter_type) + ).format(resource_type, rid, properties, parameter, parameter_type) if exemptions_allowed: msg = "WARNING: {} {}".format(msg, AAP_EXEMPT_CAVEAT) invalid_parameters.append(msg)