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 --- .../test_base_template_outputs_consumed/fail/base_template.yaml | 3 +-- .../fail/module_1_template_missing_output_consumption.yaml | 3 +-- .../fail/module_2_child_1_template.yaml | 3 +-- .../fail/module_2_template_missing_output_consumption.yaml | 3 +-- .../test_base_template_outputs_consumed/pass/base_template.yaml | 3 +-- .../test_base_template_outputs_consumed/pass/module_1_template.yaml | 3 +-- .../pass/module_2_child_1_template.yaml | 3 +-- .../test_base_template_outputs_consumed/pass/module_2_template.yaml | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) (limited to 'ice_validator/tests/fixtures/test_base_template_outputs_consumed') diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/base_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/base_template.yaml index 939eebe..155a365 100644 --- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/base_template.yaml +++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/base_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 @@ -97,4 +96,4 @@ outputs: value: {get_attr: [admin_server, networks, { get_param: oam_net_id }, 0] } oam_management_v6_address: - value: {get_attr: [admin_server, networks, { get_param: oam_net_id }, 0] } \ No newline at end of file + value: {get_attr: [admin_server, networks, { get_param: oam_net_id }, 0] } diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_1_template_missing_output_consumption.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_1_template_missing_output_consumption.yaml index c9ff048..3e9910e 100644 --- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_1_template_missing_output_consumption.yaml +++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_1_template_missing_output_consumption.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 @@ -85,4 +84,4 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } networks: - - network: { get_param: oam_net_id } \ No newline at end of file + - network: { get_param: oam_net_id } diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_child_1_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_child_1_template.yaml index af26b98..3aa50c8 100644 --- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_child_1_template.yaml +++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_child_1_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 @@ -85,4 +84,4 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } networks: - - network: { get_param: oam_net_id } \ No newline at end of file + - network: { get_param: oam_net_id } diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_template_missing_output_consumption.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_template_missing_output_consumption.yaml index 753dbb9..2d317c8 100644 --- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_template_missing_output_consumption.yaml +++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_template_missing_output_consumption.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 @@ -88,4 +87,4 @@ resources: - network: { get_param: oam_net_id } admin_server_3: - type: module_2_child_1_template.yaml \ No newline at end of file + type: module_2_child_1_template.yaml diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/base_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/base_template.yaml index 939eebe..155a365 100644 --- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/base_template.yaml +++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/base_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 @@ -97,4 +96,4 @@ outputs: value: {get_attr: [admin_server, networks, { get_param: oam_net_id }, 0] } oam_management_v6_address: - value: {get_attr: [admin_server, networks, { get_param: oam_net_id }, 0] } \ No newline at end of file + value: {get_attr: [admin_server, networks, { get_param: oam_net_id }, 0] } diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_1_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_1_template.yaml index c9ff048..3e9910e 100644 --- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_1_template.yaml +++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_1_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 @@ -85,4 +84,4 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } networks: - - network: { get_param: oam_net_id } \ No newline at end of file + - network: { get_param: oam_net_id } diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_child_1_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_child_1_template.yaml index af26b98..3aa50c8 100644 --- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_child_1_template.yaml +++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_child_1_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 @@ -85,4 +84,4 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } networks: - - network: { get_param: oam_net_id } \ No newline at end of file + - network: { get_param: oam_net_id } diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_template.yaml index 473759a..0d69cdf 100644 --- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_template.yaml +++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_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 @@ -92,4 +91,4 @@ resources: - network: { get_param: oam_net_id } admin_server_3: - type: module_2_child_1_template.yaml \ No newline at end of file + type: module_2_child_1_template.yaml -- cgit 1.2.3-korg