From b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 11 Jun 2017 14:22:02 +0300 Subject: [SDC-29] rebase continue work to align source Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4 Signed-off-by: Michael Lando --- .../FEAdd_On_Module_QRouterTemplate.yaml | 8 +- .../inputfiles/FEBase_Module.yaml | 2 +- ...d_On_Module_QRouterTemplateServiceTemplate.yaml | 360 ++++++++++----------- .../GlobalSubstitutionTypesServiceTemplate.yaml | 218 ++++++------- .../out/MainServiceTemplate.yaml | 176 +++++----- 5 files changed, 382 insertions(+), 382 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection') 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 aae1455919..758276fe18 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 @@ -62,7 +62,7 @@ parameters: vnf_id: type: string resources: - QRouter: + QRouter1: properties: availability_zone: get_param: availability_zone_0 @@ -178,7 +178,7 @@ resources: qrouter_volume_0_att: properties: instance_uuid: - get_resource: QRouter + get_resource: QRouter1 volume_id: get_resource: qrouter_volume_0 type: OS::Cinder::VolumeAttachment @@ -194,7 +194,7 @@ resources: qrouter_volume_1_att: properties: instance_uuid: - get_resource: QRouter + get_resource: QRouter1 volume_id: get_resource: qrouter_volume_1 type: OS::Cinder::VolumeAttachment @@ -210,7 +210,7 @@ resources: qrouter_volume_2_att: properties: instance_uuid: - get_resource: QRouter + get_resource: QRouter1 volume_id: get_resource: qrouter_volume_2 type: OS::Cinder::VolumeAttachment \ 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/inputfiles/FEBase_Module.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEBase_Module.yaml index 5d0a5457ca..331737e599 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEBase_Module.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/inputfiles/FEBase_Module.yaml @@ -269,7 +269,7 @@ parameters: description: Windows servers' domain type: string resources: - QRouter: + QRouter0: depends_on: - security_group - packet_mirror_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 ce5bddcbb4..ca861cbfc0 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,7 +134,52 @@ topology_template: immutable: false type: string node_templates: - QRouter: + 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: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group + mac_requirements: + mac_count_required: + is_required: false + network: + get_input: cdr_network + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: QRouter1 + relationship: tosca.relationships.network.BindsTo + qrouter_volume_2: + type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume + properties: + volume_type: + get_input: qrouter_volume_type_2 + size: '(get_input : qrouter_volume_size_2) * 1024' + description: + get_input: qrouter_volume_name_2 + QRouter1: type: org.openecomp.resource.vfc.nodes.heat.qrouter properties: flavor: @@ -230,51 +275,6 @@ topology_template: register_status: type: tosca.artifacts.Deployment file: ../Artifacts/register_status.py - 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: - type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port - properties: - ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - security_groups: - - get_input: security_group - mac_requirements: - mac_count_required: - is_required: false - network: - get_input: cdr_network - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: QRouter - relationship: tosca.relationships.network.BindsTo - qrouter_volume_2: - type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume - properties: - volume_type: - get_input: qrouter_volume_type_2 - size: '(get_input : qrouter_volume_size_2) * 1024' - description: - get_input: qrouter_volume_name_2 oam_private_net_network_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -295,78 +295,66 @@ topology_template: requirements: - binding: capability: tosca.capabilities.network.Bindable - node: QRouter + node: QRouter1 relationship: tosca.relationships.network.BindsTo relationship_templates: qrouter_volume_0_att: type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: qrouter_volume_0 - instance_uuid: QRouter + instance_uuid: QRouter1 qrouter_volume_2_att: type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: qrouter_volume_2 - instance_uuid: QRouter + instance_uuid: QRouter1 qrouter_volume_1_att: type: org.openecomp.relationships.VolumeAttachesTo properties: volume_id: qrouter_volume_1 - instance_uuid: QRouter + instance_uuid: QRouter1 groups: FEAdd_On_Module_QRouterTemplate_group: type: org.openecomp.groups.heat.HeatStack properties: heat_file: ../Artifacts/FEAdd_On_Module_QRouterTemplate.yaml members: - - QRouter - 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: - disk.usage_QRouter: - - QRouter - - disk.usage network.outgoing.bytes_cdr_network_port: - cdr_network_port - network.outgoing.bytes - disk.write.bytes_QRouter: - - QRouter - - disk.write.bytes + binding_QRouter1: + - QRouter1 + - binding attachment_oam_private_net_network_port: - oam_private_net_network_port - attachment feature_qrouter_volume_1: - qrouter_volume_1 - feature - disk.device.write.bytes_QRouter: - - QRouter - - disk.device.write.bytes feature_qrouter_volume_2: - qrouter_volume_2 - feature - endpoint_QRouter: - - QRouter - - endpoint feature_qrouter_volume_0: - qrouter_volume_0 - feature attachment_qrouter_volume_2: - qrouter_volume_2 - attachment - disk.capacity_QRouter: - - QRouter - - disk.capacity + cpu_util_QRouter1: + - QRouter1 + - cpu_util attachment_qrouter_volume_0: - qrouter_volume_0 - attachment - disk.read.bytes.rate_QRouter: - - QRouter - - disk.read.bytes.rate attachment_qrouter_volume_1: - qrouter_volume_1 - attachment @@ -376,172 +364,181 @@ topology_template: network.incoming.packets_cdr_network_port: - cdr_network_port - network.incoming.packets + disk.device.read.bytes.rate_QRouter1: + - QRouter1 + - disk.device.read.bytes.rate network.outgoing.bytes.rate_oam_private_net_network_port: - oam_private_net_network_port - network.outgoing.bytes.rate - instance_QRouter: - - QRouter - - instance - disk.device.latency_QRouter: - - QRouter - - disk.device.latency - disk.device.usage_QRouter: - - QRouter - - disk.device.usage - disk.ephemeral.size_QRouter: - - QRouter - - disk.ephemeral.size - disk.device.iops_QRouter: - - QRouter - - disk.device.iops + disk.device.read.bytes_QRouter1: + - QRouter1 + - disk.device.read.bytes 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 - disk.device.read.bytes_QRouter: - - QRouter - - disk.device.read.bytes - disk.iops_QRouter: - - QRouter - - disk.iops + memory.resident_QRouter1: + - QRouter1 + - memory.resident + disk.device.latency_QRouter1: + - QRouter1 + - disk.device.latency + host_QRouter1: + - QRouter1 + - host feature_cdr_network_port: - cdr_network_port - feature - disk.device.read.requests.rate_QRouter: - - QRouter - - disk.device.read.requests.rate - disk.read.bytes_QRouter: - - QRouter - - disk.read.bytes - memory.resident_QRouter: - - QRouter - - memory.resident - host_QRouter: - - QRouter - - host + 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 - memory_QRouter: - - QRouter - - memory - disk.device.read.requests_QRouter: - - QRouter - - disk.device.read.requests - scalable_QRouter: - - QRouter - - scalable - os_QRouter: - - QRouter - - os + instance_QRouter1: + - QRouter1 + - instance + disk.root.size_QRouter1: + - QRouter1 + - disk.root.size + vcpus_QRouter1: + - QRouter1 + - vcpus network.incoming.bytes_oam_private_net_network_port: - oam_private_net_network_port - network.incoming.bytes - disk.write.bytes.rate_QRouter: - - QRouter - - disk.write.bytes.rate feature_oam_private_net_network_port: - oam_private_net_network_port - feature - cpu_util_QRouter: - - QRouter - - cpu_util + cpu.delta_QRouter1: + - QRouter1 + - cpu.delta + disk.capacity_QRouter1: + - QRouter1 + - disk.capacity + memory.usage_QRouter1: + - QRouter1 + - memory.usage + disk.write.requests.rate_QRouter1: + - QRouter1 + - disk.write.requests.rate + disk.read.requests_QRouter1: + - QRouter1 + - disk.read.requests + feature_QRouter1: + - QRouter1 + - feature network.incoming.bytes.rate_oam_private_net_network_port: - oam_private_net_network_port - network.incoming.bytes.rate - disk.device.write.requests_QRouter: - - QRouter - - disk.device.write.requests - disk.device.read.bytes.rate_QRouter: - - QRouter - - disk.device.read.bytes.rate + disk.ephemeral.size_QRouter1: + - QRouter1 + - disk.ephemeral.size + disk.latency_QRouter1: + - QRouter1 + - disk.latency + disk.device.capacity_QRouter1: + - QRouter1 + - disk.device.capacity network.incoming.bytes.rate_cdr_network_port: - cdr_network_port - network.incoming.bytes.rate - disk.device.allocation_QRouter: - - QRouter - - disk.device.allocation network.outgoing.bytes_oam_private_net_network_port: - oam_private_net_network_port - network.outgoing.bytes - disk.device.capacity_QRouter: - - QRouter - - disk.device.capacity - feature_QRouter: - - QRouter - - feature - disk.read.requests_QRouter: - - QRouter - - disk.read.requests - disk.device.write.bytes.rate_QRouter: - - QRouter - - disk.device.write.bytes.rate - disk.write.requests_QRouter: - - QRouter - - disk.write.requests - disk.root.size_QRouter: - - QRouter - - disk.root.size - memory.usage_QRouter: - - QRouter - - memory.usage + disk.iops_QRouter1: + - QRouter1 + - disk.iops + disk.device.write.requests_QRouter1: + - QRouter1 + - disk.device.write.requests + disk.device.write.requests.rate_QRouter1: + - QRouter1 + - disk.device.write.requests.rate + disk.device.allocation_QRouter1: + - QRouter1 + - disk.device.allocation + memory_QRouter1: + - QRouter1 + - memory + disk.usage_QRouter1: + - QRouter1 + - disk.usage + 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 - cpu_QRouter: - - QRouter - - cpu - vcpus_QRouter: - - QRouter - - vcpus - disk.allocation_QRouter: - - QRouter - - disk.allocation network.incoming.packets.rate_cdr_network_port: - cdr_network_port - network.incoming.packets.rate + disk.write.bytes_QRouter1: + - QRouter1 + - disk.write.bytes + disk.write.requests_QRouter1: + - QRouter1 + - disk.write.requests network.incoming.packets_oam_private_net_network_port: - oam_private_net_network_port - network.incoming.packets + cpu_QRouter1: + - QRouter1 + - cpu + os_QRouter1: + - QRouter1 + - os + disk.device.read.requests.rate_QRouter1: + - QRouter1 + - disk.device.read.requests.rate network.incoming.packets.rate_oam_private_net_network_port: - oam_private_net_network_port - network.incoming.packets.rate - disk.device.write.requests.rate_QRouter: - - QRouter - - disk.device.write.requests.rate - cpu.delta_QRouter: - - QRouter - - cpu.delta - binding_QRouter: - - QRouter - - binding + disk.read.bytes_QRouter1: + - QRouter1 + - disk.read.bytes binding_cdr_network_port: - cdr_network_port - binding + 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.latency_QRouter: - - QRouter - - disk.latency - disk.write.requests.rate_QRouter: - - QRouter - - disk.write.requests.rate + disk.device.iops_QRouter1: + - QRouter1 + - disk.device.iops + disk.read.bytes.rate_QRouter1: + - QRouter1 + - disk.read.bytes.rate + endpoint_QRouter1: + - QRouter1 + - endpoint + disk.allocation_QRouter1: + - QRouter1 + - disk.allocation + disk.device.read.requests_QRouter1: + - QRouter1 + - disk.device.read.requests network.outgoing.packets.rate_oam_private_net_network_port: - oam_private_net_network_port - network.outgoing.packets.rate requirements: - local_storage_QRouter: - - QRouter + local_storage_QRouter1: + - QRouter1 - local_storage - dependency_QRouter: - - QRouter - - dependency dependency_qrouter_volume_1: - qrouter_volume_1 - dependency @@ -562,4 +559,7 @@ topology_template: - dependency link_cdr_network_port: - cdr_network_port - - link \ No newline at end of file + - link + dependency_QRouter1: + - QRouter1 + - 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 4d7aa4f012..86de04a96c 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,20 +131,6 @@ node_types: required: true status: SUPPORTED requirements: - - dependency_QRouter: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - local_storage_QRouter: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - dependency_qrouter_volume_1: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -179,6 +165,20 @@ node_types: occurrences: - 0 - UNBOUNDED + - dependency_QRouter1: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - local_storage_QRouter1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED - dependency_oam_private_net_network_port: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -193,21 +193,14 @@ node_types: - 1 - 1 capabilities: - disk.usage_QRouter: - 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_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.write.bytes_QRouter: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_QRouter1: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED @@ -221,22 +214,11 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_QRouter: - 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_qrouter_volume_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - endpoint_QRouter: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED feature_qrouter_volume_0: type: tosca.capabilities.Node occurrences: @@ -247,7 +229,7 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.capacity_QRouter: + cpu_util_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: @@ -258,12 +240,6 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.bytes.rate_QRouter: - 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_qrouter_volume_1: type: tosca.capabilities.Attachment occurrences: @@ -280,160 +256,161 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_oam_private_net_network_port: + 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. occurrences: - 1 - UNBOUNDED - instance_QRouter: + network.outgoing.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 - disk.device.latency_QRouter: + disk.device.read.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: - 1 - UNBOUNDED - disk.device.usage_QRouter: + 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. occurrences: - 1 - UNBOUNDED - disk.ephemeral.size_QRouter: + 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 - disk.device.iops_QRouter: + 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. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_oam_private_net_network_port: + disk.device.latency_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.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. + host_QRouter1: + type: tosca.capabilities.Container + valid_source_types: + - tosca.nodes.SoftwareComponent occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_QRouter: - 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: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.iops_QRouter: + 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. occurrences: - 1 - UNBOUNDED - feature_cdr_network_port: - type: tosca.capabilities.Node + disk.device.usage_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 - disk.device.read.requests.rate_QRouter: + 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. occurrences: - 1 - UNBOUNDED - disk.read.bytes_QRouter: + instance_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 - memory.resident_QRouter: + disk.root.size_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 - host_QRouter: - type: tosca.capabilities.Container - valid_source_types: - - tosca.nodes.SoftwareComponent + vcpus_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.incoming.bytes_cdr_network_port: + 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_QRouter: - 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: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.read.requests_QRouter: + cpu.delta_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 - scalable_QRouter: - type: tosca.capabilities.Scalable + disk.capacity_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 - os_QRouter: - type: tosca.capabilities.OperatingSystem + memory.usage_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.incoming.bytes_oam_private_net_network_port: + disk.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. occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_QRouter: + disk.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. occurrences: - 1 - UNBOUNDED - feature_oam_private_net_network_port: + feature_QRouter1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - cpu_util_QRouter: + 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 - network.incoming.bytes.rate_oam_private_net_network_port: + disk.ephemeral.size_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 - disk.device.write.requests_QRouter: + disk.latency_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 - disk.device.read.bytes.rate_QRouter: + disk.device.capacity_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: @@ -445,56 +422,50 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.allocation_QRouter: + 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: + disk.iops_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 - disk.device.capacity_QRouter: + disk.device.write.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. occurrences: - 1 - UNBOUNDED - feature_QRouter: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.read.requests_QRouter: + 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. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_QRouter: + disk.device.allocation_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 - disk.write.requests_QRouter: + 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. occurrences: - 1 - UNBOUNDED - disk.root.size_QRouter: + disk.usage_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 - memory.usage_QRouter: - 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 @@ -511,56 +482,56 @@ node_types: occurrences: - 0 - UNBOUNDED - cpu_QRouter: + network.incoming.packets.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. occurrences: - 1 - UNBOUNDED - vcpus_QRouter: + disk.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: - 1 - UNBOUNDED - disk.allocation_QRouter: + disk.write.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. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_cdr_network_port: + 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.packets_oam_private_net_network_port: + cpu_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.incoming.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. + os_QRouter1: + type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_QRouter: + disk.device.read.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. occurrences: - 1 - UNBOUNDED - cpu.delta_QRouter: + network.incoming.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 - binding_QRouter: - type: tosca.capabilities.network.Bindable + disk.read.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: - 1 - UNBOUNDED @@ -571,19 +542,48 @@ node_types: occurrences: - 0 - UNBOUNDED + 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 + 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: + - 1 + - UNBOUNDED network.outgoing.packets.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. occurrences: - 1 - UNBOUNDED - disk.latency_QRouter: + disk.device.iops_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 + disk.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. + occurrences: + - 1 + - UNBOUNDED + endpoint_QRouter1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + disk.allocation_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 - disk.write.requests.rate_QRouter: + 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. occurrences: 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 b6e1ec9cd6..7d2364e084 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 @@ -733,91 +733,6 @@ topology_template: capability: tosca.capabilities.Node node: packet_internal_network relationship: tosca.relationships.DependsOn - QRouter: - type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_QRouterTemplate - directives: - - substitutable - properties: - vf_module_id: - get_input: vf_module_id - qrouter_cluster_name: - get_input: qrouter_cluster_name - oam_private_net_name: - get_input: oam_private_net_name - qrouter_flavor_name: - get_input: qrouter_flavor_name - version_number: - get_input: version_number - vf_module_name: - get_input: vf_module_name - service_template_filter: - substitute_service_template: FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml - domain_name: - get_input: domain_name - ntp_timezone: - get_input: ntp_timezone - vnf_id: - get_input: vnf_id - availability_zone_0: - get_input: availability_zone_0 - region_name: - get_input: region_name - manager_name_0: - get_input: manager_name_0 - qrouter_names: - get_input: qrouter_names - tenant_name: - get_input: tenant_name - security_group: security_group - cdr_network: - get_input: cdr_network - qrouter_image_name: - get_input: base_image_name - qrouter_volume_type_1: - get_input: qrouter_volume_type_1 - qrouter_volume_type_2: - get_input: qrouter_volume_type_2 - qrouter_node_count: - get_input: qrouter_node_count - qrouter_volume_name_2: - get_input: qrouter_volume_name_2 - qrouter_volume_name_1: - get_input: qrouter_volume_name_1 - qrouter_volume_name_0: - get_input: qrouter_volume_name_0 - qrouter_volume_type_0: - get_input: qrouter_volume_type_0 - qrouter_volume_size_0: - get_input: qrouter_volume_size_0 - qrouter_volume_size_1: - get_input: qrouter_volume_size_1 - manager_oam_direct_ip_0: - get_input: manager_oam_direct_ip_0 - qrouter_volume_size_2: - get_input: qrouter_volume_size_2 - rpmrepository_ip_0: - get_input: rpmrepository_ip_0 - requirements: - - dependency: - capability: tosca.capabilities.Node - node: security_group - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_mirror_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn - - dependency: - capability: tosca.capabilities.Node - node: packet_internal_network - relationship: tosca.relationships.DependsOn packet_mirror_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net properties: @@ -915,11 +830,11 @@ topology_template: requirements: - port: capability: attachment_oam_private_net_network_port - node: QRouter + node: QRouter0 relationship: org.openecomp.relationships.AttachesTo - port: capability: attachment_cdr_network_port - node: QRouter + node: QRouter0 relationship: org.openecomp.relationships.AttachesTo - port: capability: attachment_oam_private_net_network_port @@ -957,6 +872,91 @@ topology_template: capability: attachment_packet_internal_network_port node: vProbe relationship: org.openecomp.relationships.AttachesTo + QRouter0: + type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_QRouterTemplate + directives: + - substitutable + properties: + vf_module_id: + get_input: vf_module_id + qrouter_cluster_name: + get_input: qrouter_cluster_name + oam_private_net_name: + get_input: oam_private_net_name + qrouter_flavor_name: + get_input: qrouter_flavor_name + version_number: + get_input: version_number + vf_module_name: + get_input: vf_module_name + service_template_filter: + substitute_service_template: FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml + domain_name: + get_input: domain_name + ntp_timezone: + get_input: ntp_timezone + vnf_id: + get_input: vnf_id + availability_zone_0: + get_input: availability_zone_0 + region_name: + get_input: region_name + manager_name_0: + get_input: manager_name_0 + qrouter_names: + get_input: qrouter_names + tenant_name: + get_input: tenant_name + security_group: security_group + cdr_network: + get_input: cdr_network + qrouter_image_name: + get_input: base_image_name + qrouter_volume_type_1: + get_input: qrouter_volume_type_1 + qrouter_volume_type_2: + get_input: qrouter_volume_type_2 + qrouter_node_count: + get_input: qrouter_node_count + qrouter_volume_name_2: + get_input: qrouter_volume_name_2 + qrouter_volume_name_1: + get_input: qrouter_volume_name_1 + qrouter_volume_name_0: + get_input: qrouter_volume_name_0 + qrouter_volume_type_0: + get_input: qrouter_volume_type_0 + qrouter_volume_size_0: + get_input: qrouter_volume_size_0 + qrouter_volume_size_1: + get_input: qrouter_volume_size_1 + manager_oam_direct_ip_0: + get_input: manager_oam_direct_ip_0 + qrouter_volume_size_2: + get_input: qrouter_volume_size_2 + rpmrepository_ip_0: + get_input: rpmrepository_ip_0 + requirements: + - dependency: + capability: tosca.capabilities.Node + node: security_group + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: packet_mirror_network + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: packet_mirror_network + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: packet_internal_network + relationship: tosca.relationships.DependsOn + - dependency: + capability: tosca.capabilities.Node + node: packet_internal_network + relationship: tosca.relationships.DependsOn vLB: type: org.openecomp.resource.abstract.nodes.heat.FEAdd_On_Module_vLBTemplate directives: @@ -1062,8 +1062,8 @@ topology_template: members: - vLBAgent - vProbe - - QRouter - packet_mirror_network - packet_internal_network - security_group + - QRouter0 - vLB \ No newline at end of file -- cgit 1.2.3-korg