From 8540eb59f7e7f8ff2043a8eaf7edfc255a60874a Mon Sep 17 00:00:00 2001 From: "Lovett, Trevor" Date: Wed, 30 Jan 2019 16:02:17 -0600 Subject: [VVP] Removing unnecessary trademark lines Issue-ID: VVP-152 Change-Id: I6b978768324f69adba50c75a187509c4a7605341 Signed-off-by: Lovett, Trevor --- .../fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml | 3 +-- .../fail/mismatch_vm_type_volume_id_nova_server_id.yaml | 3 +-- .../fail/mismatch_vm_type_volume_id_param.yaml | 3 +-- .../fail/mismatch_vm_type_volume_id_resource.yaml | 3 +-- .../fail/mismatch_vm_type_volume_id_volume_attachment.yaml | 3 +-- .../fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml | 3 +-- .../tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) (limited to 'ice_validator/tests/fixtures/test_volume_resource_ids') 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 index d0a176d..a504cd1 100644 --- 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 @@ -35,7 +35,6 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # --- heat_template_version: 2015-04-30 @@ -147,4 +146,4 @@ resources: properties: volume_id: { get_param: admin_volume_id_2 } mountpoint: /dev/vdb - instance_uuid: { get_resource: admin2_server_2 } \ No newline at end of file + 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 index cc01ffb..a5cea0c 100644 --- 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 @@ -35,7 +35,6 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # --- heat_template_version: 2015-04-30 @@ -147,4 +146,4 @@ resources: properties: volume_id: { get_param: admin_volume_id_2 } mountpoint: /dev/vdb - instance_uuid: { get_resource: admin_server_2 } \ No newline at end of file + 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.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml index 6918125..672abde 100644 --- 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 @@ -35,7 +35,6 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # --- heat_template_version: 2015-04-30 @@ -147,4 +146,4 @@ resources: properties: volume_id: { get_param: admin_volume_id_2 } mountpoint: /dev/vdb - instance_uuid: { get_resource: admin_server_2 } \ No newline at end of file + instance_uuid: { get_resource: admin_server_2 } 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 index 4b3c40f..df83d7c 100644 --- 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 @@ -35,7 +35,6 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # --- heat_template_version: 2015-04-30 @@ -147,4 +146,4 @@ resources: properties: volume_id: { get_param: admin_volume_id_2 } mountpoint: /dev/vdb - instance_uuid: { get_resource: admin_server_2 } \ No newline at end of file + 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 index 32b53cb..d971b1c 100644 --- 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 @@ -35,7 +35,6 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # --- heat_template_version: 2015-04-30 @@ -147,4 +146,4 @@ resources: properties: volume_id: { get_param: admin2_volume_id_2 } mountpoint: /dev/vdb - instance_uuid: { get_resource: admin_server_2 } \ No newline at end of file + 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_uppercase.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml index 9a2dc98..b24e446 100644 --- 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 @@ -35,7 +35,6 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # --- heat_template_version: 2015-04-30 @@ -147,4 +146,4 @@ resources: properties: volume_id: { get_param: admin2_volume_id_2 } mountpoint: /dev/vdb - instance_uuid: { get_resource: ADMIN_SERVER_2 } \ No newline at end of file + 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 index 8b98f20..5e47d56 100644 --- 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 @@ -35,7 +35,6 @@ # # ============LICENSE_END============================================ # -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # --- heat_template_version: 2015-04-30 @@ -147,4 +146,4 @@ resources: properties: volume_id: { get_param: admin_volume_id_2 } mountpoint: /dev/vdb - instance_uuid: { get_resource: ADMIN_SERVER_2 } \ No newline at end of file + instance_uuid: { get_resource: ADMIN_SERVER_2 } -- cgit 1.2.3-korg