diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource')
10 files changed, 718 insertions, 718 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml index 758276fe18..1782edf72a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_QRouterTemplate.yaml @@ -74,7 +74,7 @@ resources: metadata: cdr_network_ip_0: get_attr: - - cdr_network_port + - cdr_network_port_1 - fixed_ip_0s - 0 - ip_address @@ -121,7 +121,7 @@ resources: - port: get_resource: oam_private_net_network_port - port: - get_resource: cdr_network_port + get_resource: cdr_network_port_1 personality: /root/CheckAvailability/check_availability.py: get_file: check_availability.py @@ -152,7 +152,7 @@ resources: get_file: FEAdd_On_Module_QRouterCloudConfig user_data_format: RAW type: OS::Nova::Server - cdr_network_port: + cdr_network_port_1: properties: network: get_param: cdr_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml index 80a65d17fc..4c7f0f2e44 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBAgentTemplate.yaml @@ -72,7 +72,7 @@ parameters: vnf_id: type: string resources: - oam_private_net_network_port: + oam_private_net_network_port_3: properties: network: get_param: oam_private_net_name @@ -86,7 +86,7 @@ resources: security_groups: - get_param: security_group type: OS::Neutron::Port - packet_mirror_network_port: + packet_mirror_network_port_1: properties: network: get_param: packet_mirror_network @@ -123,13 +123,13 @@ resources: get_param: ntp_timezone oam_private_network_cidr: get_attr: - - oam_private_net_network_port + - oam_private_net_network_port_3 - subnets - 0 - cidr oam_private_network_ip_0: get_attr: - - oam_private_net_network_port + - oam_private_net_network_port_3 - fixed_ip_0s - 0 - ip_address @@ -147,13 +147,13 @@ resources: - ip_address packet_mirror_network_cidr: get_attr: - - packet_mirror_network_port + - packet_mirror_network_port_1 - subnets - 0 - cidr packet_mirror_network_ip_0: get_attr: - - packet_mirror_network_port + - packet_mirror_network_port_1 - fixed_ip_0s - 0 - ip_address @@ -193,9 +193,9 @@ resources: - get_param: vLBAgent_index networks: - port: - get_resource: oam_private_net_network_port + get_resource: oam_private_net_network_port_3 - port: - get_resource: packet_mirror_network_port + get_resource: packet_mirror_network_port_1 - port: get_resource: packet_internal_network_port personality: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml index afc435adaf..ad3a156bbf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vLBTemplate.yaml @@ -68,14 +68,14 @@ parameters: vnf_id: type: string resources: - oam_private_net_network_port: + oam_private_net_network_port_2: properties: network: get_param: oam_private_net_name security_groups: - get_param: security_group type: OS::Neutron::Port - packet_internal_network_port: + packet_internal_network_port_2: properties: network: get_param: packet_internal_network @@ -119,25 +119,25 @@ resources: get_param: ntp_timezone oam_private_network_cidr: get_attr: - - oam_private_net_network_port + - oam_private_net_network_port_2 - subnets - 0 - cidr oam_private_network_ip_0: get_attr: - - oam_private_net_network_port + - oam_private_net_network_port_2 - fixed_ip_0s - 0 - ip_address packet_internal_network_cidr: get_attr: - - packet_internal_network_port + - packet_internal_network_port_2 - subnets - 0 - cidr packet_internal_network_ip_0: get_attr: - - packet_internal_network_port + - packet_internal_network_port_2 - fixed_ip_0s - 0 - ip_address @@ -187,11 +187,11 @@ resources: - get_param: vLB_index networks: - port: - get_resource: oam_private_net_network_port + get_resource: oam_private_net_network_port_2 - port: get_resource: packet_mirror_network_port - port: - get_resource: packet_internal_network_port + get_resource: packet_internal_network_port_2 personality: /root/CheckAvailability/check_availability.py: get_file: check_availability.py diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml index d343ee5595..e294a34d3a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEAdd_On_Module_vProbeTemplate.yaml @@ -122,25 +122,25 @@ resources: get_param: ntp_timezone oam_private_network_cidr: get_attr: - - oam_private_net_network_port + - oam_private_net_network_port_1 - subnets - 0 - cidr oam_private_network_ip_0: get_attr: - - oam_private_net_network_port + - oam_private_net_network_port_1 - fixed_ip_0s - 0 - ip_address packet_internal_network_cidr: get_attr: - - packet_internal_network_port + - packet_internal_network_port_1 - subnets - 0 - cidr packet_internal_network_ip_0: get_attr: - - packet_internal_network_port + - packet_internal_network_port_1 - fixed_ip_0s - 0 - ip_address @@ -177,11 +177,11 @@ resources: - get_param: vprobe_index networks: - port: - get_resource: oam_private_net_network_port + get_resource: oam_private_net_network_port_1 - port: get_resource: cdr_network_port - port: - get_resource: packet_internal_network_port + get_resource: packet_internal_network_port_1 personality: /root/CheckAvailability/check_availability.py: get_file: check_availability.py @@ -239,14 +239,14 @@ resources: security_groups: - get_param: security_group type: OS::Neutron::Port - oam_private_net_network_port: + oam_private_net_network_port_1: properties: network: get_param: oam_private_net_name security_groups: - get_param: security_group type: OS::Neutron::Port - packet_internal_network_port: + packet_internal_network_port_1: properties: network: get_param: packet_internal_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml index ca861cbfc0..9ca9550e5a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml @@ -134,23 +134,7 @@ topology_template: immutable: false type: string node_templates: - qrouter_volume_1: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: qrouter_volume_type_1 - size: '(get_input : qrouter_volume_size_1) * 1024' - description: - get_input: qrouter_volume_name_1 - qrouter_volume_0: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: qrouter_volume_type_0 - size: '(get_input : qrouter_volume_size_0) * 1024' - description: - get_input: qrouter_volume_name_0 - cdr_network_port: + cdr_network_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -171,6 +155,22 @@ topology_template: capability: tosca.capabilities.network.Bindable node: QRouter1 relationship: tosca.relationships.network.BindsTo + qrouter_volume_1: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: qrouter_volume_type_1 + size: '(get_input : qrouter_volume_size_1) * 1024' + description: + get_input: qrouter_volume_name_1 + qrouter_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: qrouter_volume_type_0 + size: '(get_input : qrouter_volume_size_0) * 1024' + description: + get_input: qrouter_volume_name_0 qrouter_volume_2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -195,7 +195,7 @@ topology_template: cluster_name: get_input: qrouter_cluster_name cdr_network_ip_0: - - UNSUPPORTED_ATTRIBUTE_cdr_network_port.fixed_ip_0s + - UNSUPPORTED_ATTRIBUTE_cdr_network_port_1.fixed_ip_0s repo_ip_0: get_input: rpmrepository_ip_0 mount_colon__slash_data: qrouter_volume_0 @@ -319,18 +319,15 @@ topology_template: properties: heat_file: ../Artifacts/FEAdd_On_Module_QRouterTemplate.yaml members: + - cdr_network_port_1 - qrouter_volume_1 - qrouter_volume_0 - - cdr_network_port - qrouter_volume_2 - QRouter1 - oam_private_net_network_port substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_QRouterTemplate capabilities: - network.outgoing.bytes_cdr_network_port: - - cdr_network_port - - network.outgoing.bytes binding_QRouter1: - QRouter1 - binding @@ -358,12 +355,6 @@ topology_template: attachment_qrouter_volume_1: - qrouter_volume_1 - attachment - attachment_cdr_network_port: - - cdr_network_port - - attachment - network.incoming.packets_cdr_network_port: - - cdr_network_port - - network.incoming.packets disk.device.read.bytes.rate_QRouter1: - QRouter1 - disk.device.read.bytes.rate @@ -376,9 +367,6 @@ topology_template: network.outpoing.packets_oam_private_net_network_port: - oam_private_net_network_port - network.outpoing.packets - network.outpoing.packets_cdr_network_port: - - cdr_network_port - - network.outpoing.packets memory.resident_QRouter1: - QRouter1 - memory.resident @@ -388,18 +376,15 @@ topology_template: host_QRouter1: - QRouter1 - host - feature_cdr_network_port: - - cdr_network_port - - feature disk.device.write.bytes.rate_QRouter1: - QRouter1 - disk.device.write.bytes.rate disk.device.usage_QRouter1: - QRouter1 - disk.device.usage - network.incoming.bytes_cdr_network_port: - - cdr_network_port - - network.incoming.bytes + feature_cdr_network_port_1: + - cdr_network_port_1 + - feature instance_QRouter1: - QRouter1 - instance @@ -445,42 +430,51 @@ topology_template: disk.device.capacity_QRouter1: - QRouter1 - disk.device.capacity - network.incoming.bytes.rate_cdr_network_port: - - cdr_network_port - - network.incoming.bytes.rate network.outgoing.bytes_oam_private_net_network_port: - oam_private_net_network_port - network.outgoing.bytes + network.incoming.packets.rate_cdr_network_port_1: + - cdr_network_port_1 + - network.incoming.packets.rate disk.iops_QRouter1: - QRouter1 - disk.iops disk.device.write.requests_QRouter1: - QRouter1 - disk.device.write.requests + network.incoming.packets_cdr_network_port_1: + - cdr_network_port_1 + - network.incoming.packets + attachment_cdr_network_port_1: + - cdr_network_port_1 + - attachment disk.device.write.requests.rate_QRouter1: - QRouter1 - disk.device.write.requests.rate disk.device.allocation_QRouter1: - QRouter1 - disk.device.allocation + network.outpoing.packets_cdr_network_port_1: + - cdr_network_port_1 + - network.outpoing.packets memory_QRouter1: - QRouter1 - memory disk.usage_QRouter1: - QRouter1 - disk.usage + binding_cdr_network_port_1: + - cdr_network_port_1 + - binding scalable_QRouter1: - QRouter1 - scalable - network.outgoing.bytes.rate_cdr_network_port: - - cdr_network_port - - network.outgoing.bytes.rate binding_oam_private_net_network_port: - oam_private_net_network_port - binding - network.incoming.packets.rate_cdr_network_port: - - cdr_network_port - - network.incoming.packets.rate + network.incoming.bytes_cdr_network_port_1: + - cdr_network_port_1 + - network.incoming.bytes disk.write.bytes_QRouter1: - QRouter1 - disk.write.bytes @@ -493,6 +487,9 @@ topology_template: cpu_QRouter1: - QRouter1 - cpu + network.outgoing.bytes.rate_cdr_network_port_1: + - cdr_network_port_1 + - network.outgoing.bytes.rate os_QRouter1: - QRouter1 - os @@ -505,18 +502,18 @@ topology_template: disk.read.bytes_QRouter1: - QRouter1 - disk.read.bytes - binding_cdr_network_port: - - cdr_network_port - - binding + network.incoming.bytes.rate_cdr_network_port_1: + - cdr_network_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes_cdr_network_port_1: + - cdr_network_port_1 + - network.outgoing.bytes disk.write.bytes.rate_QRouter1: - QRouter1 - disk.write.bytes.rate disk.device.write.bytes_QRouter1: - QRouter1 - disk.device.write.bytes - network.outgoing.packets.rate_cdr_network_port: - - cdr_network_port - - network.outgoing.packets.rate disk.device.iops_QRouter1: - QRouter1 - disk.device.iops @@ -529,6 +526,9 @@ topology_template: disk.allocation_QRouter1: - QRouter1 - disk.allocation + network.outgoing.packets.rate_cdr_network_port_1: + - cdr_network_port_1 + - network.outgoing.packets.rate disk.device.read.requests_QRouter1: - QRouter1 - disk.device.read.requests @@ -539,6 +539,9 @@ topology_template: local_storage_QRouter1: - QRouter1 - local_storage + link_cdr_network_port_1: + - cdr_network_port_1 + - link dependency_qrouter_volume_1: - qrouter_volume_1 - dependency @@ -548,18 +551,15 @@ topology_template: dependency_qrouter_volume_0: - qrouter_volume_0 - dependency - dependency_cdr_network_port: - - cdr_network_port - - dependency link_oam_private_net_network_port: - oam_private_net_network_port - link dependency_qrouter_volume_2: - qrouter_volume_2 - dependency - link_cdr_network_port: - - cdr_network_port - - link dependency_QRouter1: - QRouter1 + - dependency + dependency_cdr_network_port_1: + - cdr_network_port_1 - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml index d31b276241..5d0b6433cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml @@ -154,7 +154,7 @@ topology_template: immutable: false type: string node_templates: - packet_mirror_network_port: + packet_mirror_network_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -189,7 +189,7 @@ topology_template: get_input: vf_module_id packet_mirror_network_cidr: get_attribute: - - packet_mirror_network_port + - packet_mirror_network_port_1 - subnets - 0 - cidr @@ -213,7 +213,7 @@ topology_template: mount_colon__slash_config: vLBAgent_volume_2 oam_private_network_cidr: get_attribute: - - oam_private_net_network_port + - oam_private_net_network_port_3 - subnets - 0 - cidr @@ -241,9 +241,9 @@ topology_template: get_input: vLBAgent_type DPDK: DPDK_IP oam_private_network_ip_0: - - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s + - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_3.fixed_ip_0s packet_mirror_network_ip_0: - - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port.fixed_ip_0s + - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port_1.fixed_ip_0s vLBAgent_name: get_input: - vLBAgent_names @@ -323,7 +323,15 @@ topology_template: size: '(get_input : vLBAgent_volume_size_0) * 1024' description: get_input: vLBAgent_volume_name_0 - oam_private_net_network_port: + vLBAgent_volume_1: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: vLBAgent_volume_type_1 + size: '(get_input : vLBAgent_volume_size_1) * 1024' + description: + get_input: vLBAgent_volume_name_1 + oam_private_net_network_port_3: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -345,14 +353,6 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vLBAgentInstance relationship: tosca.relationships.network.BindsTo - vLBAgent_volume_1: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: vLBAgent_volume_type_1 - size: '(get_input : vLBAgent_volume_size_1) * 1024' - description: - get_input: vLBAgent_volume_name_1 vLBAgent_volume_2: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -404,43 +404,46 @@ topology_template: properties: heat_file: ../Artifacts/FEAdd_On_Module_vLBAgentTemplate.yaml members: - - packet_mirror_network_port + - packet_mirror_network_port_1 - vLBAgentInstance - vLBAgent_volume_0 - - oam_private_net_network_port - vLBAgent_volume_1 + - oam_private_net_network_port_3 - vLBAgent_volume_2 - packet_internal_network_port substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBAgentTemplate capabilities: + network.incoming.bytes.rate_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - network.incoming.bytes.rate disk.device.read.requests_vLBAgentInstance: - vLBAgentInstance - disk.device.read.requests - attachment_oam_private_net_network_port: - - oam_private_net_network_port - - attachment network.incoming.packets_packet_internal_network_port: - packet_internal_network_port - network.incoming.packets + network.outgoing.bytes.rate_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - network.outgoing.bytes.rate disk.device.usage_vLBAgentInstance: - vLBAgentInstance - disk.device.usage - network.outgoing.bytes_packet_mirror_network_port: - - packet_mirror_network_port - - network.outgoing.bytes + network.incoming.bytes.rate_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - network.incoming.bytes.rate disk.read.requests_vLBAgentInstance: - vLBAgentInstance - disk.read.requests - network.outgoing.bytes.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.bytes.rate + network.incoming.packets_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - network.incoming.packets cpu_util_vLBAgentInstance: - vLBAgentInstance - cpu_util - network.outpoing.packets_oam_private_net_network_port: - - oam_private_net_network_port - - network.outpoing.packets + feature_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - feature feature_vLBAgent_volume_1: - vLBAgent_volume_1 - feature @@ -453,9 +456,6 @@ topology_template: network.incoming.bytes.rate_packet_internal_network_port: - packet_internal_network_port - network.incoming.bytes.rate - network.outgoing.bytes.rate_packet_mirror_network_port: - - packet_mirror_network_port - - network.outgoing.bytes.rate disk.usage_vLBAgentInstance: - vLBAgentInstance - disk.usage @@ -465,30 +465,36 @@ topology_template: disk.device.iops_vLBAgentInstance: - vLBAgentInstance - disk.device.iops + network.incoming.packets_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - network.incoming.packets + network.outgoing.bytes.rate_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - network.outgoing.bytes.rate + network.outpoing.packets_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - network.outpoing.packets binding_packet_internal_network_port: - packet_internal_network_port - binding disk.device.write.bytes_vLBAgentInstance: - vLBAgentInstance - disk.device.write.bytes - network.incoming.bytes_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.bytes - feature_oam_private_net_network_port: - - oam_private_net_network_port - - feature - network.outpoing.packets_packet_mirror_network_port: - - packet_mirror_network_port - - network.outpoing.packets - network.incoming.bytes_packet_mirror_network_port: - - packet_mirror_network_port - - network.incoming.bytes - network.incoming.packets_packet_mirror_network_port: - - packet_mirror_network_port - - network.incoming.packets + attachment_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - attachment + network.incoming.packets.rate_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - network.incoming.packets.rate + binding_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - binding endpoint_vLBAgentInstance: - vLBAgentInstance - endpoint + binding_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - binding binding_vLBAgentInstance: - vLBAgentInstance - binding @@ -501,21 +507,12 @@ topology_template: attachment_packet_internal_network_port: - packet_internal_network_port - attachment - network.incoming.packets.rate_packet_mirror_network_port: - - packet_mirror_network_port - - network.incoming.packets.rate - network.outgoing.packets.rate_packet_mirror_network_port: - - packet_mirror_network_port - - network.outgoing.packets.rate disk.read.bytes_vLBAgentInstance: - vLBAgentInstance - disk.read.bytes memory.usage_vLBAgentInstance: - vLBAgentInstance - memory.usage - network.incoming.bytes.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.bytes.rate scalable_vLBAgentInstance: - vLBAgentInstance - scalable @@ -534,9 +531,6 @@ topology_template: disk.write.bytes_vLBAgentInstance: - vLBAgentInstance - disk.write.bytes - network.outgoing.bytes_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.bytes memory_vLBAgentInstance: - vLBAgentInstance - memory @@ -549,15 +543,36 @@ topology_template: disk.iops_vLBAgentInstance: - vLBAgentInstance - disk.iops + network.outgoing.packets.rate_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - network.outgoing.packets.rate + feature_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - feature instance_vLBAgentInstance: - vLBAgentInstance - instance + network.incoming.bytes_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - network.incoming.bytes + attachment_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - attachment network.outgoing.bytes_packet_internal_network_port: - packet_internal_network_port - network.outgoing.bytes + network.outgoing.packets.rate_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - network.outgoing.packets.rate network.incoming.bytes_packet_internal_network_port: - packet_internal_network_port - network.incoming.bytes + network.outpoing.packets_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - network.outpoing.packets + network.outgoing.bytes_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - network.outgoing.bytes disk.device.read.requests.rate_vLBAgentInstance: - vLBAgentInstance - disk.device.read.requests.rate @@ -567,18 +582,12 @@ topology_template: network.incoming.packets.rate_packet_internal_network_port: - packet_internal_network_port - network.incoming.packets.rate - attachment_packet_mirror_network_port: - - packet_mirror_network_port - - attachment disk.write.requests.rate_vLBAgentInstance: - vLBAgentInstance - disk.write.requests.rate attachment_vLBAgent_volume_0: - vLBAgent_volume_0 - attachment - binding_oam_private_net_network_port: - - oam_private_net_network_port - - binding disk.device.read.bytes_vLBAgentInstance: - vLBAgentInstance - disk.device.read.bytes @@ -594,27 +603,18 @@ topology_template: disk.device.write.requests.rate_vLBAgentInstance: - vLBAgentInstance - disk.device.write.requests.rate - feature_packet_mirror_network_port: - - packet_mirror_network_port - - feature - binding_packet_mirror_network_port: - - packet_mirror_network_port - - binding - network.incoming.packets_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.packets - network.incoming.bytes.rate_packet_mirror_network_port: - - packet_mirror_network_port - - network.incoming.bytes.rate - network.incoming.packets.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.packets.rate disk.device.read.bytes.rate_vLBAgentInstance: - vLBAgentInstance - disk.device.read.bytes.rate + network.outgoing.bytes_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - network.outgoing.bytes cpu.delta_vLBAgentInstance: - vLBAgentInstance - cpu.delta + network.incoming.bytes_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - network.incoming.bytes disk.capacity_vLBAgentInstance: - vLBAgentInstance - disk.capacity @@ -639,6 +639,9 @@ topology_template: network.outpoing.packets_packet_internal_network_port: - packet_internal_network_port - network.outpoing.packets + network.incoming.packets.rate_packet_mirror_network_port_1: + - packet_mirror_network_port_1 + - network.incoming.packets.rate vcpus_vLBAgentInstance: - vLBAgentInstance - vcpus @@ -651,9 +654,6 @@ topology_template: disk.write.bytes.rate_vLBAgentInstance: - vLBAgentInstance - disk.write.bytes.rate - network.outgoing.packets.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.packets.rate requirements: dependency_vLBAgentInstance: - vLBAgentInstance @@ -661,29 +661,29 @@ topology_template: dependency_packet_internal_network_port: - packet_internal_network_port - dependency + dependency_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - dependency link_packet_internal_network_port: - packet_internal_network_port - link - dependency_oam_private_net_network_port: - - oam_private_net_network_port - - dependency + link_oam_private_net_network_port_3: + - oam_private_net_network_port_3 + - link dependency_vLBAgent_volume_1: - vLBAgent_volume_1 - dependency dependency_vLBAgent_volume_2: - vLBAgent_volume_2 - dependency - dependency_packet_mirror_network_port: - - packet_mirror_network_port + dependency_packet_mirror_network_port_1: + - packet_mirror_network_port_1 - dependency - link_oam_private_net_network_port: - - oam_private_net_network_port - - link dependency_vLBAgent_volume_0: - vLBAgent_volume_0 - dependency - link_packet_mirror_network_port: - - packet_mirror_network_port + link_packet_mirror_network_port_1: + - packet_mirror_network_port_1 - link local_storage_vLBAgentInstance: - vLBAgentInstance diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml index e6c6845c42..e3896b2be6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml @@ -146,7 +146,7 @@ topology_template: immutable: false type: float node_templates: - packet_mirror_network_port: + packet_internal_network_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -161,31 +161,13 @@ topology_template: mac_count_required: is_required: false network: - get_input: packet_mirror_network + get_input: packet_internal_network requirements: - binding: capability: tosca.capabilities.network.Bindable node: vLBInstance relationship: tosca.relationships.network.BindsTo - vLB_volume_1: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: vLB_volume_type_1 - size: '(get_input : vLB_volume_size_1) * 1024' - vLB_volume_0: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: vLB_volume_type_0 - size: '(get_input : vLB_volume_size_0) * 1024' - vLB_volume_2: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: vLB_volume_type_2 - size: '(get_input : vLB_volume_size_2) * 1024' - oam_private_net_network_port: + oam_private_net_network_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -207,7 +189,7 @@ topology_template: capability: tosca.capabilities.network.Bindable node: vLBInstance relationship: tosca.relationships.network.BindsTo - packet_internal_network_port: + packet_mirror_network_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -222,12 +204,30 @@ topology_template: mac_count_required: is_required: false network: - get_input: packet_internal_network + get_input: packet_mirror_network requirements: - binding: capability: tosca.capabilities.network.Bindable node: vLBInstance relationship: tosca.relationships.network.BindsTo + vLB_volume_1: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: vLB_volume_type_1 + size: '(get_input : vLB_volume_size_1) * 1024' + vLB_volume_0: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: vLB_volume_type_0 + size: '(get_input : vLB_volume_size_0) * 1024' + vLB_volume_2: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: vLB_volume_type_2 + size: '(get_input : vLB_volume_size_2) * 1024' vLBInstance: type: org.openecomp.resource.vfc.nodes.heat.vLB properties: @@ -247,7 +247,7 @@ topology_template: - 0 - cidr packet_internal_network_ip_0: - - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port.fixed_ip_0s + - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port_2.fixed_ip_0s version_number: get_input: vLB_version_name machine_name: @@ -264,7 +264,7 @@ topology_template: mount_colon__slash_config: vLB_volume_2 oam_private_network_cidr: get_attribute: - - oam_private_net_network_port + - oam_private_net_network_port_2 - subnets - 0 - cidr @@ -284,7 +284,7 @@ topology_template: get_input: vLB_version_name packet_internal_network_cidr: get_attribute: - - packet_internal_network_port + - packet_internal_network_port_2 - subnets - 0 - cidr @@ -292,7 +292,7 @@ topology_template: get_input: vLB_type DPDK: DPDK_IP oam_private_network_ip_0: - - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s + - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_2.fixed_ip_0s packet_mirror_network_ip_0: - UNSUPPORTED_ATTRIBUTE_packet_mirror_network_port.fixed_ip_0s vLBAgent_name: @@ -381,25 +381,25 @@ topology_template: properties: heat_file: ../Artifacts/FEAdd_On_Module_vLBTemplate.yaml members: + - packet_internal_network_port_2 + - oam_private_net_network_port_2 - packet_mirror_network_port - vLB_volume_1 - vLB_volume_0 - vLB_volume_2 - - oam_private_net_network_port - - packet_internal_network_port - vLBInstance substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate capabilities: - attachment_oam_private_net_network_port: - - oam_private_net_network_port - - attachment - network.incoming.packets_packet_internal_network_port: - - packet_internal_network_port - - network.incoming.packets disk.iops_vLBInstance: - vLBInstance - disk.iops + network.incoming.packets_packet_internal_network_port_2: + - packet_internal_network_port_2 + - network.incoming.packets + network.outgoing.bytes.rate_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - network.outgoing.bytes.rate feature_vLBInstance: - vLBInstance - feature @@ -409,57 +409,72 @@ topology_template: os_vLBInstance: - vLBInstance - os + network.outgoing.bytes.rate_packet_internal_network_port_2: + - packet_internal_network_port_2 + - network.outgoing.bytes.rate + network.incoming.packets_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - network.incoming.packets disk.device.write.bytes.rate_vLBInstance: - vLBInstance - disk.device.write.bytes.rate network.outgoing.bytes_packet_mirror_network_port: - packet_mirror_network_port - network.outgoing.bytes - network.outgoing.bytes.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.bytes.rate + network.incoming.bytes.rate_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - network.incoming.bytes.rate disk.write.bytes.rate_vLBInstance: - vLBInstance - disk.write.bytes.rate - network.outpoing.packets_oam_private_net_network_port: - - oam_private_net_network_port - - network.outpoing.packets + feature_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - feature + network.outgoing.bytes_packet_internal_network_port_2: + - packet_internal_network_port_2 + - network.outgoing.bytes + network.incoming.packets.rate_packet_internal_network_port_2: + - packet_internal_network_port_2 + - network.incoming.packets.rate memory.usage_vLBInstance: - vLBInstance - memory.usage host_vLBInstance: - vLBInstance - host - network.incoming.bytes.rate_packet_internal_network_port: - - packet_internal_network_port - - network.incoming.bytes.rate network.outgoing.bytes.rate_packet_mirror_network_port: - packet_mirror_network_port - network.outgoing.bytes.rate + network.outpoing.packets_packet_internal_network_port_2: + - packet_internal_network_port_2 + - network.outpoing.packets disk.device.capacity_vLBInstance: - vLBInstance - disk.device.capacity - binding_packet_internal_network_port: - - packet_internal_network_port - - binding + network.outpoing.packets_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - network.outpoing.packets + network.incoming.packets.rate_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - network.incoming.packets.rate instance_vLBInstance: - vLBInstance - instance - network.incoming.bytes_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.bytes binding_vLBInstance: - vLBInstance - binding - feature_oam_private_net_network_port: - - oam_private_net_network_port - - feature + binding_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - binding disk.device.latency_vLBInstance: - vLBInstance - disk.device.latency network.outpoing.packets_packet_mirror_network_port: - packet_mirror_network_port - network.outpoing.packets + binding_packet_internal_network_port_2: + - packet_internal_network_port_2 + - binding network.incoming.bytes_packet_mirror_network_port: - packet_mirror_network_port - network.incoming.bytes @@ -469,30 +484,24 @@ topology_template: disk.device.read.requests.rate_vLBInstance: - vLBInstance - disk.device.read.requests.rate - attachment_packet_internal_network_port: - - packet_internal_network_port - - attachment network.incoming.packets.rate_packet_mirror_network_port: - packet_mirror_network_port - network.incoming.packets.rate network.outgoing.packets.rate_packet_mirror_network_port: - packet_mirror_network_port - network.outgoing.packets.rate - network.incoming.bytes.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.bytes.rate memory_vLBInstance: - vLBInstance - memory + network.incoming.bytes.rate_packet_internal_network_port_2: + - packet_internal_network_port_2 + - network.incoming.bytes.rate cpu.delta_vLBInstance: - vLBInstance - cpu.delta disk.write.bytes_vLBInstance: - vLBInstance - disk.write.bytes - network.outgoing.bytes_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.bytes disk.write.requests_vLBInstance: - vLBInstance - disk.write.requests @@ -505,18 +514,21 @@ topology_template: disk.device.iops_vLBInstance: - vLBInstance - disk.device.iops - network.outgoing.packets.rate_packet_internal_network_port: - - packet_internal_network_port - - network.outgoing.packets.rate disk.capacity_vLBInstance: - vLBInstance - disk.capacity disk.device.read.bytes_vLBInstance: - vLBInstance - disk.device.read.bytes + attachment_packet_internal_network_port_2: + - packet_internal_network_port_2 + - attachment attachment_vLB_volume_0: - vLB_volume_0 - attachment + network.outgoing.packets.rate_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - network.outgoing.packets.rate attachment_vLB_volume_1: - vLB_volume_1 - attachment @@ -529,51 +541,51 @@ topology_template: memory.resident_vLBInstance: - vLBInstance - memory.resident - network.outgoing.bytes_packet_internal_network_port: - - packet_internal_network_port - - network.outgoing.bytes disk.write.requests.rate_vLBInstance: - vLBInstance - disk.write.requests.rate disk.device.write.requests_vLBInstance: - vLBInstance - disk.device.write.requests - network.incoming.bytes_packet_internal_network_port: - - packet_internal_network_port - - network.incoming.bytes - network.incoming.packets.rate_packet_internal_network_port: - - packet_internal_network_port - - network.incoming.packets.rate + network.outgoing.packets.rate_packet_internal_network_port_2: + - packet_internal_network_port_2 + - network.outgoing.packets.rate + attachment_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - attachment attachment_packet_mirror_network_port: - packet_mirror_network_port - attachment disk.read.requests_vLBInstance: - vLBInstance - disk.read.requests - binding_oam_private_net_network_port: - - oam_private_net_network_port - - binding disk.device.read.requests_vLBInstance: - vLBInstance - disk.device.read.requests disk.latency_vLBInstance: - vLBInstance - disk.latency + network.incoming.bytes_packet_internal_network_port_2: + - packet_internal_network_port_2 + - network.incoming.bytes feature_packet_mirror_network_port: - packet_mirror_network_port - feature + feature_packet_internal_network_port_2: + - packet_internal_network_port_2 + - feature binding_packet_mirror_network_port: - packet_mirror_network_port - binding - network.incoming.packets_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.packets + network.outgoing.bytes_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - network.outgoing.bytes + network.incoming.bytes_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - network.incoming.bytes network.incoming.bytes.rate_packet_mirror_network_port: - packet_mirror_network_port - network.incoming.bytes.rate - network.incoming.packets.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.packets.rate disk.device.write.requests.rate_vLBInstance: - vLBInstance - disk.device.write.requests.rate @@ -595,9 +607,6 @@ topology_template: feature_vLB_volume_1: - vLB_volume_1 - feature - network.outgoing.bytes.rate_packet_internal_network_port: - - packet_internal_network_port - - network.outgoing.bytes.rate cpu_vLBInstance: - vLBInstance - cpu @@ -607,9 +616,6 @@ topology_template: endpoint_vLBInstance: - vLBInstance - endpoint - network.outpoing.packets_packet_internal_network_port: - - packet_internal_network_port - - network.outpoing.packets disk.device.allocation_vLBInstance: - vLBInstance - disk.device.allocation @@ -622,15 +628,9 @@ topology_template: disk.usage_vLBInstance: - vLBInstance - disk.usage - feature_packet_internal_network_port: - - packet_internal_network_port - - feature cpu_util_vLBInstance: - vLBInstance - cpu_util - network.outgoing.packets.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.packets.rate requirements: dependency_vLB_volume_0: - vLB_volume_0 @@ -641,27 +641,27 @@ topology_template: local_storage_vLBInstance: - vLBInstance - local_storage - dependency_packet_internal_network_port: - - packet_internal_network_port + dependency_oam_private_net_network_port_2: + - oam_private_net_network_port_2 - dependency - link_packet_internal_network_port: - - packet_internal_network_port - - link dependency_vLB_volume_2: - vLB_volume_2 - dependency - dependency_oam_private_net_network_port: - - oam_private_net_network_port + link_oam_private_net_network_port_2: + - oam_private_net_network_port_2 + - link + dependency_packet_internal_network_port_2: + - packet_internal_network_port_2 - dependency dependency_packet_mirror_network_port: - packet_mirror_network_port - dependency - link_oam_private_net_network_port: - - oam_private_net_network_port - - link dependency_vLBInstance: - vLBInstance - dependency link_packet_mirror_network_port: - packet_mirror_network_port + - link + link_packet_internal_network_port_2: + - packet_internal_network_port_2 - link
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml index 9808460108..5edca0a8d6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml @@ -180,7 +180,7 @@ topology_template: cdr_network_ip_0: - UNSUPPORTED_ATTRIBUTE_cdr_network_port.fixed_ip_0s packet_internal_network_ip_0: - - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port.fixed_ip_0s + - UNSUPPORTED_ATTRIBUTE_packet_internal_network_port_1.fixed_ip_0s version_number: get_input: vProbe_version_name vprobe_type: @@ -207,7 +207,7 @@ topology_template: mount_colon__slash_config: vprobe_volume_2 oam_private_network_cidr: get_attribute: - - oam_private_net_network_port + - oam_private_net_network_port_1 - subnets - 0 - cidr @@ -229,7 +229,7 @@ topology_template: get_input: vprobe_AppDependenciesMachineType packet_internal_network_cidr: get_attribute: - - packet_internal_network_port + - packet_internal_network_port_1 - subnets - 0 - cidr @@ -237,7 +237,7 @@ topology_template: get_input: vProbe_node_count DPDK: DPDK_IP oam_private_network_ip_0: - - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port.fixed_ip_0s + - UNSUPPORTED_ATTRIBUTE_oam_private_net_network_port_1.fixed_ip_0s region: get_input: region_name manager_oam_direct_ip_0: @@ -322,7 +322,7 @@ topology_template: size: '(get_input : vprobe_volume_size_0) * 1024' description: get_input: vprobe_volume_name_0 - cdr_network_port: + oam_private_net_network_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -336,14 +336,15 @@ topology_template: mac_requirements: mac_count_required: is_required: false + network_role_tag: oam_private network: - get_input: cdr_network + get_input: oam_private_net_name requirements: - binding: capability: tosca.capabilities.network.Bindable node: ProbeInstance relationship: tosca.relationships.network.BindsTo - oam_private_net_network_port: + cdr_network_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -357,15 +358,14 @@ topology_template: mac_requirements: mac_count_required: is_required: false - network_role_tag: oam_private network: - get_input: oam_private_net_name + get_input: cdr_network requirements: - binding: capability: tosca.capabilities.network.Bindable node: ProbeInstance relationship: tosca.relationships.network.BindsTo - packet_internal_network_port: + packet_internal_network_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: @@ -412,9 +412,9 @@ topology_template: - vprobe_volume_2 - vprobe_volume_1 - vprobe_volume_0 + - oam_private_net_network_port_1 - cdr_network_port - - oam_private_net_network_port - - packet_internal_network_port + - packet_internal_network_port_1 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vProbeTemplate capabilities: @@ -427,15 +427,21 @@ topology_template: disk.device.write.requests_ProbeInstance: - ProbeInstance - disk.device.write.requests - attachment_oam_private_net_network_port: - - oam_private_net_network_port - - attachment disk.iops_ProbeInstance: - ProbeInstance - disk.iops - network.incoming.packets_packet_internal_network_port: - - packet_internal_network_port + network.incoming.packets_packet_internal_network_port_1: + - packet_internal_network_port_1 + - network.incoming.packets + network.outgoing.bytes.rate_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - network.outgoing.bytes.rate + network.incoming.packets_oam_private_net_network_port_1: + - oam_private_net_network_port_1 - network.incoming.packets + network.outgoing.bytes.rate_packet_internal_network_port_1: + - packet_internal_network_port_1 + - network.outgoing.bytes.rate attachment_cdr_network_port: - cdr_network_port - attachment @@ -445,54 +451,57 @@ topology_template: feature_ProbeInstance: - ProbeInstance - feature - network.outgoing.bytes.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.bytes.rate - network.outpoing.packets_oam_private_net_network_port: - - oam_private_net_network_port - - network.outpoing.packets + feature_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - feature + network.incoming.bytes.rate_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - network.incoming.bytes.rate + network.outgoing.bytes_packet_internal_network_port_1: + - packet_internal_network_port_1 + - network.outgoing.bytes network.outpoing.packets_cdr_network_port: - cdr_network_port - network.outpoing.packets - network.incoming.bytes.rate_packet_internal_network_port: - - packet_internal_network_port - - network.incoming.bytes.rate + network.incoming.packets.rate_packet_internal_network_port_1: + - packet_internal_network_port_1 + - network.incoming.packets.rate disk.device.latency_ProbeInstance: - ProbeInstance - disk.device.latency feature_cdr_network_port: - cdr_network_port - feature + network.outpoing.packets_packet_internal_network_port_1: + - packet_internal_network_port_1 + - network.outpoing.packets disk.write.bytes.rate_ProbeInstance: - ProbeInstance - disk.write.bytes.rate + network.outpoing.packets_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - network.outpoing.packets network.incoming.bytes_cdr_network_port: - cdr_network_port - network.incoming.bytes host_ProbeInstance: - ProbeInstance - host - binding_packet_internal_network_port: - - packet_internal_network_port + network.incoming.packets.rate_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - network.incoming.packets.rate + binding_oam_private_net_network_port_1: + - oam_private_net_network_port_1 - binding - network.incoming.bytes_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.bytes memory_ProbeInstance: - ProbeInstance - memory - feature_oam_private_net_network_port: - - oam_private_net_network_port - - feature - attachment_packet_internal_network_port: - - packet_internal_network_port - - attachment + binding_packet_internal_network_port_1: + - packet_internal_network_port_1 + - binding disk.device.read.requests_ProbeInstance: - ProbeInstance - disk.device.read.requests - network.incoming.bytes.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.bytes.rate memory.resident_ProbeInstance: - ProbeInstance - memory.resident @@ -517,36 +526,39 @@ topology_template: disk.write.bytes_ProbeInstance: - ProbeInstance - disk.write.bytes - network.outgoing.bytes_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.bytes + network.incoming.bytes.rate_packet_internal_network_port_1: + - packet_internal_network_port_1 + - network.incoming.bytes.rate disk.device.capacity_ProbeInstance: - ProbeInstance - disk.device.capacity + attachment_packet_internal_network_port_1: + - packet_internal_network_port_1 + - attachment endpoint_ProbeInstance: - ProbeInstance - endpoint - network.outgoing.packets.rate_packet_internal_network_port: - - packet_internal_network_port - - network.outgoing.packets.rate disk.ephemeral.size_ProbeInstance: - ProbeInstance - disk.ephemeral.size disk.read.bytes.rate_ProbeInstance: - ProbeInstance - disk.read.bytes.rate + network.outgoing.packets.rate_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - network.outgoing.packets.rate disk.latency_ProbeInstance: - ProbeInstance - disk.latency os_ProbeInstance: - ProbeInstance - os - network.outgoing.bytes_packet_internal_network_port: - - packet_internal_network_port - - network.outgoing.bytes - network.incoming.bytes_packet_internal_network_port: - - packet_internal_network_port - - network.incoming.bytes + network.outgoing.packets.rate_packet_internal_network_port_1: + - packet_internal_network_port_1 + - network.outgoing.packets.rate + attachment_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - attachment cpu_util_ProbeInstance: - ProbeInstance - cpu_util @@ -568,9 +580,6 @@ topology_template: attachment_vprobe_volume_2: - vprobe_volume_2 - attachment - network.incoming.packets.rate_packet_internal_network_port: - - packet_internal_network_port - - network.incoming.packets.rate attachment_vprobe_volume_1: - vprobe_volume_1 - attachment @@ -580,9 +589,6 @@ topology_template: network.outgoing.bytes.rate_cdr_network_port: - cdr_network_port - network.outgoing.bytes.rate - binding_oam_private_net_network_port: - - oam_private_net_network_port - - binding binding_ProbeInstance: - ProbeInstance - binding @@ -592,6 +598,9 @@ topology_template: disk.capacity_ProbeInstance: - ProbeInstance - disk.capacity + network.incoming.bytes_packet_internal_network_port_1: + - packet_internal_network_port_1 + - network.incoming.bytes disk.write.requests.rate_ProbeInstance: - ProbeInstance - disk.write.requests.rate @@ -604,15 +613,18 @@ topology_template: feature_vprobe_volume_2: - vprobe_volume_2 - feature - network.incoming.packets_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.packets + feature_packet_internal_network_port_1: + - packet_internal_network_port_1 + - feature feature_vprobe_volume_0: - vprobe_volume_0 - feature - network.incoming.packets.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.incoming.packets.rate + network.outgoing.bytes_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - network.outgoing.bytes + network.incoming.bytes_oam_private_net_network_port_1: + - oam_private_net_network_port_1 + - network.incoming.bytes disk.device.read.requests.rate_ProbeInstance: - ProbeInstance - disk.device.read.requests.rate @@ -631,9 +643,6 @@ topology_template: disk.usage_ProbeInstance: - ProbeInstance - disk.usage - network.outgoing.bytes.rate_packet_internal_network_port: - - packet_internal_network_port - - network.outgoing.bytes.rate binding_cdr_network_port: - cdr_network_port - binding @@ -646,34 +655,19 @@ topology_template: network.outgoing.packets.rate_cdr_network_port: - cdr_network_port - network.outgoing.packets.rate - network.outpoing.packets_packet_internal_network_port: - - packet_internal_network_port - - network.outpoing.packets - feature_packet_internal_network_port: - - packet_internal_network_port - - feature disk.device.read.bytes.rate_ProbeInstance: - ProbeInstance - disk.device.read.bytes.rate - network.outgoing.packets.rate_oam_private_net_network_port: - - oam_private_net_network_port - - network.outgoing.packets.rate requirements: - dependency_packet_internal_network_port: - - packet_internal_network_port - - dependency - link_packet_internal_network_port: - - packet_internal_network_port + link_oam_private_net_network_port_1: + - oam_private_net_network_port_1 - link - dependency_oam_private_net_network_port: - - oam_private_net_network_port + dependency_oam_private_net_network_port_1: + - oam_private_net_network_port_1 - dependency dependency_cdr_network_port: - cdr_network_port - dependency - link_oam_private_net_network_port: - - oam_private_net_network_port - - link dependency_vprobe_volume_1: - vprobe_volume_1 - dependency @@ -689,6 +683,12 @@ topology_template: local_storage_ProbeInstance: - ProbeInstance - local_storage + dependency_packet_internal_network_port_1: + - packet_internal_network_port_1 + - dependency + link_packet_internal_network_port_1: + - packet_internal_network_port_1 + - link dependency_vprobe_volume_2: - vprobe_volume_2 - dependency
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml index 86de04a96c..01329a4aab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -131,33 +131,33 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_qrouter_volume_1: + - dependency_cdr_network_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_qrouter_volume_0: + - link_cdr_network_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_qrouter_volume_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_cdr_network_port: + - dependency_qrouter_volume_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cdr_network_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_qrouter_volume_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -193,12 +193,6 @@ node_types: - 1 - 1 capabilities: - network.outgoing.bytes_cdr_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED binding_QRouter1: type: tosca.capabilities.network.Bindable occurrences: @@ -245,17 +239,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_cdr_network_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_cdr_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -280,12 +263,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_cdr_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory.resident_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -305,11 +282,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_cdr_network_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -322,9 +294,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_cdr_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_cdr_network_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -416,13 +387,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_cdr_network_port: + network.outgoing.bytes_oam_private_net_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_private_net_network_port: + network.incoming.packets.rate_cdr_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -440,6 +411,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_cdr_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_cdr_network_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -452,6 +434,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_cdr_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED memory_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -464,14 +452,15 @@ node_types: occurrences: - 1 - UNBOUNDED - scalable_QRouter1: - type: tosca.capabilities.Scalable + binding_cdr_network_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outgoing.bytes.rate_cdr_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_QRouter1: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED @@ -482,7 +471,7 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.packets.rate_cdr_network_port: + network.incoming.bytes_cdr_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -512,6 +501,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_cdr_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED os_QRouter1: type: tosca.capabilities.OperatingSystem occurrences: @@ -535,26 +530,25 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_cdr_network_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.incoming.bytes.rate_cdr_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes.rate_QRouter1: + network.outgoing.bytes_cdr_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_QRouter1: + disk.write.bytes.rate_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_cdr_network_port: + disk.device.write.bytes_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -583,6 +577,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_cdr_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests_QRouter1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -741,14 +741,14 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_packet_mirror_network_port: + - dependency_packet_mirror_network_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_packet_mirror_network_port: + - link_packet_mirror_network_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -775,26 +775,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_oam_private_net_network_port: + - dependency_vLBAgent_volume_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_private_net_network_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_vLBAgent_volume_1: + - dependency_oam_private_net_network_port_3: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED + - link_oam_private_net_network_port_3: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 - dependency_vLBAgent_volume_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -816,14 +816,15 @@ node_types: - 1 - 1 capabilities: - disk.device.read.requests_vLBAgentInstance: + network.incoming.bytes.rate_packet_mirror_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - attachment_oam_private_net_network_port: - type: tosca.capabilities.Attachment + disk.device.read.requests_vLBAgentInstance: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -833,13 +834,19 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_oam_private_net_network_port_3: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.usage_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_packet_mirror_network_port: + network.incoming.bytes.rate_oam_private_net_network_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -851,7 +858,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_private_net_network_port: + network.incoming.packets_oam_private_net_network_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -863,9 +870,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_oam_private_net_network_port_3: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -890,12 +896,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_packet_mirror_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.usage_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -914,53 +914,67 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_packet_internal_network_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.incoming.packets_packet_mirror_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - disk.device.write.bytes_vLBAgentInstance: + network.outgoing.bytes.rate_packet_mirror_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_private_net_network_port: + network.outpoing.packets_oam_private_net_network_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_oam_private_net_network_port: - type: tosca.capabilities.Node + binding_packet_internal_network_port: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - network.outpoing.packets_packet_mirror_network_port: + disk.device.write.bytes_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_packet_mirror_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_packet_mirror_network_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.incoming.packets_packet_mirror_network_port: + network.incoming.packets.rate_oam_private_net_network_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_oam_private_net_network_port_3: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED endpoint_vLBAgentInstance: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED + binding_packet_mirror_network_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED binding_vLBAgentInstance: type: tosca.capabilities.network.Bindable occurrences: @@ -983,114 +997,130 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_packet_mirror_network_port: + disk.read.bytes_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_packet_mirror_network_port: + memory.usage_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes_vLBAgentInstance: + scalable_vLBAgentInstance: + type: tosca.capabilities.Scalable + occurrences: + - 1 + - UNBOUNDED + disk.latency_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.usage_vLBAgentInstance: + disk.device.allocation_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_private_net_network_port: + cpu_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - scalable_vLBAgentInstance: - type: tosca.capabilities.Scalable + disk.device.write.requests_vLBAgentInstance: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.latency_vLBAgentInstance: + disk.write.bytes_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.allocation_vLBAgentInstance: + memory_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu_vLBAgentInstance: + disk.device.write.bytes.rate_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.requests_vLBAgentInstance: + network.outgoing.packets.rate_packet_internal_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.write.bytes_vLBAgentInstance: + disk.iops_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_private_net_network_port: + network.outgoing.packets.rate_oam_private_net_network_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_vLBAgentInstance: + feature_packet_mirror_network_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + instance_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_vLBAgentInstance: + network.incoming.bytes_packet_mirror_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_packet_internal_network_port: + attachment_oam_private_net_network_port_3: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_packet_internal_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_vLBAgentInstance: + network.outgoing.packets.rate_packet_mirror_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - instance_vLBAgentInstance: + network.incoming.bytes_packet_internal_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_packet_internal_network_port: + network.outpoing.packets_packet_mirror_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_packet_internal_network_port: + network.outgoing.bytes_packet_mirror_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1113,11 +1143,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_packet_mirror_network_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1129,13 +1154,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_private_net_network_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.bytes_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1165,43 +1183,25 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_mirror_network_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_packet_mirror_network_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - network.incoming.packets_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes.rate_packet_mirror_network_port: + disk.device.read.bytes.rate_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_private_net_network_port: + network.outgoing.bytes_oam_private_net_network_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_vLBAgentInstance: + cpu.delta_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - cpu.delta_vLBAgentInstance: + network.incoming.bytes_oam_private_net_network_port_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1254,6 +1254,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_packet_mirror_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED vcpus_vLBAgentInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1277,12 +1283,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -1421,66 +1421,66 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_packet_mirror_network_port: + - dependency_packet_internal_network_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_packet_mirror_network_port: + - link_packet_internal_network_port_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vLB_volume_1: + - dependency_oam_private_net_network_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vLB_volume_0: + - link_oam_private_net_network_port_2: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_packet_mirror_network_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vLB_volume_2: + - link_packet_mirror_network_port: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_vLB_volume_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_oam_private_net_network_port: + - dependency_vLB_volume_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_private_net_network_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_packet_internal_network_port: + - dependency_vLB_volume_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_packet_internal_network_port: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - dependency_vLBInstance: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -1496,18 +1496,19 @@ node_types: - 0 - UNBOUNDED capabilities: - attachment_oam_private_net_network_port: - type: tosca.capabilities.Attachment + disk.iops_vLBInstance: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_packet_internal_network_port: + network.incoming.packets_packet_internal_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_vLBInstance: + network.outgoing.bytes.rate_oam_private_net_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1529,6 +1530,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_packet_internal_network_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_private_net_network_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.write.bytes.rate_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1541,7 +1554,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_private_net_network_port: + network.incoming.bytes.rate_oam_private_net_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1553,7 +1566,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_private_net_network_port: + feature_oam_private_net_network_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_packet_internal_network_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_packet_internal_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1572,13 +1596,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_packet_internal_network_port: + network.outgoing.bytes.rate_packet_mirror_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_packet_mirror_network_port: + network.outpoing.packets_packet_internal_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1590,20 +1614,19 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_packet_internal_network_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + network.outpoing.packets_oam_private_net_network_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - - 0 + - 1 - UNBOUNDED - instance_vLBInstance: + network.incoming.packets.rate_oam_private_net_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_oam_private_net_network_port: + instance_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1614,10 +1637,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_oam_private_net_network_port: - type: tosca.capabilities.Node + binding_oam_private_net_network_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.latency_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer @@ -1631,6 +1656,13 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_packet_internal_network_port_2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED network.incoming.bytes_packet_mirror_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1649,11 +1681,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_packet_internal_network_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED network.incoming.packets.rate_packet_mirror_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1666,13 +1693,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_private_net_network_port: + memory_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory_vLBInstance: + network.incoming.bytes.rate_packet_internal_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1690,12 +1717,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1719,21 +1740,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_packet_internal_network_port: + disk.capacity_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.capacity_vLBInstance: + disk.device.read.bytes_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_vLBInstance: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_packet_internal_network_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1742,6 +1762,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_oam_private_net_network_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED attachment_vLB_volume_1: type: tosca.capabilities.Attachment occurrences: @@ -1765,12 +1791,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_packet_internal_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1783,15 +1803,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_packet_internal_network_port: + network.outgoing.packets.rate_packet_internal_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_packet_internal_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_private_net_network_port_2: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1806,13 +1825,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_private_net_network_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.read.requests_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1825,11 +1837,22 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_packet_internal_network_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_packet_mirror_network_port: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + feature_packet_internal_network_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED binding_packet_mirror_network_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -1837,19 +1860,19 @@ node_types: occurrences: - 0 - UNBOUNDED - network.incoming.packets_oam_private_net_network_port: + network.outgoing.bytes_oam_private_net_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_packet_mirror_network_port: + network.incoming.bytes_oam_private_net_network_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_private_net_network_port: + network.incoming.bytes.rate_packet_mirror_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1895,12 +1918,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_packet_internal_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1917,12 +1934,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_packet_internal_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.allocation_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1946,23 +1957,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_internal_network_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_vLBInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vProbeTemplate: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -2152,40 +2152,40 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_cdr_network_port: + - dependency_oam_private_net_network_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_cdr_network_port: + - link_oam_private_net_network_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_oam_private_net_network_port: + - dependency_cdr_network_port: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_oam_private_net_network_port: + - link_cdr_network_port: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_packet_internal_network_port: + - dependency_packet_internal_network_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_packet_internal_network_port: + - link_packet_internal_network_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2210,18 +2210,31 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_oam_private_net_network_port: - type: tosca.capabilities.Attachment + disk.iops_ProbeInstance: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.iops_ProbeInstance: + network.incoming.packets_packet_internal_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets_packet_internal_network_port: + network.outgoing.bytes.rate_oam_private_net_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_oam_private_net_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes.rate_packet_internal_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2243,13 +2256,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_private_net_network_port: + feature_oam_private_net_network_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_oam_private_net_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_private_net_network_port: + network.outgoing.bytes_packet_internal_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2261,7 +2279,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_packet_internal_network_port: + network.incoming.packets.rate_packet_internal_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2278,12 +2296,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_packet_internal_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.outpoing.packets_oam_private_net_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED network.incoming.bytes_cdr_network_port: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2297,34 +2327,31 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_packet_internal_network_port: + network.incoming.packets.rate_oam_private_net_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + binding_oam_private_net_network_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - network.incoming.bytes_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - feature_oam_private_net_network_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_packet_internal_network_port: - type: tosca.capabilities.Attachment + binding_packet_internal_network_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer @@ -2332,12 +2359,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory.resident_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2385,7 +2406,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_oam_private_net_network_port: + network.incoming.bytes.rate_packet_internal_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2397,24 +2418,29 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_packet_internal_network_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED endpoint_ProbeInstance: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_packet_internal_network_port: + disk.ephemeral.size_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_ProbeInstance: + disk.read.bytes.rate_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_ProbeInstance: + network.outgoing.packets.rate_oam_private_net_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2431,15 +2457,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_packet_internal_network_port: + network.outgoing.packets.rate_packet_internal_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes_packet_internal_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_oam_private_net_network_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -2484,12 +2509,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_packet_internal_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED attachment_vprobe_volume_1: type: tosca.capabilities.Attachment occurrences: @@ -2506,13 +2525,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_oam_private_net_network_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED binding_ProbeInstance: type: tosca.capabilities.network.Bindable occurrences: @@ -2530,6 +2542,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_packet_internal_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.write.requests.rate_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2552,9 +2570,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_packet_internal_network_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2563,7 +2580,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_oam_private_net_network_port: + network.outgoing.bytes_oam_private_net_network_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes_oam_private_net_network_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2605,12 +2628,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_packet_internal_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED binding_cdr_network_port: type: tosca.capabilities.network.Bindable valid_source_types: @@ -2636,26 +2653,9 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_packet_internal_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - feature_packet_internal_network_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_ProbeInstance: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED - network.outgoing.packets.rate_oam_private_net_network_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml index 7d2364e084..de4eb2c145 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/MainServiceTemplate.yaml @@ -603,7 +603,7 @@ topology_template: rpmrepository_ip_0: get_input: rpmrepository_ip_0 requirements: - - link_packet_mirror_network_port: + - link_packet_mirror_network_port_1: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo @@ -709,7 +709,7 @@ topology_template: rpmrepository_ip_0: get_input: rpmrepository_ip_0 requirements: - - link_packet_internal_network_port: + - link_packet_internal_network_port_1: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo @@ -833,15 +833,15 @@ topology_template: node: QRouter0 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdr_network_port + capability: attachment_cdr_network_port_1 node: QRouter0 relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_private_net_network_port + capability: attachment_packet_internal_network_port_2 node: vLB relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_packet_internal_network_port + capability: attachment_oam_private_net_network_port_2 node: vLB relationship: org.openecomp.relationships.AttachesTo - port: @@ -849,7 +849,7 @@ topology_template: node: vLB relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_private_net_network_port + capability: attachment_packet_mirror_network_port_1 node: vLBAgent relationship: org.openecomp.relationships.AttachesTo - port: @@ -857,19 +857,19 @@ topology_template: node: vLBAgent relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_packet_mirror_network_port + capability: attachment_oam_private_net_network_port_3 node: vLBAgent relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_oam_private_net_network_port + capability: attachment_cdr_network_port node: vProbe relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_cdr_network_port + capability: attachment_packet_internal_network_port_1 node: vProbe relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_packet_internal_network_port + capability: attachment_oam_private_net_network_port_1 node: vProbe relationship: org.openecomp.relationships.AttachesTo QRouter0: @@ -1026,13 +1026,13 @@ topology_template: vLB_volume_size_2: get_input: vLB_volume_size_2 requirements: - - link_packet_mirror_network_port: + - link_packet_internal_network_port_2: capability: tosca.capabilities.network.Linkable - node: packet_mirror_network + node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - link_packet_internal_network_port: + - link_packet_mirror_network_port: capability: tosca.capabilities.network.Linkable - node: packet_internal_network + node: packet_mirror_network relationship: tosca.relationships.network.LinksTo - dependency: capability: tosca.capabilities.Node |