From f0711c0fcbdea9242c5ec11a64b1cbf614cc841b Mon Sep 17 00:00:00 2001 From: "Lovett, Trevor" Date: Tue, 5 Feb 2019 16:17:58 -0600 Subject: [VVP] Removing invalid tests Change-Id: I9336fa834b08748cabb5ac49495f1591f15939f8 Issue-ID: VVP-150 Signed-off-by: Lovett, Trevor --- .../fail/not_supported_policies.yml | 75 ----------- .../pass/with_supported_policies.yml | 75 ----------- ...ch_vm_type_instance_uuid_volume_attachment.yaml | 149 --------------------- .../mismatch_vm_type_volume_id_nova_server_id.yaml | 149 --------------------- ...ismatch_vm_type_volume_id_nova_server_id_2.yaml | 60 --------- .../fail/mismatch_vm_type_volume_id_param.yaml | 149 --------------------- .../fail/mismatch_vm_type_volume_id_param_2.yaml | 61 --------- .../fail/mismatch_vm_type_volume_id_resource.yaml | 149 --------------------- ...smatch_vm_type_volume_id_volume_attachment.yaml | 149 --------------------- ...atch_vm_type_volume_id_volume_attachment_2.yaml | 70 ---------- ...type_volume_id_volume_attachment_uppercase.yaml | 149 --------------------- .../pass/valid_template.yaml | 149 --------------------- .../pass/valid_template_2.yaml | 70 ---------- .../pass/valid_template_3.yaml | 59 -------- 14 files changed, 1513 deletions(-) delete mode 100644 ice_validator/tests/fixtures/test_nova_servergroup_policies/fail/not_supported_policies.yml delete mode 100644 ice_validator/tests/fixtures/test_nova_servergroup_policies/pass/with_supported_policies.yml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id_2.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param_2.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_resource.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_2.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template_2.yaml delete mode 100644 ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template_3.yaml (limited to 'ice_validator/tests/fixtures') diff --git a/ice_validator/tests/fixtures/test_nova_servergroup_policies/fail/not_supported_policies.yml b/ice_validator/tests/fixtures/test_nova_servergroup_policies/fail/not_supported_policies.yml deleted file mode 100644 index 76ce293..0000000 --- a/ice_validator/tests/fixtures/test_nova_servergroup_policies/fail/not_supported_policies.yml +++ /dev/null @@ -1,75 +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: - db_server_group: - type: OS::Nova::ServerGroup - properties: - name: - str_replace: - params: - $vnf_name: {get_param: vnf_name} - template: $vnf_name-server_group1 - policies: - - OS Profile - lb_server_group: - type: OS::Nova::ServerGroup - properties: - name: - str_replace: - params: - $vnf_name: {get_param: vnf_name} - template: $vnf_name-server_group2 - policies: - - affinity - db_0: - type: OS::Nova::Server - properties: - scheduler_hints: - group: {get_param: db_server_group} - db_1: - type: OS::Nova::Server - properties: - scheduler_hints: - group: {get_param: db_server_group} - lb_0: - type: OS::Nova::Server - properties: - scheduler_hints: - group: {get_param: lb_server_group} diff --git a/ice_validator/tests/fixtures/test_nova_servergroup_policies/pass/with_supported_policies.yml b/ice_validator/tests/fixtures/test_nova_servergroup_policies/pass/with_supported_policies.yml deleted file mode 100644 index 023aefa..0000000 --- a/ice_validator/tests/fixtures/test_nova_servergroup_policies/pass/with_supported_policies.yml +++ /dev/null @@ -1,75 +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: - db_server_group: - type: OS::Nova::ServerGroup - properties: - name: - str_replace: - params: - $vnf_name: {get_param: vnf_name} - template: $vnf_name-server_group1 - policies: - - anti-affinity - lb_server_group: - type: OS::Nova::ServerGroup - properties: - name: - str_replace: - params: - $vnf_name: {get_param: vnf_name} - template: $vnf_name-server_group2 - policies: - - affinity - db_0: - type: OS::Nova::Server - properties: - scheduler_hints: - group: {get_param: db_server_group} - db_1: - type: OS::Nova::Server - properties: - scheduler_hints: - group: {get_param: db_server_group} - lb_0: - type: OS::Nova::Server - properties: - scheduler_hints: - group: {get_param: lb_server_group} diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml deleted file mode 100644 index a504cd1..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml +++ /dev/null @@ -1,149 +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============================================ -# -# ---- -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 - - admin_volume_id_0: - type: string - description: reference to externally created cinder vol - - admin_volume_id_1: - type: string - description: reference to externally created cinder vol - - admin_volume_id_2: - type: string - description: reference to externally created cinder vol - - admin_volume_size_0: - type: number - description: Size of the volume to be created. - constraints: - - range: { min: 1, max: 1024 } - description: must be between 1 and 1024 Gb. - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : admin_volume_id_0 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : admin_volume_id_1 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_2: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 2] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_3: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 3] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_resource : admin_volume_id_3 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_id_3: - type: OS::Cinder::Volume - properties: - size: { get_param: admin_volume_size_0} - availability_zone: { get_param: availability_zone_0 } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: { get_param: admin_volume_id_2 } - mountpoint: /dev/vdb - instance_uuid: { get_resource: admin2_server_2 } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id.yaml deleted file mode 100644 index a5cea0c..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id.yaml +++ /dev/null @@ -1,149 +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============================================ -# -# ---- -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 - - admin_volume_id_0: - type: string - description: reference to externally created cinder vol - - admin_volume_id_1: - type: string - description: reference to externally created cinder vol - - admin_volume_id_2: - type: string - description: reference to externally created cinder vol - - admin_volume_size_0: - type: number - description: Size of the volume to be created. - constraints: - - range: { min: 1, max: 1024 } - description: must be between 1 and 1024 Gb. - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : admin_volume_id_0 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin2_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : admin_volume_id_1 }, delete_on_termination : "false" }] - flavor: { get_param: admin2_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_2: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 2] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_3: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 3] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_resource : admin_volume_id_3 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_id_3: - type: OS::Cinder::Volume - properties: - size: { get_param: admin_volume_size_0} - availability_zone: { get_param: availability_zone_0 } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: { get_param: admin_volume_id_2 } - mountpoint: /dev/vdb - instance_uuid: { get_resource: admin_server_2 } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id_2.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id_2.yaml deleted file mode 100644 index 935c867..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id_2.yaml +++ /dev/null @@ -1,60 +0,0 @@ -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 - - admin_volume_ids: - type: json - description: Unique IDs for volumes - - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin2_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : [admin_volume_ids, 0] }, delete_on_termination : "false" }] - flavor: { get_param: admin2_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : [admin_volume_ids, 1] }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml deleted file mode 100644 index 672abde..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml +++ /dev/null @@ -1,149 +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============================================ -# -# ---- -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 - - admin_volume_id_0: - type: string - description: reference to externally created cinder vol - - admin_volume_id_1: - type: string - description: reference to externally created cinder vol - - admin_volume_id_2: - type: string - description: reference to externally created cinder vol - - admin_volume_size_0: - type: number - description: Size of the volume to be created. - constraints: - - range: { min: 1, max: 1024 } - description: must be between 1 and 1024 Gb. - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : admin2_volume_id_0 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : admin_volume_id_1 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_2: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 2] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_3: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 3] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_resource : admin_volume_id_3 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_id_3: - type: OS::Cinder::Volume - properties: - size: { get_param: admin_volume_size_0} - availability_zone: { get_param: availability_zone_0 } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: { get_param: admin_volume_id_2 } - mountpoint: /dev/vdb - instance_uuid: { get_resource: admin_server_2 } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param_2.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param_2.yaml deleted file mode 100644 index 05b760c..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param_2.yaml +++ /dev/null @@ -1,61 +0,0 @@ -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 - - admin_volume_ids: - type: json - description: Unique IDs for volumes - - - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : [admin2_volume_ids, 0] }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : [admin_volume_ids, 1] }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_resource.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_resource.yaml deleted file mode 100644 index df83d7c..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_resource.yaml +++ /dev/null @@ -1,149 +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============================================ -# -# ---- -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 - - admin_volume_id_0: - type: string - description: reference to externally created cinder vol - - admin_volume_id_1: - type: string - description: reference to externally created cinder vol - - admin_volume_id_2: - type: string - description: reference to externally created cinder vol - - admin_volume_size_0: - type: number - description: Size of the volume to be created. - constraints: - - range: { min: 1, max: 1024 } - description: must be between 1 and 1024 Gb. - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : admin_volume_id_0 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : admin_volume_id_1 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_2: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 2] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_3: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 3] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_resource : admin2_volume_id_3 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_id_3: - type: OS::Cinder::Volume - properties: - size: { get_param: admin_volume_size_0} - availability_zone: { get_param: availability_zone_0 } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: { get_param: admin_volume_id_2 } - mountpoint: /dev/vdb - instance_uuid: { get_resource: admin_server_2 } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment.yaml deleted file mode 100644 index d971b1c..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment.yaml +++ /dev/null @@ -1,149 +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============================================ -# -# ---- -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 - - admin_volume_id_0: - type: string - description: reference to externally created cinder vol - - admin_volume_id_1: - type: string - description: reference to externally created cinder vol - - admin_volume_id_2: - type: string - description: reference to externally created cinder vol - - admin_volume_size_0: - type: number - description: Size of the volume to be created. - constraints: - - range: { min: 1, max: 1024 } - description: must be between 1 and 1024 Gb. - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : admin_volume_id_0 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : admin_volume_id_1 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_2: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 2] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_3: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 3] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_resource : admin_volume_id_3 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_id_3: - type: OS::Cinder::Volume - properties: - size: { get_param: admin_volume_size_0} - availability_zone: { get_param: availability_zone_0 } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: { get_param: admin2_volume_id_2 } - mountpoint: /dev/vdb - instance_uuid: { get_resource: admin_server_2 } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_2.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_2.yaml deleted file mode 100644 index 673a8db..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_2.yaml +++ /dev/null @@ -1,70 +0,0 @@ -heat_template_version: 2015-04-30 - -description: Heat template using json string for volumes - -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 - - admin_volume_ids: - type: json - description: Unique IDs for volumes - - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - 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} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: {get_param: [admin_volume_ids, 0]} - instance_uuid: {get_resource: admin_server_0} - - admin_volume_attachment_1: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: {get_param: [admin2_volume_ids, 1]} - instance_uuid: {get_resource: admin_server_1} diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml deleted file mode 100644 index b24e446..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml +++ /dev/null @@ -1,149 +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============================================ -# -# ---- -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 - - admin_volume_id_0: - type: string - description: reference to externally created cinder vol - - admin_volume_id_1: - type: string - description: reference to externally created cinder vol - - admin_volume_id_2: - type: string - description: reference to externally created cinder vol - - admin_volume_size_0: - type: number - description: Size of the volume to be created. - constraints: - - range: { min: 1, max: 1024 } - description: must be between 1 and 1024 Gb. - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : admin_volume_id_0 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : admin_volume_id_1 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_2: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 2] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_3: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 3] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_resource : admin_volume_id_3 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_id_3: - type: OS::Cinder::Volume - properties: - size: { get_param: admin_volume_size_0} - availability_zone: { get_param: availability_zone_0 } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: { get_param: admin2_volume_id_2 } - mountpoint: /dev/vdb - instance_uuid: { get_resource: ADMIN_SERVER_2 } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml deleted file mode 100644 index 5e47d56..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml +++ /dev/null @@ -1,149 +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============================================ -# -# ---- -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 - - admin_volume_id_0: - type: string - description: reference to externally created cinder vol - - admin_volume_id_1: - type: string - description: reference to externally created cinder vol - - admin_volume_id_2: - type: string - description: reference to externally created cinder vol - - admin_volume_size_0: - type: number - description: Size of the volume to be created. - constraints: - - range: { min: 1, max: 1024 } - description: must be between 1 and 1024 Gb. - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : admin_volume_id_0 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : admin_volume_id_1 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - ADMIN_SERVER_2: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 2] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_3: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 3] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_resource : admin_volume_id_3 }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_id_3: - type: OS::Cinder::Volume - properties: - size: { get_param: admin_volume_size_0} - availability_zone: { get_param: availability_zone_0 } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: { get_param: admin_volume_id_2 } - mountpoint: /dev/vdb - instance_uuid: { get_resource: ADMIN_SERVER_2 } diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template_2.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template_2.yaml deleted file mode 100644 index d1ca7d5..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template_2.yaml +++ /dev/null @@ -1,70 +0,0 @@ -heat_template_version: 2015-04-30 - -description: Heat template using json string for volumes - -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 - - admin_volume_ids: - type: json - description: Unique IDs for volumes - - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - 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} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_volume_attachment_0: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: {get_param: [admin_volume_ids, 0]} - instance_uuid: {get_resource: admin_server_0} - - admin_volume_attachment_1: - type: OS::Cinder::VolumeAttachment - properties: - volume_id: {get_param: [admin_volume_ids, 1]} - instance_uuid: {get_resource: admin_server_1} diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template_3.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template_3.yaml deleted file mode 100644 index c6d9d87..0000000 --- a/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template_3.yaml +++ /dev/null @@ -1,59 +0,0 @@ -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 - - admin_volume_ids: - type: json - description: Unique IDs for volumes - -resources: - - admin_server_0: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 0] } - block_device_mapping: [{ device_name: "vda", volume_id: { get_param : [admin_volume_ids, 0] }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } - - admin_server_1: - type: OS::Nova::Server - properties: - availability_zone: { get_param: availability_zone_0 } - name: { get_param: [admin_names, 1] } - block_device_mapping: [{ device_name: "vda", volume_id : { get_param : [admin_volume_ids, 1] }, delete_on_termination : "false" }] - flavor: { get_param: admin_flavor_name} - metadata: - vnf_name: { get_param: vnf_name } - vnf_id: { get_param: vnf_id } - vf_module_id: { get_param: vf_module_id } -- cgit 1.2.3-korg