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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes')
5 files changed, 415 insertions, 415 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml index 923c53d41f..5a35661871 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/in/main.yml @@ -136,7 +136,7 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_2_untr_port_2} + - port: {get_resource: vdbe_2_untr_port_1} vdbe_1_untr_port_1: type: OS::Neutron::Port properties: @@ -149,7 +149,7 @@ resources: get_param: vdbe_name_1 template: VM_NAMEDBE001p1n004 - vdbe_2_untr_port_2: + vdbe_2_untr_port_1: type: OS::Neutron::Port properties: name: @@ -236,7 +236,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_2_untr_port_2 + get_resource: vdbe_2_untr_port_1 subinterfaces_name_prefix: str_replace: params: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index f514c6153c..39cfc595b6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -120,10 +120,6 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_port_network_role_tag: - type: string - required: true - status: SUPPORTED subinterface_nested1_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -136,10 +132,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED subinterface_nested1_vn_network_list: type: list required: true @@ -152,11 +144,25 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED - port_vdbe_untr_port_order: + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_order: type: integer required: true status: SUPPORTED @@ -164,10 +170,6 @@ node_types: type: string required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED subinterface_nested1_vmac_address: type: list required: true @@ -210,6 +212,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_untrusted_ip_prefix_len: type: list required: true @@ -222,10 +230,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_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 @@ -234,13 +256,7 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED @@ -252,10 +268,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_nested1_aap_untrusted_ip_prefix: type: list required: true @@ -280,40 +292,28 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe_vdbe_untr_port_nested1: + - dependency_vdbe_vdbe_untr_port_1_nested1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: + - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -333,47 +333,35 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_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_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - feature_vdbe: + feature_vdbe_vdbe_untr_port_1_nested1: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: + feature_vdbe: type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - attachment_vdbe_vdbe_untr_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -421,13 +409,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_vdbe: type: org.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_vdbe_vdbe_untr_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_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_vdbe_vdbe_untr_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: @@ -450,42 +449,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_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_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.allocation_vdbe: + disk.device.capacity_vdbe: type: org.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_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_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.usage_vdbe: + disk.device.allocation_vdbe: type: org.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_vdbe_vdbe_untr_port: + disk.usage_vdbe: type: org.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_vdbe_vdbe_untr_port: + memory.usage_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -497,12 +491,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -510,13 +499,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED instance_vdbe: type: org.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_vdbe_vdbe_untr_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_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: @@ -540,11 +535,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested1: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED memory.resident_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -587,9 +577,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_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_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -612,12 +601,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_vdbe_vdbe_untr_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_vdbe: type: org.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_vdbe_vdbe_untr_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_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem occurrences: @@ -664,12 +670,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED org.openecomp.resource.abstract.nodes.heat.subinterface.nested1: derived_from: org.openecomp.resource.abstract.nodes.AbstractSubstitute properties: @@ -785,20 +785,12 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_vdbe_untr_port_network_role_tag: - type: string - required: true - status: SUPPORTED subinterface_nested2_subinterfaces_name_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_vdbe_availability_zone: type: list required: true @@ -811,6 +803,16 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true @@ -821,28 +823,28 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED subinterface_nested2_aap_sec_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true - status: SUPPORTED subinterface_nested2_vmac_address: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: - type: string + port_vdbe_untr_port_1_order: + type: integer required: true status: SUPPORTED - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming + vm_image_name: + type: string required: true status: SUPPORTED compute_vdbe_metadata: @@ -851,6 +853,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_vdbe_untr_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested2_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -863,10 +871,24 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_nested2_ip_address: type: list required: true @@ -881,34 +903,24 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_vlan_tag_list: type: list required: true status: SUPPORTED entry_schema: type: json - port_vdbe_untr_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_aap_untrusted_ip_prefix_len: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true - status: SUPPORTED subinterface_nested2_service_template_filter_count: type: list required: true @@ -957,34 +969,22 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements requirements: - - dependency_vdbe_vdbe_untr_port_nested2: + - dependency_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: + - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -1004,29 +1004,27 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_vdbe_vdbe_untr_port: + - dependency_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_port: + - link_vdbe_vdbe_untr_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + feature_vdbe_vdbe_untr_port_1_nested2: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + forwarder_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -1035,16 +1033,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - attachment_vdbe_vdbe_untr_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.device.iops_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1092,13 +1080,24 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.write.bytes.rate_vdbe: type: org.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_vdbe_vdbe_untr_port: + network.incoming.bytes.rate_vdbe_vdbe_untr_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_vdbe_vdbe_untr_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: @@ -1121,37 +1120,37 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.capacity_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_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_vdbe: + disk.device.capacity_vdbe: type: org.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_vdbe: + network.outgoing.bytes_vdbe_vdbe_untr_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.usage_vdbe: + disk.device.allocation_vdbe: type: org.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_vdbe_vdbe_untr_port: + disk.usage_vdbe: type: org.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_vdbe_vdbe_untr_port: + memory.usage_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -1163,12 +1162,7 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_vdbe_vdbe_untr_port: + binding_vdbe_vdbe_untr_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -1176,13 +1170,19 @@ node_types: occurrences: - 0 - UNBOUNDED + network.incoming.bytes_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED instance_vdbe: type: org.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_vdbe_vdbe_untr_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_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: @@ -1194,6 +1194,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1212,11 +1217,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_vdbe_untr_port_nested2: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -1253,9 +1253,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_vdbe_vdbe_untr_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_vdbe_vdbe_untr_port_1: + type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED @@ -1278,8 +1277,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_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 @@ -1289,6 +1289,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_vdbe_vdbe_untr_port_1: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED os_vdbe: type: tosca.capabilities.OperatingSystem occurrences: @@ -1335,9 +1341,3 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_vdbe_vdbe_untr_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index e71657f3c9..88088e4d67 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -432,10 +432,18 @@ topology_template: - get_input: availability_zone_1 subinterface_nested2_aap_untrusted_v6_ip_prefix: - get_input: vdbe_aap_untrusted_v6_ip_prefix + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 vm_flavor_name: get_input: vdbe_flavor_name subinterface_nested2_parent_interface: - - vdbe_2_untr_port_2 + - vdbe_2_untr_port_1 subinterface_nested2_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix subinterface_nested2_vmac_address: @@ -453,19 +461,17 @@ topology_template: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len subinterface_nested2_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false subinterface_nested2_ip_address: - get_input: vdbe_untrusted_ip_1 - port_vdbe_untr_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested2_vlan_tag_list: - get_input: untrusted_vlan_tags subinterface_nested2_aap_untrusted_ip_prefix_len: @@ -486,12 +492,6 @@ topology_template: - get_input: aap_address_mode subinterface_nested2_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_vdbe_1ServiceTemplate.yaml count: 1 @@ -513,6 +513,14 @@ topology_template: - get_input: untrusted_vn_networks compute_vdbe_availability_zone: - get_input: availability_zone_1 + port_vdbe_untr_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 vm_flavor_name: get_input: vdbe_flavor_name vm_image_name: @@ -546,17 +554,15 @@ topology_template: - get_input: vdbe_aap_untrusted_ip_prefix_len subinterface_nested1_ip_v6_address: - get_input: vdbe_untrusted_v6_ip_1 - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_vdbe_untr_port_1_mac_requirements: mac_count_required: is_required: false - port_vdbe_untr_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested1_mac_address: - get_input: vdbe_hw_untr_mac_1 subinterface_nested1_aap_untrusted_ip_prefix: @@ -569,12 +575,6 @@ topology_template: - get_input: vdbe_name_1 subinterface_nested1_aap_sec_untrusted_ip_prefix: - get_input: vdbe_aap_sec_untrusted_ip_prefix - port_vdbe_untr_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index 67fb90607c..f36cad822b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -11,9 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_port_network_role_tag: - type: string - required: true subinterface_nested1_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -24,9 +21,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true subinterface_nested1_vn_network_list: type: list required: true @@ -37,18 +31,26 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true - port_vdbe_untr_port_order: + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true + port_vdbe_untr_port_1_order: type: integer required: true vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true subinterface_nested1_vmac_address: type: list required: true @@ -84,6 +86,11 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_untrusted_ip_prefix_len: type: list required: true @@ -94,9 +101,20 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -104,12 +122,7 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: - type: list - required: true - entry_schema: - type: string - port_vdbe_untr_port_vlan_requirements: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: @@ -119,9 +132,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true subinterface_nested1_aap_untrusted_ip_prefix: type: list required: true @@ -142,23 +152,13 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested1_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements node_templates: - vdbe_vdbe_untr_port_nested1: + vdbe_vdbe_untr_port_1_nested1: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested1 directives: - substitutable @@ -238,7 +238,7 @@ topology_template: requirements: - binding_vdbe_0_subint_untr_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe @@ -259,31 +259,31 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_port: + vdbe_vdbe_untr_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming + get_input: port_vdbe_untr_port_1_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_1_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_1_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_1_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_1_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_1_name - index_value requirements: - binding: @@ -293,21 +293,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.packets.rate - network.outgoing.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.bytes + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder + feature_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - feature feature_vdbe: - vdbe - feature - feature_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - feature - attachment_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - attachment disk.device.iops_vdbe: - vdbe - disk.device.iops @@ -332,12 +326,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -347,12 +347,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity - feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - feature_vdbe_0_subint_untr_vmi_0 + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -362,27 +365,21 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outpoing.packets - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.bytes.rate disk.read.requests_vdbe: - vdbe - disk.read.requests - forwarder_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - forwarder - binding_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + binding_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta @@ -392,9 +389,6 @@ topology_template: disk.device.write.bytes.rate_vdbe: - vdbe - disk.device.write.bytes.rate - feature_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - feature memory.resident_vdbe: - vdbe - memory.resident @@ -416,9 +410,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -428,9 +422,18 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets + feature_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - feature_vdbe_0_subint_untr_vmi_0 os_vdbe: - vdbe - os @@ -455,28 +458,25 @@ topology_template: disk.read.bytes_vdbe: - vdbe - disk.read.bytes - network.incoming.packets.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets.rate requirements: - subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 + subinterface_link_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 - subinterface_link_vdbe_0_subint_untr_vmi_0 - dependency_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - dependency - dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 + dependency_vdbe_0_subint_untr_vmi_0_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 - dependency_vdbe_0_subint_untr_vmi_0 - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - dependency + dependency_vdbe_vdbe_untr_port_1_nested1: + - vdbe_vdbe_untr_port_1_nested1 + - dependency + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_port_nested1: - - vdbe_vdbe_untr_port_nested1 - - dependency dependency_vdbe: - vdbe - - 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/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml index f6128a3dc0..443dcd5610 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/twoSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbe_1ServiceTemplate.yaml @@ -11,17 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_vdbe_untr_port_network_role_tag: - type: string - required: true subinterface_nested2_subinterfaces_name_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_subnetpoolid: - type: string - required: true compute_vdbe_availability_zone: type: list required: true @@ -32,6 +26,14 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_name: + type: list + required: true + entry_schema: + type: string + port_vdbe_untr_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true @@ -40,30 +42,35 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_port_1_network_role_tag: + type: string + required: true subinterface_nested2_aap_sec_untrusted_ip_prefix: type: list required: true entry_schema: type: string - port_vdbe_untr_port_order: - type: integer - required: true subinterface_nested2_vmac_address: type: list required: true entry_schema: type: string + port_vdbe_untr_port_1_order: + type: integer + required: true vm_image_name: type: string required: true - port_vdbe_untr_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_vdbe_metadata: type: list required: true entry_schema: type: json + port_vdbe_untr_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested2_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -74,9 +81,20 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_mac_requirements: + port_vdbe_untr_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_port_1_subnetpoolid: + type: string + required: true + port_vdbe_untr_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_vdbe_untr_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_nested2_ip_address: type: list required: true @@ -89,29 +107,21 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_vdbe_untr_port_name: + port_vdbe_untr_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_vlan_tag_list: type: list required: true entry_schema: type: json - port_vdbe_untr_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested2_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string - port_vdbe_untr_port_network_role: - type: string - required: true subinterface_nested2_service_template_filter_count: type: list required: true @@ -152,18 +162,8 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_vdbe_untr_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements node_templates: - vdbe_vdbe_untr_port_nested2: + vdbe_vdbe_untr_port_1_nested2: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested2 directives: - substitutable @@ -242,7 +242,7 @@ topology_template: requirements: - binding_vdbe_0_subint_oam_vmi_0: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_port + node: vdbe_vdbe_untr_port_1 relationship: tosca.relationships.network.BindsTo vdbe: type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe @@ -263,31 +263,31 @@ topology_template: get_input: - compute_vdbe_name - index_value - vdbe_vdbe_untr_port: + vdbe_vdbe_untr_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_vdbe_untr_port_exCP_naming + get_input: port_vdbe_untr_port_1_exCP_naming vlan_requirements: - get_input: port_vdbe_untr_port_vlan_requirements + get_input: port_vdbe_untr_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_vdbe_untr_port_related_networks + get_input: port_vdbe_untr_port_1_related_networks ip_requirements: - get_input: port_vdbe_untr_port_ip_requirements + get_input: port_vdbe_untr_port_1_ip_requirements network_role_tag: - get_input: port_vdbe_untr_port_network_role_tag + get_input: port_vdbe_untr_port_1_network_role_tag mac_requirements: - get_input: port_vdbe_untr_port_mac_requirements + get_input: port_vdbe_untr_port_1_mac_requirements order: - get_input: port_vdbe_untr_port_order + get_input: port_vdbe_untr_port_1_order network_role: - get_input: port_vdbe_untr_port_network_role + get_input: port_vdbe_untr_port_1_network_role subnetpoolid: - get_input: port_vdbe_untr_port_subnetpoolid + get_input: port_vdbe_untr_port_1_subnetpoolid name: get_input: - - port_vdbe_untr_port_name + - port_vdbe_untr_port_1_name - index_value requirements: - binding: @@ -297,21 +297,15 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe_1 capabilities: - network.outgoing.packets.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.packets.rate - network.outgoing.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.bytes + feature_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - feature + forwarder_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - forwarder feature_vdbe: - vdbe - feature - feature_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - feature - attachment_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - attachment disk.device.iops_vdbe: - vdbe - disk.device.iops @@ -336,12 +330,18 @@ topology_template: disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate + feature_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - feature disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes.rate + network.incoming.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -351,9 +351,15 @@ topology_template: disk.device.write.requests_vdbe: - vdbe - disk.device.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.packets.rate disk.device.capacity_vdbe: - vdbe - disk.device.capacity + network.outgoing.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -363,30 +369,27 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage - network.outpoing.packets_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outpoing.packets - network.outgoing.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.outgoing.bytes.rate disk.read.requests_vdbe: - vdbe - disk.read.requests - forwarder_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - forwarder - binding_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + binding_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - binding + network.incoming.bytes_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.bytes instance_vdbe: - vdbe - instance - network.incoming.bytes.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outgoing.bytes.rate cpu.delta_vdbe: - vdbe - cpu.delta + feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - feature_vdbe_0_subint_oam_vmi_0 disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -396,9 +399,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - feature_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -417,9 +417,9 @@ topology_template: disk.latency_vdbe: - vdbe - disk.latency - network.incoming.bytes_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.bytes + attachment_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - attachment disk.capacity_vdbe: - vdbe - disk.capacity @@ -429,12 +429,15 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - feature_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - feature_vdbe_0_subint_oam_vmi_0 + network.outpoing.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.outpoing.packets disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate + network.incoming.packets_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 + - network.incoming.packets os_vdbe: - vdbe - os @@ -459,28 +462,25 @@ topology_template: disk.read.bytes_vdbe: - vdbe - disk.read.bytes - network.incoming.packets.rate_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port - - network.incoming.packets.rate requirements: - dependency_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - dependency - dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - dependency_vdbe_0_subint_oam_vmi_0 - subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - subinterface_link_vdbe_0_subint_oam_vmi_0 - link_vdbe_vdbe_untr_port: - - vdbe_vdbe_untr_port + dependency_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - dependency + link_vdbe_vdbe_untr_port_1: + - vdbe_vdbe_untr_port_1 - link + subinterface_link_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - subinterface_link_vdbe_0_subint_oam_vmi_0 local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_vdbe_untr_port_nested2: - - vdbe_vdbe_untr_port_nested2 - - dependency + dependency_vdbe_0_subint_oam_vmi_0_vdbe_vdbe_untr_port_1_nested2: + - vdbe_vdbe_untr_port_1_nested2 + - dependency_vdbe_0_subint_oam_vmi_0 dependency_vdbe: - vdbe - - dependency
\ No newline at end of file + - dependency |