diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity')
8 files changed, 432 insertions, 432 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml index 65a952dcca..30c7aa24c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no-nova.yaml @@ -10,7 +10,7 @@ parameters: resources: - jsa_security_group: + jsa_security_group_1: type: OS::Neutron::SecurityGroup properties: description: ems security group @@ -29,7 +29,7 @@ resources: {"direction": ingress, "ethertype": IPv6, "protocol": icmp, "remote_ip_prefix": "::/0"} ] - dependsOn_network: + dependsOn_network_0: type: OS::Neutron::Net properties: name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml index 2548875c75..c91f0a304d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/in/nested-no_vfc_v0.1.yaml @@ -74,8 +74,8 @@ resources: flavor: { get_param: pcma_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_0} - - port: { get_resource: pcm_port_1} + - port: { get_resource: pcm_port_0_0} + - port: { get_resource: pcm_port_1_0} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} @@ -90,15 +90,15 @@ resources: flavor: { get_param: pcma_flavor_name } availability_zone: { get_param: availabilityzone_name } networks: - - port: { get_resource: pcm_port_2} - - port: { get_resource: pcm_port_3} + - port: { get_resource: pcm_port_2_0} + - port: { get_resource: pcm_port_3_0} block_device_mapping: - device_name: vdb volume_id: { get_param: pcm_vol} user_data_format: RAW scheduler_hints: { group: { get_param: server_group } } - pcm_port_0: + pcm_port_0_0: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -106,7 +106,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_1: + pcm_port_1_0: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } @@ -114,7 +114,7 @@ resources: - ip_address: { get_param: oam_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_2: + pcm_port_2_0: type: OS::Neutron::Port properties: network: { get_param: cps_net_name } @@ -122,7 +122,7 @@ resources: - ip_address: { get_param: cps_net_ip } security_groups: [{ get_param: security_group_name }] - pcm_port_3: + pcm_port_3_0: type: OS::Neutron::Port properties: network: { get_param: oam_net_name } @@ -132,4 +132,4 @@ resources: outputs: portId: - value: { get_resource: pcm_port_3 }
\ No newline at end of file + value: { get_resource: pcm_port_3_0 }
\ 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/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index e44080f340..4b764a3b84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -94,524 +94,484 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_pcm_port_2: + - dependency_server_pcma2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_2: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_pcma2: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_pcm_port_1: + - 0 + - UNBOUNDED + - dependency_server_pcma1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_1: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo + - local_storage_server_pcma1: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo occurrences: - - 1 - - 1 - - dependency_pcm_port_3: + - 0 + - UNBOUNDED + - dependency_pcm_port_2_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_3: + - link_pcm_port_2_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_server_pcma2: + - dependency_pcm_port_3_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcma2: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_port_3_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_server_pcma1: + - 1 + - 1 + - dependency_pcm_port_0_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_server_pcma1: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo + - link_pcm_port_0_0: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo occurrences: - - 0 - - UNBOUNDED - - dependency_pcm_port_0: + - 1 + - 1 + - dependency_pcm_port_1_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pcm_port_0: + - link_pcm_port_1_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_pcm_port_0: + network.outpoing.packets_pcm_port_2_0: 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_pcm_port_3: + disk.device.iops_server_pcma2: 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_pcm_port_2: + network.outgoing.bytes.rate_pcm_port_1_0: 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_pcm_port_1: + disk.device.iops_server_pcma1: 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_pcm_port_1: + network.incoming.bytes.rate_pcm_port_0_0: 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_server_pcma2: + disk.device.capacity_server_pcma2: 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_pcm_port_0: + disk.device.capacity_server_pcma1: 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_pcm_port_3: + disk.read.requests_server_pcma2: 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_pcm_port_2: + disk.read.requests_server_pcma1: 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_server_pcma1: + disk.write.requests.rate_server_pcma1: 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_server_pcma2: + network.incoming.packets_pcm_port_1_0: 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_server_pcma1: + network.incoming.bytes_pcm_port_0_0: 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.requests_server_pcma2: + disk.write.requests.rate_server_pcma2: 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.requests_server_pcma1: + memory_server_pcma2: 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_server_pcma1: + memory_server_pcma1: 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_server_pcma2: + disk.device.read.bytes.rate_server_pcma1: 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_server_pcma2: + feature_pcm_port_0_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED + disk.device.read.bytes.rate_server_pcma2: 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_server_pcma1: + disk.device.latency_server_pcma2: 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_server_pcma1: + disk.device.usage_server_pcma2: 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_pcm_port_3: + disk.device.latency_server_pcma1: 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_server_pcma2: + disk.device.usage_server_pcma1: 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_pcm_port_3: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + disk.device.read.requests_server_pcma1: + 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.latency_server_pcma2: + network.outgoing.packets.rate_pcm_port_3_0: 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_server_pcma2: + disk.device.read.requests_server_pcma2: 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_pcm_port_0: + attachment_pcm_port_0_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_pcm_port_0_0: 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_server_pcma1: + disk.write.bytes_server_pcma2: 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_pcm_port_2: + disk.device.read.requests.rate_server_pcma1: 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_pcm_port_1: + disk.device.read.requests.rate_server_pcma2: 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_server_pcma1: + disk.write.bytes_server_pcma1: 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_pcm_port_0: + binding_server_pcma1: type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 0 + - 1 - UNBOUNDED - binding_pcm_port_1: + binding_server_pcma2: type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 0 + - 1 - UNBOUNDED - binding_pcm_port_2: + network.outgoing.bytes_pcm_port_3_0: + 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_pcm_port_1_0: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED - network.incoming.bytes_pcm_port_3: + disk.write.bytes.rate_server_pcma2: 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_pcm_port_3: + disk.write.bytes.rate_server_pcma1: 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_server_pcma1: + disk.root.size_server_pcma2: 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_server_pcma2: + disk.root.size_server_pcma1: 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_pcm_port_0: + network.outgoing.bytes_pcm_port_1_0: 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_pcm_port_1: + network.outgoing.bytes.rate_pcm_port_0_0: 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_server_pcma2: + network.outpoing.packets_pcm_port_3_0: 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_server_pcma1: + disk.iops_server_pcma2: 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_pcm_port_2: + disk.iops_server_pcma1: 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_server_pcma2: + network.incoming.bytes.rate_pcm_port_3_0: 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_server_pcma1: + disk.device.write.bytes.rate_server_pcma1: 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_pcm_port_1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - binding_server_pcma1: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_0: + disk.device.write.bytes.rate_server_pcma2: 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_server_pcma2: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_2: + network.incoming.packets_pcm_port_0_0: 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_pcm_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - feature_pcm_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes_pcm_port_1: + network.incoming.bytes_pcm_port_1_0: 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_pcm_port_0: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - attachment_pcm_port_1: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_server_pcma2: + disk.read.bytes_server_pcma1: 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_pcm_port_2: - type: tosca.capabilities.Attachment + feature_pcm_port_3_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes.rate_server_pcma1: + disk.read.bytes_server_pcma2: 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_pcm_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - disk.root.size_server_pcma2: + cpu_util_server_pcma1: 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_server_pcma1: + cpu_util_server_pcma2: 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_server_pcma2: + network.outgoing.packets.rate_pcm_port_2_0: 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_server_pcma1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_3_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pcma1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pcma2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_server_pcma2: + network.incoming.packets.rate_pcm_port_3_0: 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_server_pcma1: + memory.usage_server_pcma2: 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_server_pcma2: + memory.usage_server_pcma1: 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_util_server_pcma1: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_server_pcma1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - cpu_util_server_pcma2: + network.outgoing.bytes_pcm_port_2_0: 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_server_pcma2: - type: tosca.capabilities.Node + binding_pcm_port_0_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED - memory.usage_server_pcma2: + disk.read.bytes.rate_server_pcma1: 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_server_pcma1: + disk.device.read.bytes_server_pcma2: 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_server_pcma1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.read.bytes.rate_server_pcma1: + disk.device.read.bytes_server_pcma1: 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_server_pcma2: + network.outpoing.packets_pcm_port_0_0: 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_server_pcma1: + network.outgoing.bytes_pcm_port_0_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -659,6 +619,18 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pcm_port_2_0: + 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_pcm_port_3_0: + 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_server_pcma1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -695,6 +667,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pcm_port_3_0: + 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_server_pcma2: type: tosca.capabilities.Scalable occurrences: @@ -705,6 +683,17 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pcm_port_2_0: + 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_pcm_port_2_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests_server_pcma1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -741,83 +730,100 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_pcm_port_2_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED os_server_pcma1: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pcm_port_1_0: + 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_server_pcma2: type: tosca.capabilities.OperatingSystem occurrences: - 1 - UNBOUNDED - disk.capacity_server_pcma1: + network.incoming.packets.rate_pcm_port_2_0: 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_server_pcma2: + binding_pcm_port_3_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.outpoing.packets_pcm_port_1_0: 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_server_pcma1: + network.incoming.bytes.rate_pcm_port_1_0: 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_server_pcma2: + network.outgoing.bytes.rate_pcm_port_2_0: 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_pcm_port_1: + disk.capacity_server_pcma1: 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_pcm_port_0: + disk.capacity_server_pcma2: 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_pcm_port_2: + network.incoming.packets_pcm_port_2_0: 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_pcm_port_0: + disk.write.requests_server_pcma1: 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_pcm_port_3: + disk.write.requests_server_pcma2: 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_server_pcma2: + network.incoming.bytes_pcm_port_3_0: 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_pcm_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. + feature_pcm_port_1_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pcm_port_3: + disk.usage_server_pcma2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -841,12 +847,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pcm_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_server_pcma2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -859,65 +859,65 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.bytes_server_pcma2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pcm_port_1_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.allocation_server_pcma1: + disk.device.write.bytes_server_pcma2: 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_server_pcma2: + disk.allocation_server_pcma1: 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_server_pcma1: + network.incoming.packets.rate_pcm_port_1_0: 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_server_pcma1: + disk.allocation_server_pcma2: 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_pcm_port_0: + disk.device.write.bytes_server_pcma1: 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_server_pcma2: + network.outgoing.packets.rate_pcm_port_0_0: 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_pcm_port_3: + cpu_server_pcma1: 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_pcm_port_2: + cpu_server_pcma2: 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_pcm_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. + binding_pcm_port_2_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED org.openecomp.resource.abstract.nodes.pcma_server: derived_from: org.openecomp.resource.abstract.nodes.VFC @@ -2660,11 +2660,11 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED @@ -2678,18 +2678,18 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -2738,16 +2738,16 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_pcm_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED port_pcm_port_1_order: type: integer required: true @@ -5392,50 +5392,50 @@ node_types: type: string status: SUPPORTED requirements: - - dependency_dependsOn_network: + - dependency_jsa_security_group_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_jsa_security_group: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - - port_jsa_security_group: + - port_jsa_security_group_1: capability: tosca.capabilities.Attachment node: org.openecomp.resource.cp.nodes.heat.network.neutron.Port relationship: org.openecomp.relationships.AttachesTo occurrences: - 0 - UNBOUNDED - capabilities: - end_point_dependsOn_network: - type: tosca.capabilities.Endpoint + - dependency_dependsOn_network_0: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn occurrences: - - 1 + - 0 - UNBOUNDED - link_dependsOn_network: - type: tosca.capabilities.network.Linkable + capabilities: + feature_jsa_security_group_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_jsa_security_group: + feature_dependsOn_network_0: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_dependsOn_network: - type: tosca.capabilities.Node + link_dependsOn_network_0: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - attachment_dependsOn_network: + attachment_dependsOn_network_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED + end_point_dependsOn_network_0: + type: tosca.capabilities.Endpoint + 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/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index 15a079d930..14cf9ceae0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -102,11 +102,11 @@ topology_template: - 0 cps_net_name: nested_network requirements: - - link_pcm_port_2: + - link_pcm_port_2_0: capability: tosca.capabilities.network.Linkable node: nested_network relationship: tosca.relationships.network.LinksTo - - link_pcm_port_0: + - link_pcm_port_0_0: capability: tosca.capabilities.network.Linkable node: nested_network relationship: tosca.relationships.network.LinksTo @@ -686,19 +686,19 @@ topology_template: node: 4p_nested relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pcm_port_0 + capability: attachment_pcm_port_0_0 node: nestedNoNestedSingleComputePattern relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pcm_port_1 + capability: attachment_pcm_port_3_0 node: nestedNoNestedSingleComputePattern relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pcm_port_2 + capability: attachment_pcm_port_2_0 node: nestedNoNestedSingleComputePattern relationship: org.openecomp.relationships.AttachesTo - port: - capability: attachment_pcm_port_3 + capability: attachment_pcm_port_1_0 node: nestedNoNestedSingleComputePattern relationship: org.openecomp.relationships.AttachesTo abstract_b_single_1b_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml index 41bef51803..4a2f034765 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_serverServiceTemplate.yaml @@ -441,4 +441,4 @@ topology_template: - link link_pcma_server_pcm_port_3: - pcma_server_pcm_port_3 - - link + - 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/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml index 0079f2a476..0e25828e1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -55,10 +55,10 @@ topology_template: port_pcm_port_0_network_role_tag: type: string required: true - port_pcm_port_0_exCP_naming: + port_pcm_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pcm_port_1_exCP_naming: + port_pcm_port_0_exCP_naming: type: org.openecomp.datatypes.Naming required: true port_pcm_port_1_network_role: @@ -69,16 +69,16 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_ip_requirements: + port_pcm_port_1_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_1_security_groups: + type: json + port_pcm_port_0_ip_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.IpRequirements compute_pcma_server_config_drive: type: list required: true @@ -119,14 +119,14 @@ topology_template: required: true entry_schema: type: string - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_pcm_port_1_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_port_1_order: type: integer required: true @@ -432,4 +432,4 @@ topology_template: - link dependency_pcma_server_pcm_port_0: - pcma_server_pcm_port_0 - - dependency + - 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/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml index 23bca38425..6dcce5e85d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no-novaServiceTemplate.yaml @@ -17,12 +17,7 @@ topology_template: immutable: false type: string node_templates: - dependsOn_network: - type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net - properties: - network_name: - get_input: net_name - jsa_security_group: + jsa_security_group_1: type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules properties: name: @@ -93,6 +88,11 @@ topology_template: ethertype: IPv6 remote_ip_prefix: ::/0 direction: ingress + dependsOn_network_0: + type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net + properties: + network_name: + get_input: net_name groups: nested-no-nova_group: type: org.openecomp.groups.heat.HeatStack @@ -100,36 +100,36 @@ topology_template: heat_file: ../Artifacts/nested-no-nova.yaml description: heat template that creates PCRF Cluman stack members: - - dependsOn_network - - jsa_security_group + - jsa_security_group_1 + - dependsOn_network_0 outputs: output1: value: myOutput substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-no-nova capabilities: - end_point_dependsOn_network: - - dependsOn_network - - end_point - link_dependsOn_network: - - dependsOn_network - - link - feature_jsa_security_group: - - jsa_security_group + feature_jsa_security_group_1: + - jsa_security_group_1 - feature - feature_dependsOn_network: - - dependsOn_network + feature_dependsOn_network_0: + - dependsOn_network_0 - feature - attachment_dependsOn_network: - - dependsOn_network + link_dependsOn_network_0: + - dependsOn_network_0 + - link + attachment_dependsOn_network_0: + - dependsOn_network_0 - attachment + end_point_dependsOn_network_0: + - dependsOn_network_0 + - end_point requirements: - dependency_dependsOn_network: - - dependsOn_network + dependency_dependsOn_network_0: + - dependsOn_network_0 - dependency - port_jsa_security_group: - - jsa_security_group + port_jsa_security_group_1: + - jsa_security_group_1 - port - dependency_jsa_security_group: - - jsa_security_group - - dependency + dependency_jsa_security_group_1: + - jsa_security_group_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/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 676798e9a3..c66869707d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -108,7 +108,7 @@ topology_template: directives: - substitutable properties: - port_pcm_port_1_network_role_tag: cps + port_pcm_port_1_network_role_tag: oam port_pcm_port_0_fixed_ips: - ip_address: get_input: cps_net_ip @@ -123,14 +123,14 @@ topology_template: port_pcm_port_0_network_role_tag: cps port_pcm_port_1_network: - get_input: oam_net_name + port_pcm_port_1_security_groups: + - - get_input: security_group_name port_pcm_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_pcm_port_1_security_groups: - - - get_input: security_group_name compute_pcma_server_config_drive: - true compute_pcma_server_user_data_format: @@ -145,15 +145,15 @@ topology_template: get_input: oam_net_ip compute_pcma_server_name: - get_input: pcma_server_name - port_pcm_port_0_mac_requirements: - mac_count_required: - is_required: false port_pcm_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -192,7 +192,7 @@ topology_template: port_pcm_port_2_mac_requirements: mac_count_required: is_required: false - port_pcm_port_3_network_role_tag: cps + port_pcm_port_3_network_role_tag: oam compute_pcma_server_config_drive: - true port_pcm_port_3_fixed_ips: @@ -235,40 +235,25 @@ topology_template: - abstract_pcma_server_1 outputs: portId: - value: pcm_port_3 + value: pcm_port_3_0 substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested-no_vfc_v0.1 capabilities: - network.incoming.packets.rate_pcm_port_0: - - abstract_pcma_server_1 - - network.incoming.packets.rate_pcma_server_pcm_port_0 - network.incoming.packets.rate_pcm_port_3: + network.outpoing.packets_pcm_port_2_0: - abstract_pcma_server - - network.incoming.packets.rate_pcma_server_pcm_port_3 - network.incoming.packets.rate_pcm_port_2: - - abstract_pcma_server - - network.incoming.packets.rate_pcma_server_pcm_port_2 - network.incoming.packets.rate_pcm_port_1: - - abstract_pcma_server_1 - - network.incoming.packets.rate_pcma_server_pcm_port_1 - network.outpoing.packets_pcm_port_1: - - abstract_pcma_server_1 - - network.outpoing.packets_pcma_server_pcm_port_1 + - network.outpoing.packets_pcma_server_pcm_port_2 disk.device.iops_server_pcma2: - abstract_pcma_server - disk.device.iops_pcma_server - network.outpoing.packets_pcm_port_0: + network.outgoing.bytes.rate_pcm_port_1_0: - abstract_pcma_server_1 - - network.outpoing.packets_pcma_server_pcm_port_0 - network.outpoing.packets_pcm_port_3: - - abstract_pcma_server - - network.outpoing.packets_pcma_server_pcm_port_3 - network.outpoing.packets_pcm_port_2: - - abstract_pcma_server - - network.outpoing.packets_pcma_server_pcm_port_2 + - network.outgoing.bytes.rate_pcma_server_pcm_port_1 disk.device.iops_server_pcma1: - abstract_pcma_server_1 - disk.device.iops_pcma_server + network.incoming.bytes.rate_pcm_port_0_0: + - abstract_pcma_server_1 + - network.incoming.bytes.rate_pcma_server_pcm_port_0 disk.device.capacity_server_pcma2: - abstract_pcma_server - disk.device.capacity_pcma_server @@ -284,6 +269,12 @@ topology_template: disk.write.requests.rate_server_pcma1: - abstract_pcma_server_1 - disk.write.requests.rate_pcma_server + network.incoming.packets_pcm_port_1_0: + - abstract_pcma_server_1 + - network.incoming.packets_pcma_server_pcm_port_1 + network.incoming.bytes_pcm_port_0_0: + - abstract_pcma_server_1 + - network.incoming.bytes_pcma_server_pcm_port_0 disk.write.requests.rate_server_pcma2: - abstract_pcma_server - disk.write.requests.rate_pcma_server @@ -296,144 +287,111 @@ topology_template: disk.device.read.bytes.rate_server_pcma1: - abstract_pcma_server_1 - disk.device.read.bytes.rate_pcma_server - network.outgoing.bytes_pcm_port_3: - - abstract_pcma_server - - network.outgoing.bytes_pcma_server_pcm_port_3 + feature_pcm_port_0_0: + - abstract_pcma_server_1 + - feature_pcma_server_pcm_port_0 disk.device.read.bytes.rate_server_pcma2: - abstract_pcma_server - disk.device.read.bytes.rate_pcma_server - binding_pcm_port_3: - - abstract_pcma_server - - binding_pcma_server_pcm_port_3 disk.device.latency_server_pcma2: - abstract_pcma_server - disk.device.latency_pcma_server disk.device.usage_server_pcma2: - abstract_pcma_server - disk.device.usage_pcma_server - network.incoming.bytes_pcm_port_0: - - abstract_pcma_server_1 - - network.incoming.bytes_pcma_server_pcm_port_0 disk.device.latency_server_pcma1: - abstract_pcma_server_1 - disk.device.latency_pcma_server - network.incoming.bytes_pcm_port_2: - - abstract_pcma_server - - network.incoming.bytes_pcma_server_pcm_port_2 - network.incoming.bytes_pcm_port_1: - - abstract_pcma_server_1 - - network.incoming.bytes_pcma_server_pcm_port_1 disk.device.usage_server_pcma1: - abstract_pcma_server_1 - disk.device.usage_pcma_server - binding_pcm_port_0: - - abstract_pcma_server_1 - - binding_pcma_server_pcm_port_0 - binding_pcm_port_1: - - abstract_pcma_server_1 - - binding_pcma_server_pcm_port_1 - binding_pcm_port_2: - - abstract_pcma_server - - binding_pcma_server_pcm_port_2 - network.incoming.bytes_pcm_port_3: - - abstract_pcma_server - - network.incoming.bytes_pcma_server_pcm_port_3 - network.outgoing.packets.rate_pcm_port_3: - - abstract_pcma_server - - network.outgoing.packets.rate_pcma_server_pcm_port_3 disk.device.read.requests_server_pcma1: - abstract_pcma_server_1 - disk.device.read.requests_pcma_server + network.outgoing.packets.rate_pcm_port_3_0: + - abstract_pcma_server + - network.outgoing.packets.rate_pcma_server_pcm_port_3 disk.device.read.requests_server_pcma2: - abstract_pcma_server - disk.device.read.requests_pcma_server - network.outgoing.packets.rate_pcm_port_0: + attachment_pcm_port_0_0: - abstract_pcma_server_1 - - network.outgoing.packets.rate_pcma_server_pcm_port_0 - network.outgoing.packets.rate_pcm_port_1: + - attachment_pcma_server_pcm_port_0 + network.incoming.packets.rate_pcm_port_0_0: - abstract_pcma_server_1 - - network.outgoing.packets.rate_pcma_server_pcm_port_1 + - network.incoming.packets.rate_pcma_server_pcm_port_0 disk.write.bytes_server_pcma2: - abstract_pcma_server - disk.write.bytes_pcma_server disk.device.read.requests.rate_server_pcma1: - abstract_pcma_server_1 - disk.device.read.requests.rate_pcma_server - network.outgoing.packets.rate_pcm_port_2: - - abstract_pcma_server - - network.outgoing.packets.rate_pcma_server_pcm_port_2 disk.device.read.requests.rate_server_pcma2: - abstract_pcma_server - disk.device.read.requests.rate_pcma_server disk.write.bytes_server_pcma1: - abstract_pcma_server_1 - disk.write.bytes_pcma_server - feature_pcm_port_1: - - abstract_pcma_server_1 - - feature_pcma_server_pcm_port_1 binding_server_pcma1: - abstract_pcma_server_1 - binding_pcma_server - network.outgoing.bytes_pcm_port_0: - - abstract_pcma_server_1 - - network.outgoing.bytes_pcma_server_pcm_port_0 binding_server_pcma2: - abstract_pcma_server - binding_pcma_server - feature_pcm_port_0: - - abstract_pcma_server_1 - - feature_pcma_server_pcm_port_0 - network.outgoing.bytes_pcm_port_2: - - abstract_pcma_server - - network.outgoing.bytes_pcma_server_pcm_port_2 - feature_pcm_port_3: + network.outgoing.bytes_pcm_port_3_0: - abstract_pcma_server - - feature_pcma_server_pcm_port_3 - feature_pcm_port_2: - - abstract_pcma_server - - feature_pcma_server_pcm_port_2 - network.outgoing.bytes_pcm_port_1: - - abstract_pcma_server_1 - - network.outgoing.bytes_pcma_server_pcm_port_1 - attachment_pcm_port_0: - - abstract_pcma_server_1 - - attachment_pcma_server_pcm_port_0 - attachment_pcm_port_1: + - network.outgoing.bytes_pcma_server_pcm_port_3 + binding_pcm_port_1_0: - abstract_pcma_server_1 - - attachment_pcma_server_pcm_port_1 + - binding_pcma_server_pcm_port_1 disk.write.bytes.rate_server_pcma2: - abstract_pcma_server - disk.write.bytes.rate_pcma_server - attachment_pcm_port_2: - - abstract_pcma_server - - attachment_pcma_server_pcm_port_2 disk.write.bytes.rate_server_pcma1: - abstract_pcma_server_1 - disk.write.bytes.rate_pcma_server - attachment_pcm_port_3: - - abstract_pcma_server - - attachment_pcma_server_pcm_port_3 disk.root.size_server_pcma2: - abstract_pcma_server - disk.root.size_pcma_server disk.root.size_server_pcma1: - abstract_pcma_server_1 - disk.root.size_pcma_server + network.outgoing.bytes_pcm_port_1_0: + - abstract_pcma_server_1 + - network.outgoing.bytes_pcma_server_pcm_port_1 + network.outgoing.bytes.rate_pcm_port_0_0: + - abstract_pcma_server_1 + - network.outgoing.bytes.rate_pcma_server_pcm_port_0 + network.outpoing.packets_pcm_port_3_0: + - abstract_pcma_server + - network.outpoing.packets_pcma_server_pcm_port_3 disk.iops_server_pcma2: - abstract_pcma_server - disk.iops_pcma_server disk.iops_server_pcma1: - abstract_pcma_server_1 - disk.iops_pcma_server + network.incoming.bytes.rate_pcm_port_3_0: + - abstract_pcma_server + - network.incoming.bytes.rate_pcma_server_pcm_port_3 disk.device.write.bytes.rate_server_pcma1: - abstract_pcma_server_1 - disk.device.write.bytes.rate_pcma_server disk.device.write.bytes.rate_server_pcma2: - abstract_pcma_server - disk.device.write.bytes.rate_pcma_server + network.incoming.packets_pcm_port_0_0: + - abstract_pcma_server_1 + - network.incoming.packets_pcma_server_pcm_port_0 + network.incoming.bytes_pcm_port_1_0: + - abstract_pcma_server_1 + - network.incoming.bytes_pcma_server_pcm_port_1 disk.read.bytes_server_pcma1: - abstract_pcma_server_1 - disk.read.bytes_pcma_server + feature_pcm_port_3_0: + - abstract_pcma_server + - feature_pcma_server_pcm_port_3 disk.read.bytes_server_pcma2: - abstract_pcma_server - disk.read.bytes_pcma_server @@ -443,9 +401,18 @@ topology_template: cpu_util_server_pcma2: - abstract_pcma_server - cpu_util_pcma_server + network.outgoing.packets.rate_pcm_port_2_0: + - abstract_pcma_server + - network.outgoing.packets.rate_pcma_server_pcm_port_2 + attachment_pcm_port_3_0: + - abstract_pcma_server + - attachment_pcma_server_pcm_port_3 feature_server_pcma2: - abstract_pcma_server - feature_pcma_server + network.incoming.packets.rate_pcm_port_3_0: + - abstract_pcma_server + - network.incoming.packets.rate_pcma_server_pcm_port_3 memory.usage_server_pcma2: - abstract_pcma_server - memory.usage_pcma_server @@ -455,6 +422,12 @@ topology_template: feature_server_pcma1: - abstract_pcma_server_1 - feature_pcma_server + network.outgoing.bytes_pcm_port_2_0: + - abstract_pcma_server + - network.outgoing.bytes_pcma_server_pcm_port_2 + binding_pcm_port_0_0: + - abstract_pcma_server_1 + - binding_pcma_server_pcm_port_0 disk.read.bytes.rate_server_pcma1: - abstract_pcma_server_1 - disk.read.bytes.rate_pcma_server @@ -464,6 +437,12 @@ topology_template: disk.device.read.bytes_server_pcma1: - abstract_pcma_server_1 - disk.device.read.bytes_pcma_server + network.outpoing.packets_pcm_port_0_0: + - abstract_pcma_server_1 + - network.outpoing.packets_pcma_server_pcm_port_0 + network.outgoing.bytes_pcm_port_0_0: + - abstract_pcma_server_1 + - network.outgoing.bytes_pcma_server_pcm_port_0 endpoint_server_pcma2: - abstract_pcma_server - endpoint_pcma_server @@ -485,6 +464,12 @@ topology_template: host_server_pcma1: - abstract_pcma_server_1 - host_pcma_server + network.incoming.bytes.rate_pcm_port_2_0: + - abstract_pcma_server + - network.incoming.bytes.rate_pcma_server_pcm_port_2 + network.outgoing.bytes.rate_pcm_port_3_0: + - abstract_pcma_server + - network.outgoing.bytes.rate_pcma_server_pcm_port_3 disk.ephemeral.size_server_pcma1: - abstract_pcma_server_1 - disk.ephemeral.size_pcma_server @@ -503,12 +488,21 @@ topology_template: disk.device.write.requests.rate_server_pcma1: - abstract_pcma_server_1 - disk.device.write.requests.rate_pcma_server + network.incoming.packets_pcm_port_3_0: + - abstract_pcma_server + - network.incoming.packets_pcma_server_pcm_port_3 scalable_server_pcma2: - abstract_pcma_server - scalable_pcma_server scalable_server_pcma1: - abstract_pcma_server_1 - scalable_pcma_server + network.incoming.bytes_pcm_port_2_0: + - abstract_pcma_server + - network.incoming.bytes_pcma_server_pcm_port_2 + feature_pcm_port_2_0: + - abstract_pcma_server + - feature_pcma_server_pcm_port_2 disk.device.write.requests_server_pcma1: - abstract_pcma_server_1 - disk.device.write.requests_pcma_server @@ -527,48 +521,57 @@ topology_template: instance_server_pcma1: - abstract_pcma_server_1 - instance_pcma_server + attachment_pcm_port_2_0: + - abstract_pcma_server + - attachment_pcma_server_pcm_port_2 os_server_pcma1: - abstract_pcma_server_1 - os_pcma_server + network.outgoing.packets.rate_pcm_port_1_0: + - abstract_pcma_server_1 + - network.outgoing.packets.rate_pcma_server_pcm_port_1 os_server_pcma2: - abstract_pcma_server - os_pcma_server + network.incoming.packets.rate_pcm_port_2_0: + - abstract_pcma_server + - network.incoming.packets.rate_pcma_server_pcm_port_2 + binding_pcm_port_3_0: + - abstract_pcma_server + - binding_pcma_server_pcm_port_3 + network.outpoing.packets_pcm_port_1_0: + - abstract_pcma_server_1 + - network.outpoing.packets_pcma_server_pcm_port_1 + network.incoming.bytes.rate_pcm_port_1_0: + - abstract_pcma_server_1 + - network.incoming.bytes.rate_pcma_server_pcm_port_1 + network.outgoing.bytes.rate_pcm_port_2_0: + - abstract_pcma_server + - network.outgoing.bytes.rate_pcma_server_pcm_port_2 disk.capacity_server_pcma1: - abstract_pcma_server_1 - disk.capacity_pcma_server disk.capacity_server_pcma2: - abstract_pcma_server - disk.capacity_pcma_server + network.incoming.packets_pcm_port_2_0: + - abstract_pcma_server + - network.incoming.packets_pcma_server_pcm_port_2 disk.write.requests_server_pcma1: - abstract_pcma_server_1 - disk.write.requests_pcma_server disk.write.requests_server_pcma2: - abstract_pcma_server - disk.write.requests_pcma_server - network.outgoing.bytes.rate_pcm_port_1: - - abstract_pcma_server_1 - - network.outgoing.bytes.rate_pcma_server_pcm_port_1 - network.incoming.packets_pcm_port_0: - - abstract_pcma_server_1 - - network.incoming.packets_pcma_server_pcm_port_0 - network.outgoing.bytes.rate_pcm_port_2: + network.incoming.bytes_pcm_port_3_0: - abstract_pcma_server - - network.outgoing.bytes.rate_pcma_server_pcm_port_2 - network.outgoing.bytes.rate_pcm_port_0: + - network.incoming.bytes_pcma_server_pcm_port_3 + feature_pcm_port_1_0: - abstract_pcma_server_1 - - network.outgoing.bytes.rate_pcma_server_pcm_port_0 - network.incoming.packets_pcm_port_3: - - abstract_pcma_server - - network.incoming.packets_pcma_server_pcm_port_3 + - feature_pcma_server_pcm_port_1 disk.usage_server_pcma2: - abstract_pcma_server - disk.usage_pcma_server - network.incoming.packets_pcm_port_2: - - abstract_pcma_server - - network.incoming.packets_pcma_server_pcm_port_2 - network.outgoing.bytes.rate_pcm_port_3: - - abstract_pcma_server - - network.outgoing.bytes.rate_pcma_server_pcm_port_3 disk.usage_server_pcma1: - abstract_pcma_server_1 - disk.usage_pcma_server @@ -578,45 +581,42 @@ topology_template: memory.resident_server_pcma1: - abstract_pcma_server_1 - memory.resident_pcma_server - network.incoming.packets_pcm_port_1: - - abstract_pcma_server_1 - - network.incoming.packets_pcma_server_pcm_port_1 vcpus_server_pcma2: - abstract_pcma_server - vcpus_pcma_server memory.resident_server_pcma2: - abstract_pcma_server - memory.resident_pcma_server + attachment_pcm_port_1_0: + - abstract_pcma_server_1 + - attachment_pcma_server_pcm_port_1 disk.device.write.bytes_server_pcma2: - abstract_pcma_server - disk.device.write.bytes_pcma_server disk.allocation_server_pcma1: - abstract_pcma_server_1 - disk.allocation_pcma_server + network.incoming.packets.rate_pcm_port_1_0: + - abstract_pcma_server_1 + - network.incoming.packets.rate_pcma_server_pcm_port_1 disk.allocation_server_pcma2: - abstract_pcma_server - disk.allocation_pcma_server disk.device.write.bytes_server_pcma1: - abstract_pcma_server_1 - disk.device.write.bytes_pcma_server + network.outgoing.packets.rate_pcm_port_0_0: + - abstract_pcma_server_1 + - network.outgoing.packets.rate_pcma_server_pcm_port_0 cpu_server_pcma1: - abstract_pcma_server_1 - cpu_pcma_server - network.incoming.bytes.rate_pcm_port_0: - - abstract_pcma_server_1 - - network.incoming.bytes.rate_pcma_server_pcm_port_0 cpu_server_pcma2: - abstract_pcma_server - cpu_pcma_server - network.incoming.bytes.rate_pcm_port_3: - - abstract_pcma_server - - network.incoming.bytes.rate_pcma_server_pcm_port_3 - network.incoming.bytes.rate_pcm_port_2: + binding_pcm_port_2_0: - abstract_pcma_server - - network.incoming.bytes.rate_pcma_server_pcm_port_2 - network.incoming.bytes.rate_pcm_port_1: - - abstract_pcma_server_1 - - network.incoming.bytes.rate_pcma_server_pcm_port_1 + - binding_pcma_server_pcm_port_2 requirements: dependency_server_pcma2: - abstract_pcma_server @@ -624,33 +624,33 @@ topology_template: local_storage_server_pcma2: - abstract_pcma_server - local_storage_pcma_server - link_pcm_port_0: - - abstract_pcma_server_1 - - link_pcma_server_pcm_port_0 - link_pcm_port_1: - - abstract_pcma_server_1 - - link_pcma_server_pcm_port_1 dependency_server_pcma1: - abstract_pcma_server_1 - dependency_pcma_server local_storage_server_pcma1: - abstract_pcma_server_1 - local_storage_pcma_server - link_pcm_port_2: + dependency_pcm_port_3_0: - abstract_pcma_server - - link_pcma_server_pcm_port_2 - link_pcm_port_3: - - abstract_pcma_server - - link_pcma_server_pcm_port_3 - dependency_pcm_port_0: + - dependency_pcma_server_pcm_port_3 + link_pcm_port_1_0: - abstract_pcma_server_1 - - dependency_pcma_server_pcm_port_0 - dependency_pcm_port_3: + - link_pcma_server_pcm_port_1 + dependency_pcm_port_2_0: - abstract_pcma_server - - dependency_pcma_server_pcm_port_3 - dependency_pcm_port_1: + - dependency_pcma_server_pcm_port_2 + link_pcm_port_2_0: + - abstract_pcma_server + - link_pcma_server_pcm_port_2 + dependency_pcm_port_1_0: - abstract_pcma_server_1 - dependency_pcma_server_pcm_port_1 - dependency_pcm_port_2: + dependency_pcm_port_0_0: + - abstract_pcma_server_1 + - dependency_pcma_server_pcm_port_0 + link_pcm_port_0_0: + - abstract_pcma_server_1 + - link_pcma_server_pcm_port_0 + link_pcm_port_3_0: - abstract_pcma_server - - dependency_pcma_server_pcm_port_2 + - link_pcma_server_pcm_port_3
\ No newline at end of file |