From c1443c45c8d0f8d033c1074b2df32a0d31753dcb Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Tue, 6 Mar 2018 14:52:44 +0530 Subject: Fixed issue in Port mirroring Issue fixing for the Port mirroring story to support new global type Change-Id: I61a9105e349b6ac164239d5ee9ef87a472ff3d6b Issue-ID: SDC-1069 Signed-off-by: siddharth0905 --- .../impl/tosca/PortMirroringEnricher.java | 4 +-- .../in/Nested_pd_serverServiceTemplate.yaml | 16 +++++------ .../in/Nested_pd_server_1ServiceTemplate.yaml | 16 +++++------ .../in/Nested_pd_server_3ServiceTemplate.yaml | 16 +++++------ .../in/Nested_pd_server_6ServiceTemplate.yaml | 16 +++++------ .../out/Nested_pd_serverServiceTemplate.yaml | 32 ++++++++++++++++------ .../out/Nested_pd_server_1ServiceTemplate.yaml | 32 ++++++++++++++++------ .../out/Nested_pd_server_3ServiceTemplate.yaml | 32 ++++++++++++++++------ .../out/Nested_pd_server_4ServiceTemplate.yaml | 16 ++++++++++- .../out/Nested_pd_server_6ServiceTemplate.yaml | 32 ++++++++++++++++------ .../out/Nested_computeServiceTemplate.yaml | 16 +---------- 11 files changed, 142 insertions(+), 86 deletions(-) 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 eddbec3116..9acf80d22c 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 @@ -108,7 +108,7 @@ public class PortMirroringEnricher { if (isSubstitutableNodeTemplate(nodeTemplate)) { List> requirements = nodeTemplate.getRequirements(); if (Objects.isNull(requirements)) { - return; + continue; } requirements.forEach(requirement -> addInternalPortToAbstractNode(requirement, @@ -200,7 +200,7 @@ public class PortMirroringEnricher { toscaServiceModel.getServiceTemplates().get(serviceTemplateName); Map externalNodeTemplates = entry.getValue(); if (MapUtils.isEmpty(externalNodeTemplates)) { - return; + continue; } for (Map.Entry externalNodeTemplate : externalNodeTemplates diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_serverServiceTemplate.yaml index 796b811eb4..c6cd8e2486 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_serverServiceTemplate.yaml @@ -95,22 +95,22 @@ topology_template: pd_server_pd02_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + get_input: port_pd02_port_ip_requirements + network_role: + get_input: port_pd02_port_network_role + subnetpoolid: + get_input: port_pd02_port_subnetpoolid + mac_requirements: + get_input: port_pd02_port_mac_requirements exCP_naming: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - ip_requirements: - get_input: port_pd02_port_ip_requirements network_role_tag: get_input: port_pd02_port_network_role_tag - mac_requirements: - get_input: port_pd02_port_mac_requirements order: get_input: port_pd02_port_order - network_role: - get_input: port_pd02_port_network_role - subnetpoolid: - get_input: port_pd02_port_subnetpoolid network: get_input: - port_pd02_port_network 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_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_1ServiceTemplate.yaml index a6d8533b57..214f8ffad0 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_1ServiceTemplate.yaml @@ -95,22 +95,22 @@ topology_template: pd_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + get_input: port_pd01_port_ip_requirements + network_role: + get_input: port_pd01_port_network_role + subnetpoolid: + get_input: port_pd01_port_subnetpoolid + mac_requirements: + get_input: port_pd01_port_mac_requirements exCP_naming: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements - ip_requirements: - get_input: port_pd01_port_ip_requirements network_role_tag: get_input: port_pd01_port_network_role_tag - mac_requirements: - get_input: port_pd01_port_mac_requirements order: get_input: port_pd01_port_order - network_role: - get_input: port_pd01_port_network_role - subnetpoolid: - get_input: port_pd01_port_subnetpoolid network: get_input: - port_pd01_port_network 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_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_3ServiceTemplate.yaml index 9f140e097e..aad19ab0c1 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_3ServiceTemplate.yaml @@ -95,22 +95,22 @@ topology_template: pd_server_pd01_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + get_input: port_pd01_port_ip_requirements + network_role: + get_input: port_pd01_port_network_role + subnetpoolid: + get_input: port_pd01_port_subnetpoolid + mac_requirements: + get_input: port_pd01_port_mac_requirements exCP_naming: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements - ip_requirements: - get_input: port_pd01_port_ip_requirements network_role_tag: get_input: port_pd01_port_network_role_tag - mac_requirements: - get_input: port_pd01_port_mac_requirements order: get_input: port_pd01_port_order - network_role: - get_input: port_pd01_port_network_role - subnetpoolid: - get_input: port_pd01_port_subnetpoolid network: get_input: - port_pd01_port_network 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_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_6ServiceTemplate.yaml index 653d1b6454..1866df2f5b 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_6ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/multiLevel/in/Nested_pd_server_6ServiceTemplate.yaml @@ -95,22 +95,22 @@ topology_template: pd_server_pd02_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + ip_requirements: + get_input: port_pd02_port_ip_requirements + network_role: + get_input: port_pd02_port_network_role + subnetpoolid: + get_input: port_pd02_port_subnetpoolid + mac_requirements: + get_input: port_pd02_port_mac_requirements exCP_naming: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - ip_requirements: - get_input: port_pd02_port_ip_requirements network_role_tag: get_input: port_pd02_port_network_role_tag - mac_requirements: - get_input: port_pd02_port_mac_requirements order: get_input: port_pd02_port_order - network_role: - get_input: port_pd02_port_network_role - subnetpoolid: - get_input: port_pd02_port_subnetpoolid network: get_input: - port_pd02_port_network 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 796b811eb4..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 @@ -6,6 +6,8 @@ imports: file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml +- openecomp_index: + file: openecomp/_index.yml node_types: org.openecomp.resource.vfc.nodes.heat.pd_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -93,24 +95,24 @@ topology_template: - compute_pd_server_user_data_format - index_value pd_server_pd02_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + type: org.openecomp.resource.cp.v2.extNeutronCP properties: + ip_requirements: + get_input: port_pd02_port_ip_requirements + network_role: + get_input: port_pd02_port_network_role + subnetpoolid: + get_input: port_pd02_port_subnetpoolid + mac_requirements: + get_input: port_pd02_port_mac_requirements exCP_naming: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - ip_requirements: - get_input: port_pd02_port_ip_requirements network_role_tag: get_input: port_pd02_port_network_role_tag - mac_requirements: - get_input: port_pd02_port_mac_requirements order: get_input: port_pd02_port_order - network_role: - get_input: port_pd02_port_network_role - subnetpoolid: - get_input: port_pd02_port_subnetpoolid network: get_input: - port_pd02_port_network @@ -120,6 +122,15 @@ topology_template: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + capabilities: + port_mirroring: + properties: + connection_point: + nf_type: '' + nfc_type: pd_server + network_role: + get_input: port_pd02_port_network_role + pps_capacity: '' substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -279,6 +290,9 @@ topology_template: network.incoming.bytes_pd_server_pd02_port: - pd_server_pd02_port - network.incoming.bytes + port_mirroring_pd_server_pd02_port: + - pd_server_pd02_port + - port_mirroring requirements: local_storage_pd_server: - 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_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 a6d8533b57..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 @@ -6,6 +6,8 @@ imports: file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml +- openecomp_index: + file: openecomp/_index.yml node_types: org.openecomp.resource.vfc.nodes.heat.pd_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -93,24 +95,24 @@ topology_template: - compute_pd_server_user_data_format - index_value pd_server_pd01_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + type: org.openecomp.resource.cp.v2.extNeutronCP properties: + ip_requirements: + get_input: port_pd01_port_ip_requirements + network_role: + get_input: port_pd01_port_network_role + subnetpoolid: + get_input: port_pd01_port_subnetpoolid + mac_requirements: + get_input: port_pd01_port_mac_requirements exCP_naming: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements - ip_requirements: - get_input: port_pd01_port_ip_requirements network_role_tag: get_input: port_pd01_port_network_role_tag - mac_requirements: - get_input: port_pd01_port_mac_requirements order: get_input: port_pd01_port_order - network_role: - get_input: port_pd01_port_network_role - subnetpoolid: - get_input: port_pd01_port_subnetpoolid network: get_input: - port_pd01_port_network @@ -120,6 +122,15 @@ topology_template: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + capabilities: + port_mirroring: + properties: + connection_point: + nf_type: '' + nfc_type: pd_server + network_role: + get_input: port_pd01_port_network_role + pps_capacity: '' substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1 capabilities: @@ -279,6 +290,9 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + port_mirroring_pd_server_pd01_port: + - pd_server_pd01_port + - port_mirroring requirements: local_storage_pd_server: - 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 9f140e097e..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 @@ -6,6 +6,8 @@ imports: file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml +- openecomp_index: + file: openecomp/_index.yml node_types: org.openecomp.resource.vfc.nodes.heat.pd_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -93,24 +95,24 @@ topology_template: - compute_pd_server_user_data_format - index_value pd_server_pd01_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + type: org.openecomp.resource.cp.v2.extNeutronCP properties: + ip_requirements: + get_input: port_pd01_port_ip_requirements + network_role: + get_input: port_pd01_port_network_role + subnetpoolid: + get_input: port_pd01_port_subnetpoolid + mac_requirements: + get_input: port_pd01_port_mac_requirements exCP_naming: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements - ip_requirements: - get_input: port_pd01_port_ip_requirements network_role_tag: get_input: port_pd01_port_network_role_tag - mac_requirements: - get_input: port_pd01_port_mac_requirements order: get_input: port_pd01_port_order - network_role: - get_input: port_pd01_port_network_role - subnetpoolid: - get_input: port_pd01_port_subnetpoolid network: get_input: - port_pd01_port_network @@ -120,6 +122,15 @@ topology_template: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + capabilities: + port_mirroring: + properties: + connection_point: + nf_type: '' + nfc_type: pd_server + network_role: + get_input: port_pd01_port_network_role + pps_capacity: '' substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_3 capabilities: @@ -279,6 +290,9 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + port_mirroring_pd_server_pd01_port: + - pd_server_pd01_port + - port_mirroring requirements: local_storage_pd_server: - 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_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 0022b21c24..23c111c687 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 @@ -6,6 +6,8 @@ imports: file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml +- openecomp_index: + file: openecomp/_index.yml node_types: org.openecomp.resource.vfc.nodes.heat.pd_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -93,7 +95,7 @@ topology_template: - compute_pd_server_user_data_format - index_value pd_server_ps02_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + type: org.openecomp.resource.cp.v2.extNeutronCP properties: exCP_naming: get_input: port_ps02_port_exCP_naming @@ -120,6 +122,15 @@ topology_template: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + capabilities: + port_mirroring: + properties: + connection_point: + nf_type: '' + nfc_type: pd_server + network_role: + get_input: port_ps02_port_network_role + pps_capacity: '' substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_4 capabilities: @@ -279,6 +290,9 @@ topology_template: disk.device.iops_pd_server: - pd_server - disk.device.iops + port_mirroring_pd_server_ps02_port: + - pd_server_ps02_port + - port_mirroring requirements: local_storage_pd_server: - 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_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 653d1b6454..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 @@ -6,6 +6,8 @@ imports: file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml +- openecomp_index: + file: openecomp/_index.yml node_types: org.openecomp.resource.vfc.nodes.heat.pd_server: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -93,24 +95,24 @@ topology_template: - compute_pd_server_user_data_format - index_value pd_server_pd02_port: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + type: org.openecomp.resource.cp.v2.extNeutronCP properties: + ip_requirements: + get_input: port_pd02_port_ip_requirements + network_role: + get_input: port_pd02_port_network_role + subnetpoolid: + get_input: port_pd02_port_subnetpoolid + mac_requirements: + get_input: port_pd02_port_mac_requirements exCP_naming: get_input: port_pd02_port_exCP_naming vlan_requirements: get_input: port_pd02_port_vlan_requirements - ip_requirements: - get_input: port_pd02_port_ip_requirements network_role_tag: get_input: port_pd02_port_network_role_tag - mac_requirements: - get_input: port_pd02_port_mac_requirements order: get_input: port_pd02_port_order - network_role: - get_input: port_pd02_port_network_role - subnetpoolid: - get_input: port_pd02_port_subnetpoolid network: get_input: - port_pd02_port_network @@ -120,6 +122,15 @@ topology_template: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + capabilities: + port_mirroring: + properties: + connection_point: + nf_type: '' + nfc_type: pd_server + network_role: + get_input: port_pd02_port_network_role + pps_capacity: '' substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_6 capabilities: @@ -279,6 +290,9 @@ topology_template: network.incoming.bytes_pd_server_pd02_port: - pd_server_pd02_port - network.incoming.bytes + port_mirroring_pd_server_pd02_port: + - pd_server_pd02_port + - port_mirroring requirements: local_storage_pd_server: - pd_server diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/Nested_computeServiceTemplate.yaml index 65e0231a73..7a9311c041 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/resources/mock/enrichPortMirroring/nested/oneLevel/out/Nested_computeServiceTemplate.yaml @@ -6,8 +6,6 @@ imports: file: openecomp-heat/_index.yml - GlobalSubstitutionTypes: file: GlobalSubstitutionTypesServiceTemplate.yaml -- openecomp_index: - file: openecomp/_index.yml node_types: org.openecomp.resource.vfc.nodes.heat.compute: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server @@ -113,7 +111,7 @@ topology_template: - compute_compute_user_data_format - index_value compute_compute_port: - type: org.openecomp.resource.cp.v2.extNeutronCP + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: get_input: port_compute_port_exCP_naming @@ -140,15 +138,6 @@ topology_template: capability: tosca.capabilities.network.Bindable node: compute relationship: tosca.relationships.network.BindsTo - capabilities: - port_mirroring: - properties: - connection_point: - nf_type: '' - nfc_type: compute - network_role: - get_input: port_compute_port_network_role - pps_capacity: '' substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.compute capabilities: @@ -308,9 +297,6 @@ topology_template: disk.device.allocation_compute: - compute - disk.device.allocation - port_mirroring_compute_compute_port: - - compute_compute_port - - port_mirroring requirements: local_storage_compute: - compute -- cgit 1.2.3-korg