From b43e8ebd9f3e7436a51c2a6b9fe71f254d92b833 Mon Sep 17 00:00:00 2001 From: talio Date: Sun, 28 Jan 2018 09:47:38 +0200 Subject: change capabilities datatype change node template capabilities datatype from list of map to map Change-Id: Ie0fa71b8a41ec732ae5290a72c4d8e908701ce17 Issue-ID: SDC-968 Signed-off-by: talio --- .../openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java | 4 ---- .../nested/multiLevel/in/Nested_pd_server_2ServiceTemplate.yaml | 2 +- .../nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml | 2 +- .../nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml | 2 +- .../nested/multiLevel/out/Nested_pd_server_2ServiceTemplate.yaml | 2 +- .../nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml | 2 +- .../nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml | 2 +- .../nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml | 2 +- .../enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml | 2 +- .../nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml | 4 ++-- .../enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml | 4 ++-- .../scalingInstance/out/Nested_pd_serverServiceTemplate.yaml | 2 +- .../singleSubstitution/diffPortType/out/MainServiceTemplate.yaml | 4 ++-- .../diffPortType/out/Nested_pd_serverServiceTemplate.yaml | 2 +- .../singleSubstitution/samePortType/out/MainServiceTemplate.yaml | 4 ++-- .../samePortType/out/Nested_pd_serverServiceTemplate.yaml | 2 +- 16 files changed, 19 insertions(+), 23 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl') diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java index 4ad81210df..629868cb3a 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java @@ -257,10 +257,6 @@ public class PortMirroringEnricher { } private void addPortMirroringCapability(NodeTemplate portNodeTemplate) { - List> capabilities = portNodeTemplate.getCapabilities(); - if (Objects.isNull(capabilities)) { - capabilities = new ArrayList<>(); - } Map portMirroringCapabilityProperties = new HashMap<>(); PortMirroringConnectionPointDescription connectionPoint = new PortMirroringConnectionPointDescription(); diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_2ServiceTemplate.yaml index d6293b81af..95a17aea47 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_2ServiceTemplate.yaml @@ -121,7 +121,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nfc_type: pd_server diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml index 975b38838c..1cee498cd2 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_serverServiceTemplate.yaml @@ -123,7 +123,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml index cad189fdba..9722ffec88 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_1ServiceTemplate.yaml @@ -123,7 +123,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_2ServiceTemplate.yaml index d6293b81af..95a17aea47 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_2ServiceTemplate.yaml @@ -121,7 +121,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nfc_type: pd_server diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml index 4aae018766..4d98183c51 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_3ServiceTemplate.yaml @@ -123,7 +123,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml index 2fe496ea2d..44f068ba31 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_4ServiceTemplate.yaml @@ -123,7 +123,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml index 9a3f9aff3c..4750ccc1f2 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/out/Nested_pd_server_6ServiceTemplate.yaml @@ -123,7 +123,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml index 00091c6b44..8841a6d74b 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/MainServiceTemplate.yaml @@ -215,7 +215,7 @@ topology_template: mac_count_required: is_required: false capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml index ac6f6704ee..5c6f4aee86 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -255,7 +255,7 @@ topology_template: network: get_input: oam_net_name capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' @@ -324,7 +324,7 @@ topology_template: node: server_pcm relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml index 16223e48e3..45ebd436d0 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/MainServiceTemplate.yaml @@ -135,7 +135,7 @@ topology_template: mac_count_required: is_required: false capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' @@ -156,7 +156,7 @@ topology_template: mac_count_required: is_required: false capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/Nested_pd_serverServiceTemplate.yaml index 24fb1715bf..0f80630051 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/scalingInstance/out/Nested_pd_serverServiceTemplate.yaml @@ -193,7 +193,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/MainServiceTemplate.yaml index 4b935307f5..8fd8b17b55 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/MainServiceTemplate.yaml @@ -277,7 +277,7 @@ topology_template: mac_count_required: is_required: false capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' @@ -287,7 +287,7 @@ topology_template: template_VMInt_OAM_lb_external_VMI: type: org.openecomp.resource.cp.v2.extContrailCP capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/Nested_pd_serverServiceTemplate.yaml index 2a20dac284..1c327d212e 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/diffPortType/out/Nested_pd_serverServiceTemplate.yaml @@ -383,7 +383,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/MainServiceTemplate.yaml index 2a4b89cb04..8a030f4628 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/MainServiceTemplate.yaml @@ -266,7 +266,7 @@ topology_template: template_VMInt_OAM_lb_external_VMI: type: org.openecomp.resource.cp.v2.extContrailCP capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' @@ -306,7 +306,7 @@ topology_template: mac_count_required: is_required: false capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/Nested_pd_serverServiceTemplate.yaml index c7202c3ac0..4cd5cd0894 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/singleSubstitution/samePortType/out/Nested_pd_serverServiceTemplate.yaml @@ -267,7 +267,7 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo capabilities: - - port_mirroring: + port_mirroring: properties: connection_point: nf_type: '' -- cgit 1.2.3-korg