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')
39 files changed, 3971 insertions, 3972 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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index de35f9126e..0aaf991239 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -918,6 +918,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 @@ -926,108 +934,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: @@ -1047,14 +1047,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: @@ -1067,11 +1067,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: @@ -1091,34 +1086,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 @@ -1131,14 +1123,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. @@ -1174,7 +1158,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: @@ -1204,14 +1188,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 @@ -1227,13 +1212,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: @@ -1250,18 +1245,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: @@ -1273,6 +1269,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. @@ -1296,15 +1297,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 @@ -1319,24 +1319,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: @@ -1360,19 +1360,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: @@ -1966,4 +1966,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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml index 033465e290..35faea70fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -104,34 +104,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 @@ -141,11 +141,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 @@ -186,19 +186,19 @@ 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 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 network.incoming.packets_ps_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.incoming.packets_ps_server_1b_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 @@ -324,7 +324,7 @@ 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 disk.read.requests_server_1b_ps_1_test_nested_level2: - test_nested_level2 - disk.read.requests_server_1b_ps_1 @@ -342,7 +342,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 @@ -351,7 +351,7 @@ topology_template: - feature_server_1b_ps_1 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 @@ -414,10 +414,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.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -450,7 +450,7 @@ 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 @@ -489,7 +489,7 @@ topology_template: - link_packet_ext_network 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 disk.device.read.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b @@ -522,7 +522,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 @@ -540,7 +540,7 @@ topology_template: - disk.latency_pd_server_1b 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_1_test_nested_level2: - test_nested_level2 - disk.write.requests.rate_server_1b_ps_1 @@ -553,7 +553,7 @@ 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index a27844365a..0e7a681e1b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -409,4 +409,4 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_server_1b_ps_1: - server_1b_ps_1 - - 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/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml index 57e3d22955..51358a7c38 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup @@ -100,5 +100,5 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_2} + parent_interface: { get_resource: ps_server_1b_1_port_1} net1: { get_resource: packet_ext_network}
\ 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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 1fe62b6cad..fe48762a9b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -171,7 +171,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 @@ -213,14 +213,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 @@ -253,6 +253,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. @@ -297,12 +303,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. @@ -315,6 +331,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: @@ -336,12 +358,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. @@ -387,12 +403,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. @@ -492,6 +502,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. @@ -550,23 +566,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: @@ -600,11 +605,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. @@ -640,6 +640,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. @@ -668,12 +682,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. @@ -871,12 +897,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: @@ -966,14 +986,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. @@ -1015,6 +1027,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. @@ -1105,29 +1123,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. @@ -1145,12 +1157,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: @@ -1237,12 +1243,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. @@ -1276,6 +1276,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 @@ -1284,108 +1292,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: @@ -1405,14 +1405,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: @@ -1425,11 +1425,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: @@ -1449,34 +1444,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 @@ -1489,14 +1481,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. @@ -1532,7 +1516,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: @@ -1562,14 +1546,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 @@ -1585,13 +1570,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: @@ -1608,18 +1603,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: @@ -1631,6 +1627,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. @@ -1654,15 +1655,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 @@ -1677,24 +1677,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: @@ -1718,19 +1718,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: @@ -1852,7 +1852,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 @@ -1888,14 +1888,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. @@ -1970,12 +1962,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. @@ -2005,12 +1991,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. @@ -2123,17 +2103,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: @@ -2155,6 +2124,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. @@ -2172,7 +2147,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: @@ -2202,20 +2177,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 @@ -2256,14 +2237,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 @@ -2314,6 +2294,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: @@ -2347,12 +2333,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. @@ -2401,12 +2399,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. @@ -2474,13 +2466,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 @@ -2494,20 +2487,27 @@ node_types: occurrences: - 1 - UNBOUNDED + 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: + - 0 + - UNBOUNDED feature_test_resourceGroup_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_2: + network.outgoing.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. occurrences: - 1 - UNBOUNDED - network.outgoing.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. + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2523,6 +2523,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. @@ -2557,11 +2562,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. @@ -2577,32 +2577,22 @@ node_types: 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 @@ -2611,72 +2601,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 @@ -2698,34 +2698,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: @@ -2744,6 +2744,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. @@ -2767,30 +2772,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: @@ -2802,11 +2808,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. @@ -2856,11 +2857,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. @@ -2873,7 +2869,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: @@ -2891,72 +2887,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: @@ -2972,6 +2966,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. @@ -2990,12 +2989,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. @@ -3008,23 +3015,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: @@ -3042,15 +3050,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 @@ -3121,4 +3121,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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml index bbc680fb1c..d252cfcc6e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/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 @@ -396,10 +402,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 @@ -417,7 +429,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 @@ -429,7 +441,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 @@ -498,13 +510,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 @@ -546,13 +555,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 @@ -574,6 +580,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 @@ -609,7 +618,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 @@ -619,18 +628,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 @@ -640,9 +646,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 @@ -672,7 +675,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 @@ -688,12 +691,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 @@ -701,6 +701,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 @@ -712,13 +715,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_2_test_nested_level2: - test_nested_level2 - dependency_test_resourceGroup_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index f0f55f27cc..34216708d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/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/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -82,43 +82,43 @@ 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 - 9 - port_ps_server_1b_port_fixed_ips: - - - ip_address: - get_input: - - ps_server_1b_ips - - 0 - - - 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 - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - - 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 + - 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 - AUTO + port_ps_server_1b_port_1_fixed_ips: + - - ip_address: + get_input: + - ps_server_1b_ips + - 0 + - - ip_address: + get_input: + - ps_server_1b_ips + - 1 subinterface_nested_vlan_parent_interface: - ps_server_1b_port_1 - - ps_server_1b_port_2 + - ps_server_1b_1_port_1 + port_ps_server_1b_port_1_network: + - packet_int_network + - packet_int_network compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -138,11 +138,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 @@ -159,9 +159,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 - - 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 @@ -185,7 +182,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 @@ -198,15 +195,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 - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_ps_2: - abstract_ps_server_1b - 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 @@ -216,12 +210,9 @@ topology_template: feature_test_resourceGroup_1: - test_resourceGroup_1 - feature - network.incoming.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b - - 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 @@ -263,7 +254,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 @@ -275,13 +266,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 - - forwarder_ps_server_1b_ps_server_1b_port - network.outgoing.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - 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 @@ -294,6 +279,9 @@ topology_template: feature_template_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 - feature_template_Vlan_vmi_1 + network.outgoing.packets.rate_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - 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 @@ -303,9 +291,9 @@ topology_template: disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b - 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 - - 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 - disk.device.iops_ps_server_1b @@ -314,19 +302,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 - - 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 + - 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 + - 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 @@ -345,12 +336,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 + - 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 - - 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 @@ -375,6 +366,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 + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_1 scalable_server_1b_ps_2: - abstract_ps_server_1b - scalable_ps_server_1b @@ -393,9 +387,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 + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_1 vcpus_server_1b_ps_2: - abstract_ps_server_1b - vcpus_ps_server_1b + network.incoming.bytes_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_1 disk.read.bytes.rate_server_1b_ps_2: - abstract_ps_server_1b - disk.read.bytes.rate_ps_server_1b @@ -420,9 +420,6 @@ topology_template: disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.latency_server_1b_ps_2: - abstract_ps_server_1b - disk.latency_ps_server_1b @@ -431,7 +428,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 @@ -458,34 +455,40 @@ 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 - - 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 + - network.incoming.packets_ps_server_1b_ps_server_1b_port_1 os_server_1b_ps_2: - abstract_ps_server_1b - os_ps_server_1b os_server_1b_ps_1: - abstract_ps_server_1b - os_ps_server_1b + binding_ps_server_1b_1_port_1: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port_1 feature_test_resourceGroup_2: - test_resourceGroup_2 - feature - network.outgoing.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port 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 + - feature_ps_server_1b_ps_server_1b_port_1 disk.usage_server_1b_ps_2: - abstract_ps_server_1b - 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 + - forwarder_ps_server_1b_ps_server_1b_port_1 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -503,10 +506,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 - - 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 @@ -517,21 +517,21 @@ topology_template: dependency_test_resourceGroup_1: - test_resourceGroup_1 - dependency - dependency_ps_server_1b_port_2: - - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency 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 + - dependency_ps_server_1b_ps_server_1b_port_1 dependency_packet_ext_network: - packet_ext_network - dependency @@ -549,4 +549,4 @@ topology_template: - dependency_ps_server_1b dependency_server_1b_ps_2: - abstract_ps_server_1b - - dependency_ps_server_1b
\ No newline at end of file + - dependency_ps_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index bd9cb40b38..6cbf3dfc19 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -849,6 +849,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 @@ -857,108 +865,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: @@ -978,14 +978,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: @@ -998,11 +998,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: @@ -1022,34 +1017,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 @@ -1062,14 +1054,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. @@ -1105,7 +1089,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: @@ -1135,14 +1119,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 @@ -1158,13 +1143,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: @@ -1181,18 +1176,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: @@ -1204,6 +1200,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. @@ -1227,15 +1228,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 @@ -1250,24 +1250,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: @@ -1291,19 +1291,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: @@ -1870,4 +1870,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/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml index fc9893df82..2fea17fae4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml @@ -113,34 +113,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: + - get_input: port_net subinterface_nested_vlan_net1: - get_input: sub_inf_net 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: - - get_input: port_net - 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 @@ -175,7 +175,7 @@ topology_template: - disk.write.bytes_server_1b_pd_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 network.outpoing.packets_pd_server_1b_port_1_test_nested_level2: - test_nested_level2 - network.outpoing.packets_pd_server_1b_port_1 @@ -187,13 +187,13 @@ topology_template: - disk.capacity_pd_server_1b 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 disk.device.read.requests.rate_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.read.requests.rate_server_1b_pd_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 cpu_util_server_1b_pd_1_test_nested_level2: - test_nested_level2 - cpu_util_server_1b_pd_1 @@ -319,7 +319,7 @@ topology_template: - disk.usage_server_1b_pd_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 disk.device.write.requests_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.write.requests_server_1b_pd_1 @@ -340,13 +340,13 @@ 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 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 disk.device.write.bytes.rate_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.device.write.bytes.rate_server_1b_pd_1 @@ -367,10 +367,10 @@ topology_template: - network.outgoing.packets.rate_pd_server_1b_port_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.rate_pd_server_1b_pd_server_1b_port_0 os_server_1b_pd_0: - abstract_pd_server_1b - os_pd_server_1b @@ -391,7 +391,7 @@ topology_template: - host_pd_server_1b 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 @@ -424,7 +424,7 @@ topology_template: - memory.resident_server_1b_pd_1 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 disk.capacity_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.capacity_server_1b_pd_1 @@ -460,7 +460,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_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.read.bytes_server_1b_pd_1 @@ -490,20 +490,20 @@ topology_template: - disk.latency_pd_server_1b 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_server_1b_pd_1_test_nested_level2: - test_nested_level2 - disk.write.requests_server_1b_pd_1 requirements: 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_server_1b_pd_1_test_nested_level2: - test_nested_level2 - dependency_server_1b_pd_1 link_pd_server_1b_port_0: - abstract_pd_server_1b - - link_pd_server_1b_pd_server_1b_port + - link_pd_server_1b_pd_server_1b_port_0 subinterface_link_template_Vlan_vmi_1_test_resourceGroup_0: - test_resourceGroup_0 - subinterface_link_template_Vlan_vmi_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 4f11d4d3c4..e3b7cb6aa1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -382,4 +382,4 @@ topology_template: - dependency dependency_pd_server_1b_port_1: - pd_server_1b_port_1 - - 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/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml index 1fa93606cc..4aef865a20 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/main.yml @@ -52,7 +52,7 @@ resources: name: get_param: packet_externalmain_network_name - pd_server_1b_port_0: + pd_server_1b_1_port_1: type: OS::Neutron::Port properties: network: { get_resource: packet_internalmain_network } @@ -66,14 +66,14 @@ resources: fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 1]}}] replacement_policy: AUTO - pd_server_1b_port_01: + pd_server_1b_2_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internalmain_network} fixed_ips: [{"ip_address": {get_param: [pd_server_1b_ips, 0]}}] replacement_policy: AUTO - pd_server_1b_port_11: + pd_server_1b_3_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internalmain_network} @@ -88,7 +88,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_0 } + - port: { get_resource: pd_server_1b_1_port_1 } server_1b_pd_1: type: OS::Nova::Server @@ -108,7 +108,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_01 } + - port: { get_resource: pd_server_1b_2_port_1 } server_1b_pd_11: type: OS::Nova::Server @@ -118,7 +118,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_11 } + - port: { get_resource: pd_server_1b_3_port_1 } test_resourceGroup_0: type: OS::Heat::ResourceGroup @@ -127,7 +127,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_0} + parent_interface: { get_resource: pd_server_1b_1_port_1} net1: { get_resource: packet_externalmain_network} test_resourceGroup_1: @@ -147,7 +147,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_01} + parent_interface: { get_resource: pd_server_1b_2_port_1} net1: { get_resource: packet_externalmain_network} test_resourceGroup_11: @@ -157,7 +157,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_11} + parent_interface: { get_resource: pd_server_1b_3_port_1} net1: { get_resource: packet_externalmain_network} test_nested_level1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml index d3ca9e5cca..5dcc2d8285 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/in/nested_pattern5.yml @@ -77,7 +77,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_2 } - ps_server_1b_port_3: + ps_server_1b_1_port_2: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -92,7 +92,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_3 } + - port: { get_resource: ps_server_1b_1_port_2 } test_resourceGroup_2: type: OS::Heat::ResourceGroup @@ -111,7 +111,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_3} + parent_interface: { get_resource: ps_server_1b_1_port_2} net1: { get_resource: packet_ext_network} pd_server_1b_port_2: @@ -131,7 +131,7 @@ resources: networks: - port: { get_resource: pd_server_1b_port_2 } - pd_server_1b_port_3: + pd_server_1b_1_port_2: type: OS::Neutron::Port properties: network: { get_resource: packet_int_network } @@ -146,4 +146,4 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_3 }
\ No newline at end of file + - port: { get_resource: pd_server_1b_1_port_2 }
\ 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/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5a6cedc9f4..6d8d1684d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -20,143 +20,143 @@ node_types: status: SUPPORTED entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: 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: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b: 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: + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_1b_pd_server_1b_port_1: 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: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_1b: + - dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -169,11 +169,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: @@ -193,28 +188,25 @@ 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: + network.incoming.packets.rate_pd_server_1b_pd_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 - 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: - 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_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 disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -233,14 +225,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. @@ -264,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_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.allocation_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. @@ -276,7 +266,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_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: @@ -306,14 +296,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_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 - 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 @@ -335,7 +326,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_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: @@ -352,7 +343,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -363,6 +354,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_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_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. @@ -375,6 +372,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + 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. @@ -398,12 +405,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_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 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. @@ -415,15 +416,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_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_pd_server_1b_pd_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. + attachment_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -433,12 +438,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_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: @@ -462,25 +462,25 @@ 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: + disk.write.requests.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.write.requests.rate_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_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: @@ -582,14 +582,21 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_2: + - dependency_pd_server_1b_1_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_port_3: + - dependency_ps_server_1b_1_port_2: + capability: tosca.capabilities.Node + node: tosca.nodes.Root + relationship: tosca.relationships.DependsOn + occurrences: + - 0 + - UNBOUNDED + - dependency_ps_server_1b_port_2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -673,13 +680,6 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_port_3: - capability: tosca.capabilities.Node - node: tosca.nodes.Root - relationship: tosca.relationships.DependsOn - occurrences: - - 0 - - UNBOUNDED - dependency_server_1b_ps_2: capability: tosca.capabilities.Node node: tosca.nodes.Root @@ -703,14 +703,6 @@ node_types: occurrences: - 0 - UNBOUNDED - binding_ps_server_1b_port_3: - 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.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. @@ -746,11 +738,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -762,23 +749,12 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_1b_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED network.outpoing.packets_pd_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.outpoing.packets_pd_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.device.iops_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -846,12 +822,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED instance_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -910,6 +880,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_ps_server_1b_1_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.capacity_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. @@ -928,25 +904,36 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_1b_port_3: + disk.device.iops_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 - disk.device.iops_server_1b_ps_2: + network.outgoing.bytes_pd_server_1b_1_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.outgoing.bytes_pd_server_1b_port_2: + attachment_pd_server_1b_1_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets.rate_ps_server_1b_1_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.outgoing.bytes_pd_server_1b_port_3: + network.incoming.bytes.rate_ps_server_1b_1_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.outgoing.bytes_pd_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: @@ -969,12 +956,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED feature_packet_int_network: type: tosca.capabilities.Node occurrences: @@ -1016,7 +997,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_1b_port_3: + network.outpoing.packets_ps_server_1b_1_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: @@ -1028,13 +1009,19 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_1b_1_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.allocation_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_port_3: + network.incoming.bytes_ps_server_1b_1_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: @@ -1098,31 +1085,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_server_1b_ps_2: + network.outpoing.packets_pd_server_1b_1_port_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_2: + disk.write.requests_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 - disk.root.size_server_1b_pd_3: + 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_3: + disk.root.size_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_ps_server_1b_port_3: + disk.latency_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1192,19 +1179,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_port_3: - 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 - attachment_ps_server_1b_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED attachment_ps_server_1b_port_2: type: tosca.capabilities.Attachment occurrences: @@ -1279,12 +1253,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.usage_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1434,12 +1402,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED disk.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. @@ -1488,12 +1450,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_ps_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED attachment_packet_int_network: type: tosca.capabilities.Attachment occurrences: @@ -1612,11 +1568,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_3: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED feature_server_1b_pd_3: type: tosca.capabilities.Node occurrences: @@ -1671,7 +1622,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_port_3: + network.outgoing.bytes_ps_server_1b_1_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.outgoing.packets.rate_pd_server_1b_1_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: @@ -1683,12 +1640,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes.rate_pd_server_1b_1_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.write.requests.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. occurrences: - 1 - UNBOUNDED + network.incoming.packets.rate_pd_server_1b_1_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_ps_server_1b_1_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED cpu_util_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1736,11 +1710,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_port_3: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.read.bytes_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1793,11 +1762,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_1_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_server_1b_ps_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_ps_server_1b_1_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_server_1b_ps_3: type: tosca.capabilities.Node occurrences: @@ -1861,24 +1842,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED network.incoming.bytes_pd_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_pd_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED memory_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1915,28 +1884,66 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_server_1b_1_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 + forwarder_pd_server_1b_1_port_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.latency_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_1_port_2: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED disk.device.latency_server_1b_pd_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED + binding_ps_server_1b_1_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 scalable_server_1b_pd_3: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_1_port_2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED scalable_server_1b_pd_2: type: tosca.capabilities.Scalable occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_1b_1_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 cpu.delta_server_1b_pd_2: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1955,9 +1962,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_server_1b_port_3: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_pd_server_1b_1_port_2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -1973,25 +1979,24 @@ node_types: 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. + forwarder_ps_server_1b_1_port_2: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_server_1b_ps_3: + 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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_port_2: + disk.device.read.bytes_server_1b_ps_3: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_port_3: + network.incoming.bytes.rate_pd_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: @@ -2002,11 +2007,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_port_3: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -2016,6 +2016,22 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2028,76 +2044,60 @@ node_types: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: 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 - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + port_pd_server_1b_port_2_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_2_network: 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_2_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: string - compute_pd_server_1b_availability_zone: - type: list + port_pd_server_1b_port_2_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd_server_1b_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_1b_port_2_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_ip_requirements: + compute_pd_server_1b_availability_zone: 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: string requirements: - dependency_pd_server_1b: capability: tosca.capabilities.Node @@ -2113,14 +2113,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_pd_server_1b_pd_server_1b_port_2: 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_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2133,8 +2133,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_1b_pd_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 @@ -2157,29 +2158,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_1b_pd_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 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 - 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: - type: org.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. @@ -2197,7 +2181,13 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_1b_pd_server_1b_port: + 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. + occurrences: + - 1 + - UNBOUNDED + binding_pd_server_1b_pd_server_1b_port_2: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -2205,19 +2195,19 @@ node_types: occurrences: - 0 - UNBOUNDED - cpu_pd_server_1b: + disk.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.write.bytes.rate_pd_server_1b: + disk.device.read.requests.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.read.requests.rate_pd_server_1b: + network.incoming.packets.rate_pd_server_1b_pd_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: @@ -2234,13 +2224,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server_1b: + network.outpoing.packets_pd_server_1b_pd_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.outpoing.packets_pd_server_1b_pd_server_1b_port: + memory.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: @@ -2276,8 +2266,9 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_pd_server_1b_port: - type: tosca.capabilities.Attachment + network.incoming.bytes.rate_pd_server_1b_pd_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 @@ -2299,7 +2290,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_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: @@ -2328,12 +2319,28 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_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.iops_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_2: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_2: + 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. @@ -2357,12 +2364,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_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 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. @@ -2380,25 +2381,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_pd_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 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: + disk.device.write.requests.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.requests.rate_pd_server_1b: + network.incoming.packets_pd_server_1b_pd_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: @@ -2416,25 +2411,30 @@ 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: + attachment_pd_server_1b_pd_server_1b_port_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + disk.write.requests.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.write.requests.rate_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_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: @@ -2443,32 +2443,28 @@ node_types: org.openecomp.resource.abstract.nodes.ps_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_ps_server_1b_port_vlan_requirements: + port_ps_server_1b_port_2_network: 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 - subinterface_nested_vlan_service_template_filter_count: + type: string + port_ps_server_1b_port_2_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_1b_port_2_order: + type: integer required: true status: SUPPORTED - port_ps_server_1b_port_fixed_ips: + 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 @@ -2477,51 +2473,53 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_2_vlan_requirements: + type: list required: true status: SUPPORTED - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_1b_port_2_network_role: type: string required: true status: SUPPORTED - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_2_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: - type: list + vm_flavor_name: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_ps_server_1b_port_2_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_2_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_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_ps_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: type: list required: true status: SUPPORTED @@ -2533,10 +2531,12 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string + port_ps_server_1b_port_2_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_1b_availability_zone: type: list required: true @@ -2564,34 +2564,34 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_1b_ps_server_1b_port_nested_vlan: + - dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan: 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: + - dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_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: + - subinterface_link_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_ps_server_1b_ps_server_1b_port: + - dependency_ps_server_1b_ps_server_1b_port_2: 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_2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2622,6 +2622,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_ps_server_1b_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 cpu_util_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. @@ -2633,6 +2639,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED 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. @@ -2651,12 +2662,7 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port: + network.outgoing.packets.rate_ps_server_1b_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: @@ -2668,11 +2674,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. @@ -2697,12 +2698,23 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_ps_server_1b_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.device.read.requests_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_2: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED host_ps_server_1b: type: tosca.capabilities.Container valid_source_types: @@ -2722,11 +2734,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. @@ -2739,7 +2746,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_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: @@ -2774,6 +2781,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_1b_ps_server_1b_port_2_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED 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. @@ -2804,25 +2816,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_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: @@ -2838,6 +2832,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_1b_ps_server_1b_port_2: + 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. @@ -2856,19 +2855,27 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_ps_server_1b_ps_server_1b_port: + 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. occurrences: - 1 - UNBOUNDED - memory.usage_ps_server_1b: + binding_ps_server_1b_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.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 - disk.latency_ps_server_1b: + network.incoming.packets.rate_ps_server_1b_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: @@ -2879,18 +2886,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port: + network.outpoing.packets_ps_server_1b_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 - feature_ps_server_1b_ps_server_1b_port: - type: tosca.capabilities.Node + 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 - vcpus_ps_server_1b: + network.incoming.bytes.rate_ps_server_1b_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: @@ -2908,15 +2916,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_2: type: tosca.capabilities.Node occurrences: - 1 @@ -2987,4 +2987,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/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml index fa1596322b..e6cc52a094 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml @@ -137,29 +137,7 @@ topology_template: - 9 - 9 - 9 - vm_flavor_name: - get_input: pd_server_1b_flavor - subinterface_nested_vlan_net1: - - packet_externalmain_network - - packet_externalmain_network - - packet_externalmain_network - - packet_externalmain_network - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - - pd_server_1b_port_01 - - pd_server_1b_port_11 - - pd_server_1b_port_1 - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -176,22 +154,44 @@ topology_template: get_input: - pd_server_1b_ips - 1 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_externalmain_network + - packet_externalmain_network + - packet_externalmain_network + - packet_externalmain_network + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - packet_internalmain_network - packet_internalmain_network - packet_internalmain_network - packet_internalmain_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_1_port_1 + - pd_server_1b_2_port_1 + - pd_server_1b_3_port_1 + - pd_server_1b_port_1 + port_pd_server_1b_port_1_replacement_policy: + - AUTO + - AUTO + - AUTO + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml count: 4 @@ -201,11 +201,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_1: capability: tosca.capabilities.network.Linkable node: packet_internalmain_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_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_externalmain_network relationship: tosca.relationships.network.LinksTo @@ -237,4 +237,4 @@ topology_template: - packet_internalmain_network - test_nested_level1 - packet_externalmain_network - - abstract_pd_server_1b_1
\ No newline at end of file + - abstract_pd_server_1b_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index d0921140a5..e2354d22f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -16,6 +16,19 @@ topology_template: required: true entry_schema: type: string + port_pd_server_1b_port_2_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_2_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_2_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements index_value: type: integer description: Index value of this substitution service template runtime instance @@ -26,62 +39,49 @@ topology_template: vm_flavor_name: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.IpRequirements + port_pd_server_1b_port_2_related_networks: type: list required: true entry_schema: type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string - required: true - vm_image_name: - type: string - required: true - port_pd_server_1b_port_replacement_policy: + port_pd_server_1b_port_2_replacement_policy: 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: + vm_image_name: type: string required: true - 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: - type: list + port_pd_server_1b_port_2_network_role_tag: + type: string required: true - entry_schema: - type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_2_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_order: - type: integer + port_pd_server_1b_port_2_network_role: + type: string required: true - port_pd_server_1b_port_exCP_naming: + port_pd_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_pd_server_1b_port_ip_requirements: + port_pd_server_1b_port_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd_server_1b_port_2_order: + type: integer + required: true + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: - type: string - required: true + type: string node_templates: pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b @@ -98,39 +98,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_2: 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_2_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_2_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_2_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_2_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_2_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_2_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_2_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_2_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_2_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_2_network - index_value requirements: - binding: @@ -143,9 +143,9 @@ 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 + network.incoming.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes host_pd_server_1b: - pd_server_1b - host @@ -155,18 +155,9 @@ 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 @@ -176,30 +167,33 @@ topology_template: 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 + binding_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - binding disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate disk.device.read.requests.rate_pd_server_1b: - pd_server_1b - disk.device.read.requests.rate + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets.rate endpoint_pd_server_1b: - pd_server_1b - endpoint disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation + network.outpoing.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outpoing.packets 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 memory_pd_server_1b: - pd_server_1b - memory @@ -215,9 +209,9 @@ topology_template: 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 + network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.bytes.rate disk.device.write.requests_pd_server_1b: - pd_server_1b - disk.device.write.requests @@ -227,9 +221,9 @@ topology_template: 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 + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes scalable_pd_server_1b: - pd_server_1b - scalable @@ -242,9 +236,18 @@ topology_template: disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.bytes.rate disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - forwarder + feature_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -257,9 +260,6 @@ 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 @@ -269,36 +269,36 @@ topology_template: 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 memory.resident_pd_server_1b: - pd_server_1b - memory.resident - network.incoming.packets_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port - - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b - disk.device.write.requests.rate + network.incoming.packets_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.incoming.packets disk.device.capacity_pd_server_1b: - pd_server_1b - disk.device.capacity 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 + attachment_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - attachment disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -306,9 +306,9 @@ 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 + dependency_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 + - dependency + link_pd_server_1b_pd_server_1b_port_2: + - pd_server_1b_pd_server_1b_port_2 - link - 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/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_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/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml index 9920d7e27f..3ee9e8faad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_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/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -21,108 +21,83 @@ topology_template: required: true entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: 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: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: - pd_server_1b_pd_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: pd_server_1b_pd_server_1b_port - relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b properties: @@ -138,54 +113,76 @@ 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_1: 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_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b_pd_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: pd_server_1b_pd_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b_1 capabilities: 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,18 +192,15 @@ 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 + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -216,9 +210,6 @@ topology_template: 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 @@ -231,15 +222,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation 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_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,12 +246,12 @@ 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_1: + - pd_server_1b_pd_server_1b_port_1 + - 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 @@ -267,27 +261,36 @@ topology_template: 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 + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - 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 + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +303,26 @@ 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 binding_pd_server_1b: - pd_server_1b - binding + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 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 + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - 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_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,9 +333,6 @@ 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 @@ -345,6 +342,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -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_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_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 + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_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/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 2cdd4ed59a..048e4146de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -11,27 +11,24 @@ 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_2_network: 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 - subinterface_nested_vlan_service_template_filter_count: + type: string + port_ps_server_1b_port_2_ip_requirements: type: list required: true entry_schema: - type: float - port_ps_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_1b_port_2_order: + type: integer required: true - port_ps_server_1b_port_fixed_ips: + subinterface_nested_vlan_service_template_filter_count: type: list required: true 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 @@ -39,42 +36,43 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps_server_1b_port_order: - type: integer + port_ps_server_1b_port_2_vlan_requirements: + type: list required: true - vm_flavor_name: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_ps_server_1b_port_2_network_role: type: string required: true - port_ps_server_1b_port_related_networks: - type: list + port_ps_server_1b_port_2_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps_server_1b_port_network: - type: list + vm_flavor_name: + type: string required: true - entry_schema: - type: string - port_ps_server_1b_port_exCP_naming: + port_ps_server_1b_port_2_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_ps_server_1b_port_2_network_role_tag: + type: string + required: true subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_ps_server_1b_port_ip_requirements: + port_ps_server_1b_port_2_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_2_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_ps_server_1b_port_network_role: + vm_image_name: type: string required: true - port_ps_server_1b_port_replacement_policy: + port_ps_server_1b_port_2_replacement_policy: type: list required: true entry_schema: @@ -84,9 +82,11 @@ topology_template: required: true entry_schema: type: string - port_ps_server_1b_port_subnetpoolid: - type: string + port_ps_server_1b_port_2_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_1b_availability_zone: type: list required: true @@ -113,7 +113,7 @@ topology_template: get_input: - compute_ps_server_1b_name - index_value - ps_server_1b_ps_server_1b_port_nested_vlan: + ps_server_1b_ps_server_1b_port_2_nested_vlan: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested_vlan directives: - substitutable @@ -136,41 +136,41 @@ topology_template: requirements: - binding_template_Vlan_vmi_1: capability: tosca.capabilities.network.Bindable - node: ps_server_1b_ps_server_1b_port + node: ps_server_1b_ps_server_1b_port_2 relationship: tosca.relationships.network.BindsTo - ps_server_1b_ps_server_1b_port: + ps_server_1b_ps_server_1b_port_2: 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_2_replacement_policy - index_value mac_requirements: - get_input: port_ps_server_1b_port_mac_requirements + get_input: port_ps_server_1b_port_2_mac_requirements order: - get_input: port_ps_server_1b_port_order + get_input: port_ps_server_1b_port_2_order exCP_naming: - get_input: port_ps_server_1b_port_exCP_naming + get_input: port_ps_server_1b_port_2_exCP_naming vlan_requirements: - get_input: port_ps_server_1b_port_vlan_requirements + get_input: port_ps_server_1b_port_2_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_ps_server_1b_port_ip_requirements + get_input: port_ps_server_1b_port_2_ip_requirements related_networks: - get_input: port_ps_server_1b_port_related_networks + get_input: port_ps_server_1b_port_2_related_networks network_role_tag: - get_input: port_ps_server_1b_port_network_role_tag + get_input: port_ps_server_1b_port_2_network_role_tag network_role: - get_input: port_ps_server_1b_port_network_role + get_input: port_ps_server_1b_port_2_network_role fixed_ips: get_input: - - port_ps_server_1b_port_fixed_ips + - port_ps_server_1b_port_2_fixed_ips - index_value subnetpoolid: - get_input: port_ps_server_1b_port_subnetpoolid + get_input: port_ps_server_1b_port_2_subnetpoolid network: get_input: - - port_ps_server_1b_port_network + - port_ps_server_1b_port_2_network - index_value requirements: - binding: @@ -192,12 +192,18 @@ topology_template: disk.device.write.requests_ps_server_1b: - ps_server_1b - disk.device.write.requests + network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.outgoing.bytes cpu_util_ps_server_1b: - ps_server_1b - cpu_util scalable_ps_server_1b: - ps_server_1b - scalable + feature_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - feature_template_Vlan_vmi_1 disk.device.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.device.read.bytes.rate @@ -207,18 +213,12 @@ topology_template: 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_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 - 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 @@ -231,9 +231,15 @@ topology_template: disk.read.bytes.rate_ps_server_1b: - ps_server_1b - disk.read.bytes.rate + network.incoming.packets_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.packets disk.device.read.requests_ps_server_1b: - ps_server_1b - disk.device.read.requests + attachment_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - attachment host_ps_server_1b: - ps_server_1b - host @@ -243,17 +249,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_2: + - ps_server_1b_ps_server_1b_port_2 - network.incoming.bytes disk.write.requests.rate_ps_server_1b: - ps_server_1b @@ -270,6 +273,9 @@ topology_template: binding_ps_server_1b: - ps_server_1b - binding + feature_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - feature memory.resident_ps_server_1b: - ps_server_1b - memory.resident @@ -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_2: + - ps_server_1b_ps_server_1b_port_2 - 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_2: + - ps_server_1b_ps_server_1b_port_2 + - 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 memory.usage_ps_server_1b: - ps_server_1b - memory.usage + binding_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - binding disk.latency_ps_server_1b: - ps_server_1b - disk.latency + network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.incoming.packets.rate 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 + network.outpoing.packets_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - network.outpoing.packets vcpus_ps_server_1b: - ps_server_1b - vcpus + network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - 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_2: + - ps_server_1b_ps_server_1b_port_2 + - 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_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - dependency_template_Vlan_vmi_1 + dependency_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - dependency + link_ps_server_1b_ps_server_1b_port_2: + - ps_server_1b_ps_server_1b_port_2 + - link + dependency_ps_server_1b_ps_server_1b_port_2_nested_vlan: + - ps_server_1b_ps_server_1b_port_2_nested_vlan + - dependency 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 - dependency_ps_server_1b_ps_server_1b_port: - - ps_server_1b_ps_server_1b_port - - 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/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml index 873ade14f4..8a89b5699d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -100,17 +100,7 @@ topology_template: - get_input: - pd_server_1b_names - 0 - vm_flavor_name: - get_input: pd_server_1b_flavor - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_2_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -119,18 +109,28 @@ topology_template: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: - - packet_int_network - - packet_int_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + vm_flavor_name: + get_input: pd_server_1b_flavor + port_pd_server_1b_port_2_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + port_pd_server_1b_port_2_replacement_policy: + - AUTO + - AUTO + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_2_network: + - packet_int_network + - packet_int_network + port_pd_server_1b_port_2_mac_requirements: + mac_count_required: + is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 2 @@ -140,7 +140,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_pd_server_1b_pd_server_1b_port: + - link_pd_server_1b_pd_server_1b_port_2: capability: tosca.capabilities.network.Linkable node: packet_int_network relationship: tosca.relationships.network.LinksTo @@ -159,13 +159,24 @@ topology_template: directives: - substitutable properties: - port_ps_server_1b_port_mac_requirements: - mac_count_required: + port_ps_server_1b_port_2_network: + - packet_int_network + - packet_int_network + port_ps_server_1b_port_2_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: is_required: false subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - port_ps_server_1b_port_fixed_ips: + vm_flavor_name: + get_input: ps_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_ext_network + - packet_ext_network + port_ps_server_1b_port_2_fixed_ips: - - ip_address: get_input: - ps_server_1b_ips @@ -174,27 +185,16 @@ topology_template: 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 - - packet_int_network - subinterface_nested_vlan_net1: - - packet_ext_network - - packet_ext_network - port_ps_server_1b_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: + port_ps_server_1b_port_2_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_2_replacement_policy: - AUTO - AUTO subinterface_nested_vlan_parent_interface: - - ps_server_1b_port_3 + - ps_server_1b_1_port_2 - ps_server_1b_port_2 compute_ps_server_1b_availability_zone: - get_input: availability_zone_0 @@ -215,11 +215,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_2: 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_2_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_ext_network relationship: tosca.relationships.network.LinksTo @@ -239,10 +239,7 @@ topology_template: capabilities: binding_ps_server_1b_port_2: - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port - binding_ps_server_1b_port_3: - - abstract_ps_server_1b - - binding_ps_server_1b_ps_server_1b_port + - binding_ps_server_1b_ps_server_1b_port_2 disk.device.usage_server_1b_ps_2: - abstract_ps_server_1b - disk.device.usage_ps_server_1b @@ -257,28 +254,19 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b feature_pd_server_1b_port_2: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_2 disk.capacity_server_1b_pd_3: - abstract_pd_server_1b - disk.capacity_pd_server_1b - feature_pd_server_1b_port_3: - - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port disk.capacity_server_1b_pd_2: - abstract_pd_server_1b - disk.capacity_pd_server_1b forwarder_pd_server_1b_port_2: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port - forwarder_pd_server_1b_port_3: - - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_2 network.outpoing.packets_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - network.outpoing.packets_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_2 disk.device.iops_server_1b_pd_3: - abstract_pd_server_1b - disk.device.iops_pd_server_1b @@ -312,15 +300,12 @@ topology_template: memory_server_1b_ps_2: - abstract_ps_server_1b - memory_ps_server_1b - network.outgoing.packets.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port instance_server_1b_ps_3: - abstract_ps_server_1b - instance_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_2: - 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_2 instance_server_1b_ps_2: - abstract_ps_server_1b - instance_ps_server_1b @@ -345,6 +330,9 @@ topology_template: disk.device.iops_server_1b_ps_3: - abstract_ps_server_1b - disk.device.iops_ps_server_1b + network.outgoing.packets.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outgoing.packets.rate_ps_server_1b_ps_server_1b_port_2 disk.device.capacity_server_1b_ps_2: - abstract_ps_server_1b - disk.device.capacity_ps_server_1b @@ -353,19 +341,25 @@ topology_template: - disk.device.capacity_ps_server_1b network.incoming.packets_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port - network.incoming.packets_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.packets_ps_server_1b_ps_server_1b_port + - network.incoming.packets_ps_server_1b_ps_server_1b_port_2 disk.device.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.device.iops_ps_server_1b - network.outgoing.bytes_pd_server_1b_port_2: + network.outgoing.bytes_pd_server_1b_1_port_2: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port - network.outgoing.bytes_pd_server_1b_port_3: + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2 + attachment_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port_2 + network.incoming.packets.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port_2 + network.incoming.bytes.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port_2 + network.outgoing.bytes_pd_server_1b_port_2: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_2 endpoint_server_1b_ps_3: - abstract_ps_server_1b - endpoint_ps_server_1b @@ -375,18 +369,15 @@ topology_template: host_server_1b_ps_2: - abstract_ps_server_1b - host_ps_server_1b - network.outgoing.bytes.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port feature_packet_int_network: - packet_int_network - feature network.outgoing.bytes.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2 network.outgoing.packets.rate_pd_server_1b_port_2: - 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_2 memory.resident_server_1b_pd_2: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -399,18 +390,21 @@ topology_template: disk.device.allocation_server_1b_ps_2: - abstract_ps_server_1b - disk.device.allocation_ps_server_1b - network.outgoing.packets.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port + network.outpoing.packets_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_2 disk.allocation_server_1b_ps_2: - abstract_ps_server_1b - disk.allocation_ps_server_1b + network.incoming.bytes_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_2 disk.allocation_server_1b_ps_3: - abstract_ps_server_1b - disk.allocation_ps_server_1b - network.outgoing.bytes.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port + network.incoming.bytes_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_2 vcpus_server_1b_ps_2: - abstract_ps_server_1b - vcpus_ps_server_1b @@ -419,7 +413,7 @@ topology_template: - vcpus_ps_server_1b network.outgoing.bytes.rate_pd_server_1b_port_2: - 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_2 disk.write.requests_server_1b_ps_3: - abstract_ps_server_1b - disk.write.requests_ps_server_1b @@ -441,21 +435,21 @@ topology_template: os_server_1b_pd_2: - abstract_pd_server_1b - os_pd_server_1b + network.outpoing.packets_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_2 disk.write.requests_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_2: - 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_2 disk.root.size_server_1b_pd_3: - abstract_pd_server_1b - disk.root.size_pd_server_1b disk.latency_server_1b_ps_3: - abstract_ps_server_1b - disk.latency_ps_server_1b - network.incoming.packets.rate_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.packets.rate_ps_server_1b_ps_server_1b_port disk.root.size_server_1b_pd_2: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -489,15 +483,9 @@ topology_template: end_point_packet_int_network: - packet_int_network - end_point - binding_pd_server_1b_port_3: - - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port - attachment_ps_server_1b_port_3: - - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port attachment_ps_server_1b_port_2: - abstract_ps_server_1b - - attachment_ps_server_1b_ps_server_1b_port + - attachment_ps_server_1b_ps_server_1b_port_2 cpu_server_1b_ps_3: - abstract_ps_server_1b - cpu_ps_server_1b @@ -506,7 +494,7 @@ topology_template: - attachment binding_pd_server_1b_port_2: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_2 disk.allocation_server_1b_pd_3: - abstract_pd_server_1b - disk.allocation_pd_server_1b @@ -533,10 +521,7 @@ topology_template: - feature network.outgoing.bytes_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port - network.outgoing.bytes_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2 disk.usage_server_1b_ps_3: - abstract_ps_server_1b - disk.usage_ps_server_1b @@ -611,10 +596,7 @@ topology_template: - disk.root.size_ps_server_1b network.incoming.bytes.rate_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.bytes.rate_ps_server_1b_ps_server_1b_port - network.incoming.bytes.rate_ps_server_1b_port_3: - - 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_2 disk.root.size_server_1b_ps_2: - abstract_ps_server_1b - disk.root.size_ps_server_1b @@ -638,10 +620,7 @@ topology_template: - disk.write.requests.rate_pd_server_1b network.incoming.bytes_ps_server_1b_port_2: - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port - network.incoming.bytes_ps_server_1b_port_3: - - abstract_ps_server_1b - - network.incoming.bytes_ps_server_1b_ps_server_1b_port + - network.incoming.bytes_ps_server_1b_ps_server_1b_port_2 attachment_packet_int_network: - packet_int_network - attachment @@ -701,10 +680,7 @@ topology_template: - cpu_util_pd_server_1b forwarder_ps_server_1b_port_2: - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port - forwarder_ps_server_1b_port_3: - - abstract_ps_server_1b - - forwarder_ps_server_1b_ps_server_1b_port + - forwarder_ps_server_1b_ps_server_1b_port_2 feature_server_1b_pd_3: - abstract_pd_server_1b - feature_pd_server_1b @@ -735,15 +711,27 @@ topology_template: end_point_packet_ext_network: - packet_ext_network - end_point - network.outpoing.packets_ps_server_1b_port_3: + network.outgoing.bytes_ps_server_1b_1_port_2: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outgoing.bytes_ps_server_1b_ps_server_1b_port_2 + network.outgoing.packets.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_2 network.outpoing.packets_ps_server_1b_port_2: - abstract_ps_server_1b - - network.outpoing.packets_ps_server_1b_ps_server_1b_port + - network.outpoing.packets_ps_server_1b_ps_server_1b_port_2 + network.incoming.bytes.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_2 disk.write.requests.rate_server_1b_ps_2: - abstract_ps_server_1b - disk.write.requests.rate_ps_server_1b + network.incoming.packets.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2 + attachment_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - attachment_ps_server_1b_ps_server_1b_port_2 cpu_util_server_1b_pd_3: - abstract_pd_server_1b - cpu_util_pd_server_1b @@ -755,7 +743,7 @@ topology_template: - disk.write.requests.rate_ps_server_1b attachment_pd_server_1b_port_2: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_2 disk.write.bytes_server_1b_ps_3: - abstract_ps_server_1b - disk.write.bytes_ps_server_1b @@ -768,9 +756,6 @@ topology_template: disk.device.write.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.write.bytes_ps_server_1b - attachment_pd_server_1b_port_3: - - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port disk.device.read.bytes_server_1b_pd_3: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b @@ -798,9 +783,15 @@ topology_template: disk.device.capacity_server_1b_pd_3: - abstract_pd_server_1b - disk.device.capacity_pd_server_1b + network.outgoing.bytes.rate_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_2 feature_server_1b_ps_2: - abstract_ps_server_1b - feature_ps_server_1b + network.outgoing.bytes.rate_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.outgoing.bytes.rate_ps_server_1b_ps_server_1b_port_2 feature_server_1b_ps_3: - abstract_ps_server_1b - feature_ps_server_1b @@ -824,7 +815,7 @@ topology_template: - disk.read.bytes_pd_server_1b network.incoming.packets.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_2 disk.iops_server_1b_ps_2: - abstract_ps_server_1b - disk.iops_ps_server_1b @@ -834,15 +825,9 @@ topology_template: endpoint_server_1b_pd_2: - abstract_pd_server_1b - endpoint_pd_server_1b - network.incoming.packets.rate_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port network.incoming.bytes_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port - network.incoming.bytes_pd_server_1b_port_3: - - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_2 memory_server_1b_pd_2: - abstract_pd_server_1b - memory_pd_server_1b @@ -861,18 +846,36 @@ topology_template: disk.device.usage_server_1b_pd_3: - abstract_pd_server_1b - disk.device.usage_pd_server_1b + binding_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port_2 + forwarder_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - forwarder_pd_server_1b_pd_server_1b_port_2 disk.device.latency_server_1b_pd_2: - abstract_pd_server_1b - disk.device.latency_pd_server_1b + network.incoming.packets_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - network.incoming.packets_ps_server_1b_ps_server_1b_port_2 disk.device.latency_server_1b_pd_3: - abstract_pd_server_1b - disk.device.latency_pd_server_1b + binding_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - binding_ps_server_1b_ps_server_1b_port_2 scalable_server_1b_pd_3: - abstract_pd_server_1b - scalable_pd_server_1b + feature_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - feature_ps_server_1b_ps_server_1b_port_2 scalable_server_1b_pd_2: - abstract_pd_server_1b - scalable_pd_server_1b + network.incoming.packets_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port_2 cpu.delta_server_1b_pd_2: - abstract_pd_server_1b - cpu.delta_pd_server_1b @@ -882,15 +885,18 @@ topology_template: disk.device.read.requests_server_1b_pd_2: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b - network.incoming.packets_pd_server_1b_port_3: + feature_pd_server_1b_1_port_2: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_2 network.incoming.packets_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_2 disk.device.read.requests_server_1b_pd_3: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + forwarder_ps_server_1b_1_port_2: + - abstract_ps_server_1b + - forwarder_ps_server_1b_ps_server_1b_port_2 disk.device.read.bytes_server_1b_ps_2: - abstract_ps_server_1b - disk.device.read.bytes_ps_server_1b @@ -899,16 +905,10 @@ topology_template: - disk.device.read.bytes_ps_server_1b network.incoming.bytes.rate_pd_server_1b_port_2: - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port - network.incoming.bytes.rate_pd_server_1b_port_3: - - 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_2 feature_ps_server_1b_port_2: - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port - feature_ps_server_1b_port_3: - - abstract_ps_server_1b - - feature_ps_server_1b_ps_server_1b_port + - feature_ps_server_1b_ps_server_1b_port_2 requirements: dependency_template_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 @@ -922,9 +922,6 @@ topology_template: local_storage_server_1b_pd_2: - abstract_pd_server_1b - local_storage_pd_server_1b - dependency_pd_server_1b_port_3: - - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port dependency_server_1b_ps_2: - abstract_ps_server_1b - dependency_ps_server_1b @@ -933,16 +930,16 @@ topology_template: - dependency_ps_server_1b dependency_pd_server_1b_port_2: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_2 dependency_ps_server_1b_port_2: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_2 dependency_test_resourceGroup_2: - test_resourceGroup_2 - dependency - dependency_ps_server_1b_port_3: + dependency_ps_server_1b_1_port_2: - abstract_ps_server_1b - - dependency_ps_server_1b_ps_server_1b_port + - dependency_ps_server_1b_ps_server_1b_port_2 dependency_packet_int_network: - packet_int_network - dependency @@ -952,6 +949,9 @@ topology_template: dependency_test_resourceGroup_3: - test_resourceGroup_3 - dependency + dependency_pd_server_1b_1_port_2: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port_2 local_storage_server_1b_ps_2: - abstract_ps_server_1b - local_storage_ps_server_1b @@ -963,4 +963,4 @@ topology_template: - dependency_pd_server_1b dependency_server_1b_pd_3: - abstract_pd_server_1b - - dependency_pd_server_1b
\ No newline at end of file + - dependency_pd_server_1b diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml index 8998579aef..e4b250261f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/in/nested_pattern5.yml @@ -50,7 +50,7 @@ parameters: type: string resources: - pd_server_1b_port_0: + pd_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_internal_network} @@ -72,7 +72,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: pd_server_1b_flavor } networks: - - port: { get_resource: pd_server_1b_port_0 } + - port: { get_resource: pd_server_1b_1_port_1 } server_1b_pd_1: type: OS::Nova::Server @@ -103,7 +103,7 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: pd_server_1b_port_0} + parent_interface: { get_resource: pd_server_1b_1_port_1} net1: { get_resource: packet_external_network} test_resourceGroup_1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/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/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index eba8068126..e53e4ad2c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/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/complexVFCScalingScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -121,28 +121,28 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_1b_port_0: + - dependency_packet_external_network: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_packet_external_network: + - dependency_test_resourceGroup_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_test_resourceGroup_0: + - dependency_template_Vlan_vmi_1_test_resourceGroup_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_test_resourceGroup_0: + - dependency_pd_server_1b_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn @@ -190,11 +190,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_pd_server_1b_port_0: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.capacity_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -212,23 +207,12 @@ node_types: 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 network.outpoing.packets_pd_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 - feature_pd_server_1b_port_0: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED feature_pd_server_1b_port_1: type: tosca.capabilities.Node occurrences: @@ -452,18 +436,41 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_1b_port_0: + network.outgoing.bytes_pd_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 + network.outgoing.packets.rate_pd_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 + attachment_pd_server_1b_1_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED network.outgoing.bytes_pd_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.incoming.packets.rate_pd_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 + network.incoming.bytes.rate_pd_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 link_packet_external_network: type: tosca.capabilities.network.Linkable occurrences: @@ -486,12 +493,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.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. - occurrences: - - 1 - - UNBOUNDED memory.resident_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -510,18 +511,19 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_1b_port_0: - type: tosca.capabilities.Attachment + disk.ephemeral.size_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.ephemeral.size_server_1b_pd_0: + disk.ephemeral.size_server_1b_pd_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.ephemeral.size_server_1b_pd_1: + network.incoming.bytes_pd_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: @@ -537,43 +539,37 @@ node_types: occurrences: - 1 - UNBOUNDED - instance_server_1b_pd_0: + network.outgoing.bytes.rate_pd_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_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 - instance_server_1b_pd_1: + instance_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.device.capacity_server_1b_pd_1: + disk.device.capacity_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 - network.outgoing.bytes.rate_pd_server_1b_port_1: + instance_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_port_0: + disk.device.capacity_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_port_0: + network.outgoing.bytes.rate_pd_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: @@ -600,6 +596,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_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 network.incoming.packets.rate_pd_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. @@ -637,12 +639,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_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.root.size_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -696,19 +692,24 @@ node_types: occurrences: - 1 - UNBOUNDED + binding_pd_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: + - 0 + - UNBOUNDED disk.allocation_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 - binding_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 + forwarder_pd_server_1b_1_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - - 0 + - 1 - UNBOUNDED disk.device.latency_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer @@ -769,6 +770,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_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 cpu.delta_server_1b_pd_1: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -793,19 +800,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_pd_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. + feature_pd_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - vcpus_server_1b_pd_1: + network.incoming.packets_pd_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.incoming.packets_pd_server_1b_port_0: + vcpus_server_1b_pd_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: @@ -858,12 +864,6 @@ node_types: 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. - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.pd_server_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: @@ -879,143 +879,143 @@ node_types: status: SUPPORTED entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_pd_server_1b_port_1_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - vm_image_name: + vm_flavor_name: type: string required: true status: SUPPORTED - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true status: SUPPORTED - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: 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: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true status: SUPPORTED requirements: - - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_pd_server_1b: 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: + - local_storage_pd_server_1b: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_1b_pd_server_1b_port_1: 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: + - link_pd_server_1b_pd_server_1b_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_1b: + - dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server_1b: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_1b_pd_server_1b_port: + - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_1b_pd_server_1b_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1028,11 +1028,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: @@ -1052,28 +1047,25 @@ 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: + network.incoming.packets.rate_pd_server_1b_pd_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 - 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: - 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_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 disk.device.read.requests_pd_server_1b: type: org.openecomp.capabilities.metric.Ceilometer @@ -1092,14 +1084,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. @@ -1123,6 +1107,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_pd_server_1b_pd_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.allocation_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. @@ -1135,7 +1125,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_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: @@ -1165,14 +1155,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server_1b: + network.incoming.bytes.rate_pd_server_1b_pd_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 - 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 @@ -1194,7 +1185,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port: + network.outgoing.bytes_pd_server_1b_pd_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: @@ -1211,7 +1202,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -1222,6 +1213,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes.rate_pd_server_1b_pd_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_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. @@ -1234,6 +1231,16 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_1b_pd_server_1b_port_1: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED + feature_pd_server_1b_pd_server_1b_port_1: + 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. @@ -1257,12 +1264,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_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 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. @@ -1274,15 +1275,19 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_util_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_pd_server_1b_pd_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. + attachment_pd_server_1b_pd_server_1b_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1292,12 +1297,7 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - network.incoming.packets_pd_server_1b_pd_server_1b_port: + network.incoming.packets_pd_server_1b_pd_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: @@ -1321,25 +1321,25 @@ 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: + disk.write.requests.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.write.requests.rate_pd_server_1b: + network.outgoing.packets.rate_pd_server_1b_pd_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: @@ -1411,4 +1411,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/complexVFCScalingScenario/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/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 17f0ff073f..c0531975e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/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/complexVFCScalingScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -21,108 +21,83 @@ topology_template: required: true entry_schema: type: float - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - vm_flavor_name: + port_pd_server_1b_port_1_network_role_tag: type: string required: true - port_pd_server_1b_port_vlan_requirements: + port_pd_server_1b_port_1_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - subinterface_nested_vlan_net1: + port_pd_server_1b_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_1b_port_1_subnetpoolid: + type: string + required: true + port_pd_server_1b_port_1_related_networks: type: list required: true entry_schema: - type: string - port_pd_server_1b_port_related_networks: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_pd_server_1b_port_1_fixed_ips: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd_server_1b_port_network_role_tag: - type: string + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pd_server_1b_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - vm_image_name: + vm_flavor_name: type: string required: true - port_pd_server_1b_port_replacement_policy: + subinterface_nested_vlan_net1: type: list required: true entry_schema: type: string - port_pd_server_1b_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pd_server_1b_port_1_order: + type: integer required: true - port_pd_server_1b_port_network_role: + vm_image_name: type: string required: true - subinterface_nested_vlan_parent_interface: + port_pd_server_1b_port_1_network: type: list required: true entry_schema: type: string - port_pd_server_1b_port_fixed_ips: + subinterface_nested_vlan_parent_interface: type: list required: true entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd_server_1b_port_network: + type: string + port_pd_server_1b_port_1_replacement_policy: type: list required: true entry_schema: type: string - compute_pd_server_1b_availability_zone: + port_pd_server_1b_port_1_ip_requirements: 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: + type: org.openecomp.datatypes.network.IpRequirements + compute_pd_server_1b_availability_zone: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd_server_1b_port_subnetpoolid: + type: string + port_pd_server_1b_port_1_network_role: type: string required: true node_templates: - pd_server_1b_pd_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: pd_server_1b_pd_server_1b_port - relationship: tosca.relationships.network.BindsTo pd_server_1b: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server_1b properties: @@ -138,54 +113,76 @@ 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_1: 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_1_replacement_policy - index_value mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements + get_input: port_pd_server_1b_port_1_mac_requirements order: - get_input: port_pd_server_1b_port_order + get_input: port_pd_server_1b_port_1_order exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming + get_input: port_pd_server_1b_port_1_exCP_naming vlan_requirements: - get_input: port_pd_server_1b_port_vlan_requirements + get_input: port_pd_server_1b_port_1_vlan_requirements subinterface_indicator: true ip_requirements: - get_input: port_pd_server_1b_port_ip_requirements + get_input: port_pd_server_1b_port_1_ip_requirements related_networks: - get_input: port_pd_server_1b_port_related_networks + get_input: port_pd_server_1b_port_1_related_networks network_role_tag: - get_input: port_pd_server_1b_port_network_role_tag + get_input: port_pd_server_1b_port_1_network_role_tag network_role: - get_input: port_pd_server_1b_port_network_role + get_input: port_pd_server_1b_port_1_network_role fixed_ips: get_input: - - port_pd_server_1b_port_fixed_ips + - port_pd_server_1b_port_1_fixed_ips - index_value subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid + get_input: port_pd_server_1b_port_1_subnetpoolid network: get_input: - - port_pd_server_1b_port_network + - port_pd_server_1b_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server_1b relationship: tosca.relationships.network.BindsTo + pd_server_1b_pd_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: pd_server_1b_pd_server_1b_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server_1b capabilities: 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,18 +192,15 @@ 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 + network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.packets.rate + binding_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - binding disk.device.read.requests_pd_server_1b: - pd_server_1b - disk.device.read.requests @@ -216,9 +210,6 @@ topology_template: 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 @@ -231,15 +222,18 @@ topology_template: endpoint_pd_server_1b: - pd_server_1b - endpoint + network.outpoing.packets_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outpoing.packets disk.device.allocation_pd_server_1b: - pd_server_1b - disk.device.allocation 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_1: + - pd_server_1b_pd_server_1b_port_1 + - network.incoming.bytes memory_pd_server_1b: - pd_server_1b - memory @@ -252,12 +246,12 @@ 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_1: + - pd_server_1b_pd_server_1b_port_1 + - 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 @@ -267,27 +261,36 @@ topology_template: 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 + network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - 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 + feature_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature disk.device.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.device.write.bytes.rate + network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.bytes.rate disk.root.size_pd_server_1b: - pd_server_1b - disk.root.size disk.iops_pd_server_1b: - pd_server_1b - disk.iops + forwarder_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - forwarder + feature_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - feature disk.write.bytes_pd_server_1b: - pd_server_1b - disk.write.bytes @@ -300,29 +303,26 @@ 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 binding_pd_server_1b: - pd_server_1b - binding + feature_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan + - feature_template_Vlan_vmi_1 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 + attachment_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - 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_1: + - pd_server_1b_pd_server_1b_port_1 - network.incoming.packets disk.device.write.requests.rate_pd_server_1b: - pd_server_1b @@ -333,9 +333,6 @@ 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 @@ -345,6 +342,9 @@ topology_template: disk.write.requests.rate_pd_server_1b: - pd_server_1b - disk.write.requests.rate + network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - network.outgoing.packets.rate requirements: dependency_pd_server_1b: - pd_server_1b @@ -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_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 - link - dependency_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_nested_vlan - dependency - dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan + dependency_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_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 + dependency_pd_server_1b_pd_server_1b_port_1: + - pd_server_1b_pd_server_1b_port_1 + - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_1_nested_vlan: + - pd_server_1b_pd_server_1b_port_1_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/complexVFCScalingScenario/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/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml index b822c5efa3..1eac7cb338 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/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/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -119,23 +119,7 @@ topology_template: subinterface_nested_vlan_service_template_filter_count: - 9 - 9 - vm_flavor_name: - get_input: pd_server_1b_flavor - subinterface_nested_vlan_net1: - - packet_external_network - - packet_external_network - vm_image_name: - get_input: pd_server_1b_image - port_pd_server_1b_port_replacement_policy: - - AUTO - - AUTO - port_pd_server_1b_port_mac_requirements: - mac_count_required: - is_required: false - subinterface_nested_vlan_parent_interface: - - pd_server_1b_port_0 - - pd_server_1b_port_1 - port_pd_server_1b_port_fixed_ips: + port_pd_server_1b_port_1_fixed_ips: - - ip_address: get_input: - pd_server_1b_ips @@ -144,18 +128,34 @@ topology_template: get_input: - pd_server_1b_ips - 0 - port_pd_server_1b_port_network: + port_pd_server_1b_port_1_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_server_1b_flavor + subinterface_nested_vlan_net1: + - packet_external_network + - packet_external_network + vm_image_name: + get_input: pd_server_1b_image + port_pd_server_1b_port_1_network: - packet_internal_network - packet_internal_network - compute_pd_server_1b_availability_zone: - - get_input: availability_zone_0 - - get_input: availability_zone_0 - port_pd_server_1b_port_ip_requirements: + subinterface_nested_vlan_parent_interface: + - pd_server_1b_1_port_1 + - pd_server_1b_port_1 + port_pd_server_1b_port_1_replacement_policy: + - AUTO + - AUTO + port_pd_server_1b_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false + compute_pd_server_1b_availability_zone: + - get_input: availability_zone_0 + - get_input: availability_zone_0 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 2 @@ -165,11 +165,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_1: 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_1_nested_vlan: capability: tosca.capabilities.network.Linkable node: packet_external_network relationship: tosca.relationships.network.LinksTo @@ -192,30 +192,21 @@ topology_template: disk.device.write.requests_server_1b_pd_1: - abstract_pd_server_1b - disk.device.write.requests_pd_server_1b - forwarder_pd_server_1b_port_0: - - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port disk.capacity_server_1b_pd_1: - abstract_pd_server_1b - disk.capacity_pd_server_1b forwarder_pd_server_1b_port_1: - abstract_pd_server_1b - - forwarder_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_1 disk.capacity_server_1b_pd_0: - abstract_pd_server_1b - disk.capacity_pd_server_1b - 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_port_1: - abstract_pd_server_1b - - network.outpoing.packets_pd_server_1b_pd_server_1b_port - feature_pd_server_1b_port_0: - - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1 feature_pd_server_1b_port_1: - abstract_pd_server_1b - - feature_pd_server_1b_pd_server_1b_port + - feature_pd_server_1b_pd_server_1b_port_1 attachment_packet_internal_network: - packet_internal_network - attachment @@ -330,12 +321,24 @@ topology_template: binding_server_1b_pd_1: - abstract_pd_server_1b - binding_pd_server_1b - network.outgoing.bytes_pd_server_1b_port_0: + network.outgoing.bytes_pd_server_1b_1_port_1: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1 + network.outgoing.packets.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port_1 + attachment_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - attachment_pd_server_1b_pd_server_1b_port_1 network.outgoing.bytes_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes_pd_server_1b_pd_server_1b_port_1 + network.incoming.packets.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1 + network.incoming.bytes.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port_1 link_packet_external_network: - packet_external_network - link @@ -344,13 +347,10 @@ topology_template: - memory.resident_pd_server_1b attachment_pd_server_1b_port_1: - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port + - attachment_pd_server_1b_pd_server_1b_port_1 network.outgoing.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.packets.rate_pd_server_1b_pd_server_1b_port - 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_1 memory.resident_server_1b_pd_1: - abstract_pd_server_1b - memory.resident_pd_server_1b @@ -360,21 +360,24 @@ topology_template: disk.device.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.bytes_pd_server_1b - attachment_pd_server_1b_port_0: - - abstract_pd_server_1b - - attachment_pd_server_1b_pd_server_1b_port disk.ephemeral.size_server_1b_pd_0: - abstract_pd_server_1b - disk.ephemeral.size_pd_server_1b disk.ephemeral.size_server_1b_pd_1: - abstract_pd_server_1b - disk.ephemeral.size_pd_server_1b + network.incoming.bytes_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1 end_point_packet_internal_network: - packet_internal_network - end_point feature_packet_internal_network: - packet_internal_network - feature + network.outgoing.bytes.rate_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1 instance_server_1b_pd_0: - abstract_pd_server_1b - instance_pd_server_1b @@ -389,13 +392,7 @@ topology_template: - disk.device.capacity_pd_server_1b network.outgoing.bytes.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port - 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.incoming.packets.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.outgoing.bytes.rate_pd_server_1b_pd_server_1b_port_1 os_server_1b_pd_1: - abstract_pd_server_1b - os_pd_server_1b @@ -408,9 +405,12 @@ topology_template: disk.read.bytes_server_1b_pd_0: - abstract_pd_server_1b - disk.read.bytes_pd_server_1b + network.outpoing.packets_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.outpoing.packets_pd_server_1b_pd_server_1b_port_1 network.incoming.packets.rate_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port + - network.incoming.packets.rate_pd_server_1b_pd_server_1b_port_1 disk.read.bytes_server_1b_pd_1: - abstract_pd_server_1b - disk.read.bytes_pd_server_1b @@ -419,16 +419,13 @@ topology_template: - endpoint_pd_server_1b network.incoming.bytes_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port + - network.incoming.bytes_pd_server_1b_pd_server_1b_port_1 host_server_1b_pd_1: - abstract_pd_server_1b - host_pd_server_1b host_server_1b_pd_0: - abstract_pd_server_1b - host_pd_server_1b - network.incoming.bytes_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.bytes_pd_server_1b_pd_server_1b_port disk.root.size_server_1b_pd_1: - abstract_pd_server_1b - disk.root.size_pd_server_1b @@ -456,18 +453,21 @@ topology_template: disk.allocation_server_1b_pd_1: - abstract_pd_server_1b - disk.allocation_pd_server_1b + binding_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - binding_pd_server_1b_pd_server_1b_port_1 disk.allocation_server_1b_pd_0: - abstract_pd_server_1b - disk.allocation_pd_server_1b - binding_pd_server_1b_port_0: + forwarder_pd_server_1b_1_port_1: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - forwarder_pd_server_1b_pd_server_1b_port_1 disk.device.latency_server_1b_pd_1: - abstract_pd_server_1b - disk.device.latency_pd_server_1b binding_pd_server_1b_port_1: - abstract_pd_server_1b - - binding_pd_server_1b_pd_server_1b_port + - binding_pd_server_1b_pd_server_1b_port_1 disk.device.read.requests.rate_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests.rate_pd_server_1b @@ -492,6 +492,9 @@ topology_template: cpu.delta_server_1b_pd_0: - abstract_pd_server_1b - cpu.delta_pd_server_1b + network.incoming.packets_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - network.incoming.packets_pd_server_1b_pd_server_1b_port_1 cpu.delta_server_1b_pd_1: - abstract_pd_server_1b - cpu.delta_pd_server_1b @@ -504,15 +507,15 @@ topology_template: disk.device.read.requests_server_1b_pd_0: - abstract_pd_server_1b - disk.device.read.requests_pd_server_1b + feature_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - feature_pd_server_1b_pd_server_1b_port_1 network.incoming.packets_pd_server_1b_port_1: - abstract_pd_server_1b - - network.incoming.packets_pd_server_1b_pd_server_1b_port + - network.incoming.packets_pd_server_1b_pd_server_1b_port_1 vcpus_server_1b_pd_1: - abstract_pd_server_1b - vcpus_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 disk.read.bytes.rate_server_1b_pd_1: - abstract_pd_server_1b - disk.read.bytes.rate_pd_server_1b @@ -530,16 +533,13 @@ topology_template: - attachment network.incoming.bytes.rate_pd_server_1b_port_1: - 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_1 disk.latency_server_1b_pd_1: - abstract_pd_server_1b - disk.latency_pd_server_1b disk.latency_server_1b_pd_0: - abstract_pd_server_1b - disk.latency_pd_server_1b - network.incoming.bytes.rate_pd_server_1b_port_0: - - abstract_pd_server_1b - - network.incoming.bytes.rate_pd_server_1b_pd_server_1b_port requirements: dependency_test_resourceGroup_1: - test_resourceGroup_1 @@ -556,15 +556,15 @@ topology_template: dependency_template_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - dependency_template_Vlan_vmi_1 - dependency_pd_server_1b_port_0: - - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port local_storage_server_1b_pd_1: - abstract_pd_server_1b - local_storage_pd_server_1b dependency_server_1b_pd_0: - abstract_pd_server_1b - dependency_pd_server_1b + dependency_pd_server_1b_1_port_1: + - abstract_pd_server_1b + - dependency_pd_server_1b_pd_server_1b_port_1 dependency_server_1b_pd_1: - abstract_pd_server_1b - dependency_pd_server_1b @@ -573,7 +573,7 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_pd_server_1b_port_1: - abstract_pd_server_1b - - dependency_pd_server_1b_pd_server_1b_port + - dependency_pd_server_1b_pd_server_1b_port_1 dependency_packet_external_network: - packet_external_network - - 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/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml index 68afa6b380..f8df24b534 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml index dc8f67e346..bf477345de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/in/nested_pattern5_levelTwo.yml @@ -66,7 +66,7 @@ resources: networks: - port: { get_resource: ps_server_1b_port_1 } - ps_server_1b_port_2: + ps_server_1b_1_port_1: type: OS::Neutron::Port properties: network: {get_resource: packet_int_network} @@ -81,7 +81,7 @@ resources: availability_zone: { get_param: availability_zone_0 } flavor: { get_param: ps_server_1b_flavor } networks: - - port: { get_resource: ps_server_1b_port_2 } + - port: { get_resource: ps_server_1b_1_port_1 } test_resourceGroup_1: type: OS::Heat::ResourceGroup @@ -100,5 +100,5 @@ resources: resource_def: type: nested_vlan.yml properties: - parent_interface: { get_resource: ps_server_1b_port_2} + parent_interface: { get_resource: ps_server_1b_1_port_1} net1: { get_resource: packet_ext_network}
\ 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/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 519a0da24b..e44facaecf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -171,7 +171,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 @@ -213,14 +213,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 @@ -253,6 +253,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. @@ -297,12 +303,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. @@ -315,6 +331,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: @@ -336,12 +358,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. @@ -387,12 +403,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. @@ -497,6 +507,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. @@ -555,23 +571,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: @@ -600,11 +605,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. @@ -640,6 +640,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. @@ -658,12 +672,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. @@ -866,12 +892,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: @@ -966,14 +986,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. @@ -1015,6 +1027,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. @@ -1105,29 +1123,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. @@ -1145,12 +1157,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: @@ -1237,12 +1243,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. @@ -1276,6 +1276,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 @@ -1284,108 +1292,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_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - dependency_template_subint_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_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1405,14 +1405,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: @@ -1425,11 +1425,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: @@ -1449,34 +1444,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 @@ -1489,14 +1481,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. @@ -1509,6 +1493,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_0_nested_vlan: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.requests.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. @@ -1532,7 +1521,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: @@ -1562,14 +1551,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 @@ -1585,13 +1575,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: @@ -1620,12 +1620,23 @@ node_types: occurrences: - 1 - UNBOUNDED + 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: + - 1 + - UNBOUNDED disk.iops_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 + 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. @@ -1649,12 +1660,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_1b_pd_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 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. @@ -1666,35 +1671,30 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED cpu_util_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_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: @@ -1718,19 +1718,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: @@ -1852,7 +1852,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 @@ -1888,14 +1888,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. @@ -1970,12 +1962,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. @@ -2005,12 +1991,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. @@ -2123,23 +2103,18 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_ps_server_1b_port_2: - type: org.openecomp.capabilities.Forwarder + link_packet_int_network: + type: tosca.capabilities.network.Linkable occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_1b_port_2: + instance_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 - link_packet_int_network: - type: tosca.capabilities.network.Linkable - occurrences: - - 1 - - UNBOUNDED - instance_server_1b_ps_2: + 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: @@ -2162,7 +2137,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: @@ -2192,20 +2167,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 @@ -2246,14 +2227,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 @@ -2304,6 +2284,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: @@ -2337,6 +2323,12 @@ 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. @@ -2348,6 +2340,12 @@ node_types: 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 feature_template_subint_Vlan_vmi_1_test_resourceGroup_1: type: tosca.capabilities.Node occurrences: @@ -2401,12 +2399,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. @@ -2474,13 +2466,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 @@ -2494,20 +2487,27 @@ node_types: occurrences: - 1 - UNBOUNDED + 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: + - 0 + - UNBOUNDED feature_test_resourceGroup_2: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_ps_server_1b_port_2: + network.outgoing.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. occurrences: - 1 - UNBOUNDED - network.outgoing.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. + feature_ps_server_1b_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -2523,6 +2523,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. @@ -2557,11 +2562,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. @@ -2577,32 +2577,22 @@ node_types: 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 @@ -2611,72 +2601,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 @@ -2698,34 +2698,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_subint_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_subint_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_subint_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_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -2767,30 +2767,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: @@ -2802,11 +2803,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. @@ -2856,11 +2852,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. @@ -2873,7 +2864,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: @@ -2891,19 +2882,30 @@ 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. occurrences: - 1 - UNBOUNDED - feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + feature_ps_server_1b_ps_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -2943,25 +2945,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: @@ -2977,6 +2961,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. @@ -2995,12 +2984,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. @@ -3013,18 +3010,18 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps_server_1b: - type: tosca.capabilities.Endpoint.Admin + 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 - network.incoming.bytes.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. + endpoint_ps_server_1b: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - feature_ps_server_1b_ps_server_1b_port: + feature_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_1_nested_vlan: type: tosca.capabilities.Node occurrences: - 1 @@ -3035,6 +3032,12 @@ node_types: occurrences: - 1 - UNBOUNDED + 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: + - 1 + - UNBOUNDED cpu.delta_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. @@ -3047,13 +3050,10 @@ 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.heat.subinterface.nested_vlan: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute @@ -3121,4 +3121,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/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/Nested_pd_server_1bServiceTemplate.yaml index aade6f5ee0..5d0a28208d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/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_subint_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,36 +192,33 @@ 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 disk.write.bytes.rate_pd_server_1b: - pd_server_1b - disk.write.bytes.rate + feature_template_subint_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_subint_Vlan_vmi_1 disk.device.read.requests.rate_pd_server_1b: - pd_server_1b - disk.device.read.requests.rate @@ -237,9 +231,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,24 +246,30 @@ 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 @@ -282,9 +282,15 @@ topology_template: 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 @@ -297,32 +303,26 @@ 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 binding_pd_server_1b: - pd_server_1b - binding - feature_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - feature_template_subint_Vlan_vmi_1 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,37 +333,37 @@ 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 requirements: + subinterface_link_template_subint_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_subint_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency 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 + dependency_template_subint_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_subint_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 - subinterface_link_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - subinterface_link_template_subint_Vlan_vmi_1 - dependency_pd_server_1b_pd_server_1b_port: - - pd_server_1b_pd_server_1b_port + dependency_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 - dependency - dependency_template_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - dependency_template_subint_Vlan_vmi_1
\ No newline at end of file + link_pd_server_1b_pd_server_1b_port_0: + - pd_server_1b_pd_server_1b_port_0 + - link diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 1e89da0a89..5bcbd384c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/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_subint_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_subint_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: @@ -198,27 +198,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 +240,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,15 +255,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_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - feature_template_subint_Vlan_vmi_1 + 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 @@ -288,17 +288,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 @@ -306,6 +297,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 @@ -315,55 +309,61 @@ 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 + feature_template_subint_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_subint_Vlan_vmi_1 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: + subinterface_link_template_subint_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_subint_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_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_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan + dependency_template_subint_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_subint_Vlan_vmi_1 - subinterface_link_template_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: - - ps_server_1b_ps_server_1b_port_nested_vlan - - subinterface_link_template_subint_Vlan_vmi_1 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/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml index 3993f75f99..7ee8455f3e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5ServiceTemplate.yaml @@ -101,34 +101,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 @@ -138,11 +138,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_subint_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - subinterface_link_template_subint_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 @@ -174,12 +174,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 @@ -195,6 +195,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 @@ -215,22 +218,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 @@ -240,9 +252,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 @@ -267,9 +276,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 @@ -324,6 +330,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 @@ -354,15 +363,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 @@ -378,9 +381,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 @@ -399,6 +399,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 @@ -407,10 +413,16 @@ topology_template: - disk.device.iops_server_1b_ps_2 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 @@ -428,7 +440,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 @@ -440,7 +452,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 @@ -512,13 +524,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 @@ -563,13 +572,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 @@ -591,6 +597,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 @@ -626,7 +635,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 @@ -636,18 +645,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 @@ -657,9 +663,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 @@ -689,7 +692,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 @@ -705,12 +708,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 @@ -718,6 +718,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 @@ -735,10 +738,7 @@ 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_ps_server_1b_port_2_test_nested_level2: - - test_nested_level2 - - dependency_ps_server_1b_port_2 + - dependency_pd_server_1b_pd_server_1b_port_0 dependency_test_resourceGroup_2_test_nested_level2: - test_nested_level2 - dependency_test_resourceGroup_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 2bba8fd0f1..385411612c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -78,34 +78,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: @@ -121,11 +121,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_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_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 @@ -144,34 +144,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: - 19 - 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 - 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 + - 1 subinterface_nested_vlan_parent_interface: - - ps_server_1b_port_2 + - ps_server_1b_1_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: @@ -187,11 +187,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_subint_Vlan_vmi_1_ps_server_1b_ps_server_1b_port_nested_vlan: + - subinterface_link_template_subint_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 @@ -207,7 +207,6 @@ topology_template: subinterface_role: Vlan members: - abstract_ps_server_1b_0 - - abstract_ps_server_1b_1 nested_pattern5_levelTwo_group: type: org.openecomp.groups.heat.HeatStack properties: @@ -221,9 +220,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_0 - disk.device.latency_ps_server_1b @@ -247,7 +243,7 @@ topology_template: - disk.device.write.requests.rate_ps_server_1b binding_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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_0 - disk.read.bytes_ps_server_1b @@ -260,15 +256,12 @@ topology_template: disk.root.size_server_1b_ps_1: - abstract_ps_server_1b_0 - 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_0 - - 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_0 - disk.device.read.requests.rate_ps_server_1b @@ -278,12 +271,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_0 - - 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 @@ -325,7 +315,7 @@ topology_template: - memory_ps_server_1b network.outgoing.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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_0 - disk.capacity_ps_server_1b @@ -337,19 +327,16 @@ topology_template: - instance_ps_server_1b forwarder_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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 instance_server_1b_ps_2: - abstract_ps_server_1b_1 - instance_ps_server_1b + 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_0 - disk.device.capacity_ps_server_1b @@ -359,9 +346,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 @@ -370,19 +357,22 @@ topology_template: - disk.device.iops_ps_server_1b network.incoming.packets_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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_0 - - 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_0 - - 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_0 - 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_0 - disk.device.allocation_ps_server_1b @@ -401,12 +391,12 @@ topology_template: host_server_1b_ps_1: - abstract_ps_server_1b_0 - 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_0 - disk.write.bytes.rate_ps_server_1b @@ -431,6 +421,9 @@ topology_template: scalable_server_1b_ps_1: - abstract_ps_server_1b_0 - 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 @@ -449,12 +442,18 @@ topology_template: vcpus_server_1b_ps_1: - abstract_ps_server_1b_0 - 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 feature_template_subint_Vlan_vmi_1_test_resourceGroup_2: - test_resourceGroup_2 - feature_template_subint_Vlan_vmi_1 + 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 feature_template_subint_Vlan_vmi_1_test_resourceGroup_1: - test_resourceGroup_1 - feature_template_subint_Vlan_vmi_1 @@ -482,9 +481,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 @@ -493,7 +489,7 @@ topology_template: - disk.latency_ps_server_1b network.incoming.packets.rate_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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_0 - binding_ps_server_1b @@ -520,34 +516,40 @@ topology_template: - end_point attachment_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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_0 - os_ps_server_1b + binding_ps_server_1b_1_port_1: + - abstract_ps_server_1b_1 + - binding_ps_server_1b_ps_server_1b_port_1 feature_test_resourceGroup_2: - test_resourceGroup_2 - feature - network.outgoing.bytes_ps_server_1b_port_2: - - abstract_ps_server_1b_1 - - network.outgoing.bytes_ps_server_1b_ps_server_1b_port network.outgoing.bytes_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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_0 - 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 @@ -565,10 +567,7 @@ topology_template: - feature feature_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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_0 - disk.device.read.bytes.rate_ps_server_1b @@ -579,21 +578,21 @@ 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_test_resourceGroup_2: - test_resourceGroup_2 - dependency dependency_ps_server_1b_port_1: - abstract_ps_server_1b_0 - - 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_0 - 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 |