diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out')
6 files changed, 857 insertions, 857 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index fcbfe72539..3c0d996aeb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -157,7 +157,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2_test_nested_level2: + - dependency_ps_server_1b_1_port_1_test_nested_level2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -199,14 +199,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + scalable_server_1b_ps_1_test_nested_level2: + type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED - scalable_server_1b_ps_1_test_nested_level2: - type: tosca.capabilities.Scalable + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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 @@ -239,6 +239,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -283,12 +289,22 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1_test_nested_level2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED network.outpoing.packets_pd_server_1b_port_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_ps_server_1b_1_port_1_test_nested_level2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -301,6 +317,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + 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_pd_server_1b_port_0: type: tosca.capabilities.Node occurrences: @@ -322,12 +344,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - 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_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -373,12 +389,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -478,6 +488,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -536,23 +552,12 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2_test_nested_level2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.allocation_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_port_2_test_nested_level2: - 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_server_1b_ps_1_test_nested_level2: type: tosca.capabilities.Endpoint.Admin occurrences: @@ -586,11 +591,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2_test_nested_level2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.bytes_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -626,6 +626,20 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_port_1_test_nested_level2: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + 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.rate_server_1b_pd_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -649,12 +663,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_1b_ps_1_test_nested_level2: 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_ps_server_1b_1_port_1_test_nested_level2: + 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_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -852,12 +878,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - 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_1b_pd_0: type: tosca.capabilities.OperatingSystem occurrences: @@ -947,14 +967,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_port_2_test_nested_level2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.ephemeral.size_server_1b_ps_1_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -996,6 +1008,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + 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_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1086,29 +1104,23 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: + disk.write.requests_server_1b_pd_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_1b_pd_0: + disk.device.allocation_server_1b_ps_1_test_nested_level2: 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_ps_server_1b_port_2_test_nested_level2: + attachment_ps_server_1b_1_port_1_test_nested_level2: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.device.allocation_server_1b_ps_1_test_nested_level2: - 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_1b_ps_2_test_nested_level2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1126,12 +1138,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - 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_1b_ps_2_test_nested_level2: type: tosca.capabilities.OperatingSystem occurrences: @@ -1213,12 +1219,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - 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_pd_server_1b_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1252,6 +1252,14 @@ node_types: status: SUPPORTED entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1260,108 +1268,100 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_1b_port_0_network: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_pd_server_1b_port_network_role: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: - type: list + type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.heat.neutron.port.FixedIps requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1381,14 +1381,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1401,11 +1401,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED host_pd_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -1425,34 +1420,31 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: + cpu.delta_pd_server_1b: 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_pd_server_1b: + disk.device.read.requests_pd_server_1b: 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 - forwarder_pd_server_1b_pd_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.incoming.bytes_pd_server_1b_pd_server_1b_port: + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED feature_pd_server_1b: type: tosca.capabilities.Node @@ -1465,14 +1457,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED cpu_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1508,7 +1492,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_1b_pd_server_1b_port: + network.incoming.bytes_pd_server_1b_pd_server_1b_port_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: @@ -1538,14 +1522,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_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_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + disk.device.usage_pd_server_1b: + 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 @@ -1561,13 +1546,23 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.ephemeral.size_pd_server_1b: 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_pd_server_1b_pd_server_1b_port: + forwarder_pd_server_1b_pd_server_1b_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_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: @@ -1584,18 +1579,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + disk.device.write.bytes.rate_pd_server_1b: + 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_pd_server_1b: + disk.root.size_pd_server_1b: 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_pd_server_1b: + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_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: @@ -1607,6 +1603,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1630,15 +1631,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: + instance_pd_server_1b: 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_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1653,24 +1653,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: + network.outpoing.packets_pd_server_1b_pd_server_1b_port_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 - memory.resident_pd_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_pd_server_1b_pd_server_1b_port_0: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node + memory.resident_pd_server_1b: + 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_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_server_1b_port_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: @@ -1694,19 +1694,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: + disk.capacity_pd_server_1b: 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_pd_server_1b: + disk.usage_pd_server_1b: 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_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_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: @@ -1814,7 +1814,7 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_ps_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -1850,14 +1850,6 @@ node_types: - 0 - UNBOUNDED capabilities: - binding_ps_server_1b_port_2: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED disk.device.latency_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1932,12 +1924,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.root.size_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1967,12 +1953,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED network.incoming.bytes_ps_server_1b_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. @@ -2085,17 +2065,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED link_packet_int_network: type: tosca.capabilities.network.Linkable occurrences: @@ -2112,6 +2081,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2129,7 +2104,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_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: @@ -2159,20 +2134,26 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_2: + network.outpoing.packets_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_1: + endpoint_server_1b_ps_1: + type: tosca.capabilities.Endpoint.Admin + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_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 - endpoint_server_1b_ps_1: - type: tosca.capabilities.Endpoint.Admin + network.incoming.bytes.rate_ps_server_1b_1_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 @@ -2213,14 +2194,13 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_packet_int_network: - type: tosca.capabilities.Node + attachment_ps_server_1b_1_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_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_packet_int_network: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2271,6 +2251,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_1_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 scalable_server_1b_ps_2: type: tosca.capabilities.Scalable occurrences: @@ -2304,12 +2290,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_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_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.read.bytes.rate_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2358,12 +2356,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.latency_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2431,13 +2423,14 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_port_2: + attachment_packet_ext_network: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - attachment_packet_ext_network: - type: tosca.capabilities.Attachment + network.incoming.packets_ps_server_1b_1_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 @@ -2451,11 +2444,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_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. + binding_ps_server_1b_1_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED network.outgoing.bytes_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -2463,6 +2458,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.usage_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2475,6 +2475,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_server_1b_ps_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2509,11 +2514,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes.rate_server_1b_ps_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2529,26 +2529,16 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_ps_server_1b_port_network_role_tag: + port_ps_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2557,60 +2547,70 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -2632,14 +2632,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2681,30 +2681,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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_ps_server_1b: + disk.device.latency_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -2716,11 +2717,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2782,7 +2778,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_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: @@ -2800,12 +2796,23 @@ node_types: occurrences: - 1 - UNBOUNDED + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.root.size_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2847,25 +2854,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_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_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -2881,6 +2870,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2899,12 +2893,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -2917,23 +2919,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_ps_server_1b_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 endpoint_ps_server_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + vcpus_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -2951,43 +2954,30 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + feature_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_1b_port_1_network_role_tag: + type: string required: true status: SUPPORTED - subinterface_nested_vlan_service_template_filter_count: + port_ps_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_vlan_service_template_filter_count: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2996,72 +2986,82 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_1b_port_1_network_role: + type: string + required: true + status: SUPPORTED + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + status: SUPPORTED + port_ps_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -3083,34 +3083,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - link_ps_server_1b_ps_server_1b_port_1: + capability: tosca.capabilities.network.Linkable + relationship: tosca.relationships.network.LinksTo + occurrences: + - 1 + - 1 + - dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - capability: tosca.capabilities.network.Linkable - relationship: tosca.relationships.network.LinksTo - occurrences: - - 1 - - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_1b_ps_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -3129,6 +3129,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3152,30 +3157,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.read.bytes.rate_ps_server_1b: + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.latency_ps_server_1b: + disk.device.read.bytes.rate_ps_server_1b: 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_ps_server_1b: + disk.device.latency_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + disk.device.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -3187,11 +3193,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_ps_server_1b_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED instance_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3241,11 +3242,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.read.requests.rate_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3258,7 +3254,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_ps_server_1b_port: + network.incoming.bytes_ps_server_1b_ps_server_1b_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: @@ -3276,72 +3272,70 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.write.requests.rate_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + attachment_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - disk.root.size_ps_server_1b: + disk.device.write.requests.rate_ps_server_1b: 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_ps_server_1b: - type: tosca.capabilities.network.Bindable + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - memory.resident_ps_server_1b: + disk.root.size_ps_server_1b: 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_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - disk.write.bytes_ps_server_1b: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + binding_ps_server_1b: + type: tosca.capabilities.network.Bindable occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_ps_server_1b: + memory.resident_ps_server_1b: 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_ps_server_1b: + memory_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.write.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.device.write.bytes.rate_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + disk.read.bytes_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -3357,6 +3351,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.iops_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3375,12 +3374,20 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_ps_server_1b_port_1: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED memory.usage_ps_server_1b: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -3393,23 +3400,24 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_1b_ps_server_1b_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 endpoint_ps_server_1b: type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + vcpus_ps_server_1b: 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_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_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: @@ -3427,15 +3435,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_1: type: tosca.capabilities.Node occurrences: - 1 @@ -3506,4 +3506,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED
\ No newline at end of file + - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..92de2147d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,6 +21,12 @@ topology_template: required: true entry_schema: type: float + port_pd_server_1b_port_0_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,77 +34,71 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_0_network_role_tag: + type: string + required: true vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_0_order: + type: integer + required: true + port_pd_server_1b_port_0_network: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_related_networks: + port_pd_server_1b_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_0_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd_server_1b_port_network_role: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + port_pd_server_1b_port_0_replacement_policy: type: list required: true entry_schema: type: string + port_pd_server_1b_port_0_network_role: + type: string + required: true + port_pd_server_1b_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer - required: true - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_0_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: org.openecomp.datatypes.heat.neutron.port.FixedIps node_templates: - pd_server_1b_pd_server_1b_port_nested_vlan: + pd_server_1b_pd_server_1b_port_0_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -121,7 +121,7 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: pd_server_1b_pd_server_1b_port + node: pd_server_1b_pd_server_1b_port_0 relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -138,39 +138,39 @@ topology_template: get_input: - compute_pd_server_1b_name - index_value - pd_server_1b_pd_server_1b_port: + pd_server_1b_pd_server_1b_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd_server_1b_port_replacement_policy + - port_pd_server_1b_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_0_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_0_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_0_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_0_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_0_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_0_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_0_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_0_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_0_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_0_network - index_value requirements: - binding: @@ -183,9 +183,6 @@ topology_template: disk.device.read.bytes_pd_server_1b: - pd_server_1b - disk.device.read.bytes - feature_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - feature host_pd_server_1b: - pd_server_1b - host @@ -195,30 +192,24 @@ topology_template: disk.allocation_pd_server_1b: - pd_server_1b - disk.allocation - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes.rate cpu.delta_pd_server_1b: - pd_server_1b - cpu.delta - forwarder_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - forwarder - network.incoming.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.bytes disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - binding feature_pd_server_1b: - pd_server_1b - feature disk.device.iops_pd_server_1b: - pd_server_1b - disk.device.iops - binding_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - binding cpu_pd_server_1b: - pd_server_1b - cpu @@ -237,9 +228,9 @@ topology_template: memory.usage_pd_server_1b: - pd_server_1b - memory.usage - network.outpoing.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outpoing.packets + network.incoming.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,42 +243,51 @@ topology_template: disk.read.bytes_pd_server_1b: - pd_server_1b - disk.read.bytes + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.incoming.bytes.rate disk.device.usage_pd_server_1b: - pd_server_1b - disk.device.usage - attachment_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - attachment disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests disk.latency_pd_server_1b: - pd_server_1b - disk.latency + feature_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature disk.ephemeral.size_pd_server_1b: - pd_server_1b - disk.ephemeral.size - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes.rate + forwarder_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - forwarder + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable disk.write.requests_pd_server_1b: - pd_server_1b - disk.write.requests - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + feature_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +300,29 @@ topology_template: vcpus_pd_server_1b: - pd_server_1b - vcpus - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets.rate instance_pd_server_1b: - pd_server_1b - instance + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - feature_template_Vlan_vmi_1 binding_pd_server_1b: - pd_server_1b - binding cpu_util_pd_server_1b: - pd_server_1b - cpu_util - network.outgoing.bytes_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.bytes + network.outpoing.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outpoing.packets + attachment_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - attachment memory.resident_pd_server_1b: - pd_server_1b - memory.resident - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + network.incoming.packets_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,15 +333,15 @@ topology_template: disk.read.requests_pd_server_1b: - pd_server_1b - disk.read.requests - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.outgoing.packets.rate disk.capacity_pd_server_1b: - pd_server_1b - disk.capacity disk.usage_pd_server_1b: - pd_server_1b - disk.usage + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - network.outgoing.packets.rate disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate @@ -352,18 +352,18 @@ topology_template: local_storage_pd_server_1b: - pd_server_1b - local_storage - link_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - subinterface_link_template_Vlan_vmi_1 + dependency_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan + - dependency + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + - pd_server_1b_pd_server_1b_port_0_nested_vlan - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - 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/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..9b142fd46b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,19 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_1_network_role_tag: + type: string + required: true + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_vlan_service_template_filter_count: type: list required: true entry_schema: type: float - port_ps_server_1b_port_network_role_tag: - type: string - required: true - port_ps_server_1b_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps index_value: type: integer description: Index value of this substitution service template runtime instance @@ -39,59 +31,67 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_1b_port_1_network_role: + type: string + required: true + subinterface_nested_vlan_net1: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + type: string + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - subinterface_nested_vlan_net1: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: string - port_ps_server_1b_port_ip_requirements: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: string + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - subinterface_nested_vlan_parent_interface: + compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true - compute_ps_server_1b_availability_zone: + port_ps_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -113,70 +113,70 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan - directives: - - substitutable - properties: - service_template_filter: - count: - get_input: - - subinterface_nested_vlan_service_template_filter_count - - index_value - substitute_service_template: nested_vlanServiceTemplate.yaml - mandatory: true - parent_interface: - get_input: - - subinterface_nested_vlan_parent_interface - - index_value - net1: - get_input: - - subinterface_nested_vlan_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port - relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: ps_server_1b relationship: tosca.relationships.network.BindsTo + ps_server_1b_ps_server_1b_port_1_nested_vlan: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan + directives: + - substitutable + properties: + service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value + substitute_service_template: nested_vlanServiceTemplate.yaml + mandatory: true + parent_interface: + get_input: + - subinterface_nested_vlan_parent_interface + - index_value + net1: + get_input: + - subinterface_nested_vlan_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: ps_server_1b_ps_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server_1b capabilities: @@ -186,6 +186,9 @@ topology_template: disk.device.usage_ps_server_1b: - ps_server_1b - disk.device.usage + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.allocation_ps_server_1b: - ps_server_1b - disk.device.allocation @@ -198,27 +201,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -243,17 +243,14 @@ topology_template: disk.read.requests_ps_server_1b: - ps_server_1b - disk.read.requests - feature_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature disk.device.read.requests.rate_ps_server_1b: - ps_server_1b - disk.device.read.requests.rate disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -261,12 +258,21 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - feature binding_ps_server_1b: - ps_server_1b - binding @@ -285,17 +291,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -303,6 +300,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -312,58 +312,58 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding - feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_Vlan_vmi_1 + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - subinterface_link_template_Vlan_vmi_1 + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_1_nested_vlan: + - ps_server_1b_ps_server_1b_port_1_nested_vlan - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml index 258a426b3c..56530f684e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/Nested_ps_server_1b_1ServiceTemplate.yaml @@ -11,22 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_ps_server_1b_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_ps_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps_server_1b_port_network_role_tag: + port_ps_server_1b_port_1_network_role_tag: type: string required: true - port_ps_server_1b_port_fixed_ips: + port_ps_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,49 +26,57 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_1_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements vm_flavor_name: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: + port_ps_server_1b_port_1_network_role: + type: string + required: true + vm_image_name: + type: string + required: true + port_ps_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_1b_port_1_order: + type: integer required: true - port_ps_server_1b_port_network_role: + port_ps_server_1b_port_1_subnetpoolid: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string - required: true compute_ps_server_1b_availability_zone: type: list required: true entry_schema: type: string + port_ps_server_1b_port_1_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements compute_ps_server_1b_name: type: list required: true @@ -98,39 +98,39 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps_server_1b_port_replacement_policy + - port_ps_server_1b_port_1_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_1_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_1_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_1_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_1_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_1_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_1_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_1_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_1_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_1_network - index_value requirements: - binding: @@ -158,27 +158,24 @@ topology_template: scalable_ps_server_1b: - ps_server_1b - scalable + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.bytes disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate disk.device.latency_ps_server_1b: - ps_server_1b - disk.device.latency + network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outgoing.packets.rate disk.device.iops_ps_server_1b: - ps_server_1b - disk.device.iops - attachment_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - attachment - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.packets.rate disk.device.capacity_ps_server_1b: - ps_server_1b - disk.device.capacity - forwarder_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - forwarder instance_ps_server_1b: - ps_server_1b - instance @@ -209,8 +206,8 @@ topology_template: disk.capacity_ps_server_1b: - ps_server_1b - disk.capacity - network.incoming.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.incoming.bytes_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -218,9 +215,15 @@ topology_template: disk.device.read.bytes_ps_server_1b: - ps_server_1b - disk.device.read.bytes + attachment_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - attachment disk.device.write.requests.rate_ps_server_1b: - ps_server_1b - disk.device.write.requests.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets disk.root.size_ps_server_1b: - ps_server_1b - disk.root.size @@ -242,17 +245,8 @@ topology_template: disk.read.bytes_ps_server_1b: - ps_server_1b - disk.read.bytes - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets.rate - network.outgoing.bytes_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outgoing.bytes - network.incoming.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.packets - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - network.outgoing.bytes.rate feature_ps_server_1b: - ps_server_1b @@ -260,6 +254,9 @@ topology_template: os_ps_server_1b: - ps_server_1b - os + forwarder_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - forwarder disk.iops_ps_server_1b: - ps_server_1b - disk.iops @@ -269,46 +266,49 @@ topology_template: disk.write.requests_ps_server_1b: - ps_server_1b - disk.write.requests - network.outpoing.packets_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.outpoing.packets + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.packets.rate + binding_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - binding memory.usage_ps_server_1b: - ps_server_1b - memory.usage disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.outpoing.packets_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.outpoing.packets endpoint_ps_server_1b: - ps_server_1b - endpoint - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - network.incoming.bytes.rate - feature_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - feature vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - network.incoming.bytes.rate cpu.delta_ps_server_1b: - ps_server_1b - cpu.delta disk.ephemeral.size_ps_server_1b: - ps_server_1b - disk.ephemeral.size - binding_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - binding + feature_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - feature requirements: + link_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 + - link local_storage_ps_server_1b: - ps_server_1b - local_storage - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port + dependency_ps_server_1b_ps_server_1b_port_1: + - ps_server_1b_ps_server_1b_port_1 - dependency - link_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - link dependency_ps_server_1b: - ps_server_1b - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml index 5b9bd4c74d..b71828bdba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml @@ -95,34 +95,34 @@ topology_template: - 0 subinterface_nested_vlan_service_template_filter_count: - 9 + port_pd_server_1b_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false vm_flavor_name: get_input: pd_server_1b_flavor + port_pd_server_1b_port_0_network: + - packet_internal_network subinterface_nested_vlan_net1: - packet_external_network vm_image_name: get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_port_0 + port_pd_server_1b_port_0_replacement_policy: - AUTO - port_pd_server_1b_port_mac_requirements: + port_pd_server_1b_port_0_mac_requirements: mac_count_required: is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - port_pd_server_1b_port_fixed_ips: + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + port_pd_server_1b_port_0_fixed_ips: - ip_address: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -132,11 +132,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_0: capability: tosca.capabilities.network.Linkable node: packet_internal_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -157,12 +157,12 @@ topology_template: disk.device.write.bytes.rate_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_ps_1 - network.outgoing.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.packets.rate_ps_server_1b_port_2 scalable_server_1b_ps_1_test_nested_level2: - test_nested_level2 - scalable_server_1b_ps_1 + network.outgoing.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes.rate_ps_server_1b_1_port_1 end_point_packet_ext_network_test_nested_level2: - test_nested_level2 - end_point_packet_ext_network @@ -178,6 +178,9 @@ topology_template: disk.device.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_2 @@ -198,22 +201,31 @@ topology_template: - forwarder_ps_server_1b_port_1 forwarder_pd_server_1b_port_0: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_0 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b + forwarder_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - forwarder_ps_server_1b_1_port_1 network.outpoing.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_0 + feature_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - feature_ps_server_1b_1_port_1 cpu_util_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_ps_2 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_port_1 + network.outpoing.packets_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outpoing.packets_ps_server_1b_1_port_1 feature_pd_server_1b_port_0: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_0 memory_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_1 @@ -223,9 +235,6 @@ topology_template: os_server_1b_ps_1_test_nested_level2: - test_nested_level2 - os_server_1b_ps_1 - network.incoming.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes_ps_server_1b_port_2 disk.root.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.root.size_server_1b_ps_1 @@ -250,9 +259,6 @@ topology_template: disk.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests.rate_pd_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.bytes.rate_ps_server_1b_port_2 disk.latency_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.latency_server_1b_ps_1 @@ -304,6 +310,9 @@ topology_template: disk.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.read.requests_pd_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.packets.rate_ps_server_1b_1_port_1 disk.device.write.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.bytes.rate_pd_server_1b @@ -334,15 +343,9 @@ topology_template: disk.capacity_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_ps_1 - feature_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - feature_ps_server_1b_port_2 disk.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.allocation_server_1b_ps_1 - network.outgoing.bytes_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes_ps_server_1b_port_2 endpoint_server_1b_ps_1_test_nested_level2: - test_nested_level2 - endpoint_server_1b_ps_1 @@ -361,9 +364,6 @@ topology_template: end_point_packet_external_network: - packet_external_network - end_point - forwarder_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - forwarder_ps_server_1b_port_2 disk.write.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.write.bytes_pd_server_1b @@ -382,6 +382,12 @@ topology_template: disk.device.read.requests_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.requests_server_1b_ps_2 + binding_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - binding_ps_server_1b_1_port_1 + network.incoming.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes_ps_server_1b_1_port_1 disk.device.write.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.write.requests.rate_pd_server_1b @@ -393,10 +399,16 @@ topology_template: - feature_template_Vlan_vmi_1_test_resourceGroup_1 network.outgoing.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_0 + network.incoming.packets.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.packets.rate_ps_server_1b_1_port_1 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 + network.outgoing.bytes_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.outgoing.bytes_ps_server_1b_1_port_1 memory.usage_server_1b_ps_1_test_nested_level2: - test_nested_level2 - memory.usage_server_1b_ps_1 @@ -414,7 +426,7 @@ topology_template: - memory.resident_pd_server_1b network.outgoing.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_0 disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -426,7 +438,7 @@ topology_template: - vcpus_server_1b_ps_2 attachment_pd_server_1b_port_0: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_0 attachment_packet_ext_network_test_nested_level2: - test_nested_level2 - attachment_packet_ext_network @@ -495,13 +507,10 @@ topology_template: - disk.device.read.requests_server_1b_ps_1 network.outgoing.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_0 network.incoming.packets.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port - network.incoming.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets_ps_server_1b_port_2 + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -543,13 +552,10 @@ topology_template: - attachment_packet_int_network network.incoming.bytes_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_0 disk.root.size_server_1b_pd_0: - abstract_pd_server_1b - disk.root.size_pd_server_1b - binding_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - binding_ps_server_1b_port_2 disk.ephemeral.size_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.ephemeral.size_server_1b_ps_1 @@ -571,6 +577,9 @@ topology_template: disk.device.usage_server_1b_pd_0: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + network.incoming.bytes.rate_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - network.incoming.bytes.rate_ps_server_1b_1_port_1 cpu_server_1b_ps_2_test_nested_level2: - test_nested_level2 - cpu_server_1b_ps_2 @@ -606,7 +615,7 @@ topology_template: - disk.write.bytes_server_1b_ps_2 binding_pd_server_1b_port_0: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_0 host_server_1b_ps_2_test_nested_level2: - test_nested_level2 - host_server_1b_ps_2 @@ -616,18 +625,15 @@ topology_template: link_packet_internal_network: - packet_internal_network - link - network.incoming.packets.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.incoming.packets.rate_ps_server_1b_port_2 disk.write.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.write.requests_pd_server_1b - attachment_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - attachment_ps_server_1b_port_2 disk.device.allocation_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.device.allocation_server_1b_ps_1 + attachment_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - attachment_ps_server_1b_1_port_1 disk.device.read.bytes.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.device.read.bytes.rate_server_1b_ps_2 @@ -637,9 +643,6 @@ topology_template: memory_server_1b_ps_2_test_nested_level2: - test_nested_level2 - memory_server_1b_ps_2 - network.outgoing.bytes.rate_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outgoing.bytes.rate_ps_server_1b_port_2 os_server_1b_ps_2_test_nested_level2: - test_nested_level2 - os_server_1b_ps_2 @@ -666,7 +669,7 @@ topology_template: - disk.device.read.requests_pd_server_1b network.incoming.packets_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_0 disk.read.bytes.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -682,12 +685,9 @@ topology_template: disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.outpoing.packets_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - network.outpoing.packets_ps_server_1b_port_2 network.incoming.bytes.rate_pd_server_1b_port_0: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_0 disk.write.requests.rate_server_1b_ps_2_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_2 @@ -695,6 +695,9 @@ topology_template: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 requirements: + dependency_ps_server_1b_1_port_1_test_nested_level2: + - test_nested_level2 + - dependency_ps_server_1b_1_port_1 dependency_server_1b_ps_2_test_nested_level2: - test_nested_level2 - dependency_server_1b_ps_2 @@ -706,13 +709,10 @@ topology_template: - dependency_ps_server_1b_port_1 dependency_pd_server_1b_port_0: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - dependency_template_Vlan_vmi_1 - dependency_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - dependency_ps_server_1b_port_2 dependency_test_resourceGroup_0: - test_resourceGroup_0 - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 5aa4c84390..08a98daf1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -82,28 +82,28 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 1 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -119,7 +119,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo @@ -128,34 +128,34 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: - is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - port_ps_server_1b_port_fixed_ips: - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - vm_flavor_name: - get_input: ps_server_1b_flavor - port_ps_server_1b_port_network: - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + vm_flavor_name: + get_input: ps_server_1b_flavor + port_ps_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + subinterface_nested_vlan_net1: + - packet_ext_network vm_image_name: get_input: ps_server_1b_image - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_1_replacement_policy: - AUTO + port_ps_server_1b_port_1_fixed_ips: + - ip_address: + get_input: + - ps_server_1b_ips + - 0 subinterface_nested_vlan_parent_interface: - ps_server_1b_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 compute_ps_server_1b_name: @@ -171,11 +171,11 @@ topology_template: - service_template_filter - index_value requirements: - - link_ps_server_1b_ps_server_1b_port: + - link_ps_server_1b_ps_server_1b_port_1: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo - - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -193,9 +193,6 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5_levelTwo capabilities: - binding_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - binding_ps_server_1b_ps_server_1b_port disk.device.latency_server_1b_ps_1: - abstract_ps_server_1b - disk.device.latency_ps_server_1b @@ -219,7 +216,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b binding_ps_server_1b_port_1: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 disk.read.bytes_server_1b_ps_1: - abstract_ps_server_1b - disk.read.bytes_ps_server_1b @@ -232,15 +229,12 @@ topology_template: disk.root.size_server_1b_ps_1: - abstract_ps_server_1b - disk.root.size_ps_server_1b - network.incoming.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.read.requests.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.requests.rate_ps_server_1b @@ -250,12 +244,9 @@ topology_template: feature_test_resourceGroup_1: - test_resourceGroup_1 - feature - network.incoming.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.bytes_ps_server_1b_ps_server_1b_port network.incoming.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 attachment_packet_int_network: - packet_int_network - attachment @@ -297,7 +288,7 @@ topology_template: - memory_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.capacity_ps_server_1b @@ -309,13 +300,7 @@ topology_template: - instance_ps_server_1b forwarder_ps_server_1b_port_1: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - forwarder_ps_server_1b_ps_server_1b_port - network.outgoing.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_1 link_packet_int_network: - packet_int_network - link @@ -325,6 +310,9 @@ topology_template: feature_template_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - feature_template_Vlan_vmi_1 + network.outgoing.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_1 disk.device.capacity_server_1b_ps_1: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -334,9 +322,9 @@ topology_template: disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.capacity_ps_server_1b - network.incoming.packets_ps_server_1b_port_2: + network.outgoing.bytes_ps_server_1b_1_port_1: - abstract_ps_server_1b_1 - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.iops_ps_server_1b @@ -345,19 +333,22 @@ topology_template: - disk.device.iops_ps_server_1b network.incoming.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port - network.outpoing.packets_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 network.outpoing.packets_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 endpoint_server_1b_ps_1: - abstract_ps_server_1b - endpoint_ps_server_1b + network.incoming.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 + network.incoming.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_1 disk.device.allocation_server_1b_ps_1: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b @@ -376,12 +367,12 @@ topology_template: host_server_1b_ps_1: - abstract_ps_server_1b - host_ps_server_1b + attachment_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - attachment_ps_server_1b_ps_server_1b_port_1 feature_packet_int_network: - packet_int_network - feature - network.outgoing.bytes.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port disk.write.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.write.bytes.rate_ps_server_1b @@ -406,6 +397,9 @@ topology_template: scalable_server_1b_ps_1: - abstract_ps_server_1b - scalable_ps_server_1b + network.outpoing.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 scalable_server_1b_ps_2: - abstract_ps_server_1b_1 - scalable_ps_server_1b @@ -424,9 +418,15 @@ topology_template: vcpus_server_1b_ps_1: - abstract_ps_server_1b - vcpus_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 vcpus_server_1b_ps_2: - abstract_ps_server_1b_1 - vcpus_ps_server_1b + network.incoming.bytes_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 disk.read.bytes.rate_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.read.bytes.rate_ps_server_1b @@ -451,9 +451,6 @@ topology_template: disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.write.requests_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.latency_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.latency_ps_server_1b @@ -462,7 +459,7 @@ topology_template: - disk.latency_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_1 binding_server_1b_ps_1: - abstract_ps_server_1b - binding_ps_server_1b @@ -489,31 +486,37 @@ topology_template: - end_point attachment_ps_server_1b_port_1: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port - attachment_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_1 attachment_packet_ext_network: - packet_ext_network - attachment + network.incoming.packets_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 os_server_1b_ps_2: - abstract_ps_server_1b_1 - os_ps_server_1b os_server_1b_ps_1: - abstract_ps_server_1b - os_ps_server_1b - network.outgoing.bytes_ps_server_1b_port_2: + binding_ps_server_1b_1_port_1: - abstract_ps_server_1b_1 - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_1 network.outgoing.bytes_ps_server_1b_port_1: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_1 + feature_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - feature_ps_server_1b_ps_server_1b_port_1 disk.usage_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.usage_ps_server_1b disk.usage_server_1b_ps_1: - abstract_ps_server_1b - disk.usage_ps_server_1b + forwarder_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - forwarder_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b_1 - disk.device.read.bytes_ps_server_1b @@ -531,10 +534,7 @@ topology_template: - feature feature_ps_server_1b_port_1: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes.rate_server_1b_ps_1: - abstract_ps_server_1b - disk.device.read.bytes.rate_ps_server_1b @@ -545,18 +545,18 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - dependency_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - dependency_ps_server_1b_ps_server_1b_port dependency_ps_server_1b_port_1: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_int_network: - packet_int_network - dependency local_storage_server_1b_ps_1: - abstract_ps_server_1b - local_storage_ps_server_1b + dependency_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_ext_network: - packet_ext_network - dependency |