diff options
author | 2018-11-29 20:46:49 +0530 | |
---|---|---|
committer | 2018-12-02 09:47:45 +0000 | |
commit | 6ce1094d509195fe484761467a67a6b3757593b0 (patch) | |
tree | 4c3b0df6711f80c0f20c20ccf013727ff90428d5 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2 | |
parent | c2a1b7c2eea934f309838f0082b2b851012be9a1 (diff) |
Fix - Port type and vmtype underscore issue
1. Fix for consolidation of VMs for cases when:
a. VM type contains an underscore
b. Multiple ports per network role
2. Updated the unit test cases and test data
Change-Id: I875f3c8384f8ef2c2aa6add9e30a5f8899ae1a71
Issue-ID: SDC-1966
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2')
12 files changed, 781 insertions, 781 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml index a7f27a34cb..78be5c1ca7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/in/main.yml @@ -177,10 +177,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_port_1} user_data_format: RAW - pd01_port_0: + pd_server_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -194,10 +194,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_1} user_data_format: RAW - pd01_port_1: + pd_server_1_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -209,7 +209,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_0} + p1: { get_resource: pd_server_port_1} net1: { get_resource: test_net1} test_resourceGroup2: @@ -219,7 +219,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_1} + p1: { get_resource: pd_server_1_port_1} net1: { get_resource: test_net2} test_net1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3e2ef2c327..2204cc5703 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -16,6 +22,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,8 +44,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true status: SUPPORTED subinterface_nested_service_template_filter_count: @@ -38,12 +54,6 @@ node_types: status: SUPPORTED entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -54,31 +64,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,69 +88,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd_server_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_pd01_port_nested: + - link_pd_server_pd_server_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server: + - dependency_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -168,6 +168,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -186,9 +192,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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_pd_server_pd_server_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -203,7 +208,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_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: @@ -239,12 +244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -263,19 +262,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: type: org.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_pd_server: + disk.device.write.bytes.rate_pd_server: type: org.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: + attachment_pd_server_pd_server_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_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: @@ -292,18 +296,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.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_Vlan_vmi_1_pd_server_pd01_port_nested: + feature_pd_server_pd_server_port_1_nested: type: tosca.capabilities.Node occurrences: - 1 @@ -325,14 +324,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server: + network.incoming.bytes_pd_server_pd_server_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_pd01_port_nested: - type: tosca.capabilities.Node + disk.read.requests_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -347,7 +347,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + binding_pd_server_pd_server_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -355,21 +355,19 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.write.bytes_pd_server: - 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_pd_server_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: type: org.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_pd01_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_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,6 +395,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd_server_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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,17 +420,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_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_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -445,11 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -468,7 +462,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd_server_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_pd_server_pd_server_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: @@ -554,4 +554,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/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml index cd1888879e..98d3d8e56e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/MainServiceTemplate.yaml @@ -708,6 +708,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -719,23 +722,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_1 - port_pd01_port_mac_requirements: + - pd_server_1_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net2 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net2 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net2 relationship: tosca.relationships.network.LinksTo @@ -756,6 +756,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -767,23 +770,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_0 - port_pd01_port_mac_requirements: + - pd_server_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml index 80a1b10e27..20ef055bce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNetwork/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + port_pd_server_port_1_network: + type: list + required: true + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,19 +41,14 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -49,26 +57,18 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,48 +76,23 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_port_1_subnetpoolid: + type: string + required: true node_templates: - pd_server_pd01_port_nested: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested - directives: - - substitutable - properties: - p1: - get_input: - - subinterface_nested_p1 - - index_value - service_template_filter: - count: - get_input: - - subinterface_nested_service_template_filter_count - - index_value - substitute_service_template: nestedServiceTemplate.yaml - mandatory: true - net1: - get_input: - - subinterface_nested_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port - relationship: tosca.relationships.network.BindsTo pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server properties: @@ -137,37 +112,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server_pd_server_port_1_nested: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + directives: + - substitutable + properties: + p1: + get_input: + - subinterface_nested_p1 + - index_value + service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value + substitute_service_template: nestedServiceTemplate.yaml + mandatory: true + net1: + get_input: + - subinterface_nested_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_pd_server_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -177,6 +177,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -186,18 +189,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -213,9 +216,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes.rate disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + feature_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -258,30 +258,30 @@ topology_template: binding_pd_server: - pd_server - binding + network.incoming.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + binding_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 - binding + feature_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - feature disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + feature_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature_template_Vlan_vmi_1 disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +294,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,12 +306,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -318,9 +318,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +327,12 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outpoing.packets disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file + link_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - link + dependency_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - dependency + dependency_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml index 75ff05f142..78cf3f37e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/in/main.yml @@ -177,10 +177,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_port_1} user_data_format: RAW - pd01_port_0: + pd_server_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -193,10 +193,10 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_port_1} user_data_format: RAW - pd01_port_1: + pd_server_1_port_1: type: OS::Neutron::Port properties: network: {get_param: oam_net_name} @@ -209,7 +209,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_0} + p1: { get_resource: pd_server_port_1} net1: { get_resource: test_net1} test_resourceGroup2: @@ -219,7 +219,7 @@ resources: resource_def: type: nested.yml properties: - p1: { get_resource: pd01_port_1} + p1: { get_resource: pd_server_1_port_1} net1: { get_resource: test_net1} test_net1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3e2ef2c327..2204cc5703 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -16,6 +22,16 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + status: SUPPORTED + port_pd_server_port_1_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,8 +44,8 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true status: SUPPORTED subinterface_nested_service_template_filter_count: @@ -38,12 +54,6 @@ node_types: status: SUPPORTED entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -54,31 +64,21 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string - required: true - status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true status: SUPPORTED @@ -88,69 +88,69 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_pd_server_port_1_subnetpoolid: + type: string + required: true + status: SUPPORTED requirements: - - dependency_pd_server_pd01_port_nested: + - dependency_pd_server: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - local_storage_pd_server: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_pd_server_pd_server_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_pd01_port_nested: + - link_pd_server_pd_server_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server: + - dependency_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_pd_server: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -168,6 +168,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_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_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -186,9 +192,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_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_pd_server_pd_server_port_1: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED @@ -203,7 +208,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_pd_server_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: @@ -239,12 +244,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_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.iops_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -263,19 +262,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + vcpus_pd_server: type: org.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_pd_server: + disk.device.write.bytes.rate_pd_server: type: org.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: + attachment_pd_server_pd_server_port_1: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_pd_server_pd_server_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: @@ -292,18 +296,13 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED disk.capacity_pd_server: type: org.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_Vlan_vmi_1_pd_server_pd01_port_nested: + feature_pd_server_pd_server_port_1_nested: type: tosca.capabilities.Node occurrences: - 1 @@ -325,14 +324,15 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.read.requests_pd_server: + network.incoming.bytes_pd_server_pd_server_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_pd01_port_nested: - type: tosca.capabilities.Node + disk.read.requests_pd_server: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -347,7 +347,7 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: + binding_pd_server_pd_server_port_1: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface @@ -355,21 +355,19 @@ node_types: occurrences: - 0 - UNBOUNDED - disk.write.bytes_pd_server: - 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_pd_server_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_pd01_port: + disk.write.bytes_pd_server: type: org.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_pd01_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_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -397,6 +395,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.packets_pd_server_pd_server_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.read.requests_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -416,17 +420,12 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.outgoing.bytes_pd_server_pd_server_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_pd01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.write.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -445,11 +444,6 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_pd01_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED disk.device.latency_pd_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -468,7 +462,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_pd_server_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_pd_server_pd_server_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: @@ -554,4 +554,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/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml index b4bd810ae8..b0ead5c67e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/MainServiceTemplate.yaml @@ -708,6 +708,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -719,23 +722,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_1 - port_pd01_port_mac_requirements: + - pd_server_1_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -747,7 +747,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -756,6 +756,9 @@ topology_template: directives: - substitutable properties: + port_pd_server_port_1_network_role_tag: oam + port_pd_server_port_1_network: + - get_input: oam_net_name compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -767,23 +770,20 @@ topology_template: vm_flavor_name: get_input: pd_flavor_name subinterface_nested_p1: - - pd01_port_0 - port_pd01_port_mac_requirements: + - pd_server_port_1 + port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + subinterface_nested_net1: + - test_net1 + port_pd_server_port_1_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - get_input: oam_net_name - subinterface_nested_net1: - - test_net1 - port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW service_template_filter: @@ -795,7 +795,7 @@ topology_template: - service_template_filter - index_value requirements: - - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: + - subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: capability: tosca.capabilities.network.Linkable node: test_net1 relationship: tosca.relationships.network.LinksTo @@ -809,4 +809,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server_0 - - abstract_pd_server_1
\ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 80a1b10e27..20ef055bce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentNodesConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -18,6 +23,14 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_port_1_network_role_tag: + type: string + required: true + port_pd_server_port_1_network: + type: list + required: true + entry_schema: + type: string compute_pd_server_availability_zone: type: list required: true @@ -28,19 +41,14 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_port_1_order: + type: integer required: true subinterface_nested_service_template_filter_count: type: list required: true entry_schema: type: float - port_pd01_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -49,26 +57,18 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string - required: true - port_pd01_port_ip_requirements: + port_pd_server_port_1_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: string - port_pd01_port_order: - type: integer + port_pd_server_port_1_network_role: + type: string required: true - port_pd01_port_subnetpoolid: + vm_image_name: type: string required: true subinterface_nested_net1: @@ -76,48 +76,23 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role: - type: string - required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_port_1_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_user_data_format: type: list required: true entry_schema: type: string + port_pd_server_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pd_server_port_1_subnetpoolid: + type: string + required: true node_templates: - pd_server_pd01_port_nested: - type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested - directives: - - substitutable - properties: - p1: - get_input: - - subinterface_nested_p1 - - index_value - service_template_filter: - count: - get_input: - - subinterface_nested_service_template_filter_count - - index_value - substitute_service_template: nestedServiceTemplate.yaml - mandatory: true - net1: - get_input: - - subinterface_nested_net1 - - index_value - requirements: - - binding_template_Vlan_vmi_1: - capability: tosca.capabilities.network.Bindable - node: pd_server_pd01_port - relationship: tosca.relationships.network.BindsTo pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server properties: @@ -137,37 +112,62 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_port_1_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_port_1_vlan_requirements subinterface_indicator: true related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_port_1_related_networks ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_port_1_ip_requirements network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_port_1_network_role_tag mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_port_1_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_port_1_order network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_port_1_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_port_1_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_port_1_network - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo + pd_server_pd_server_port_1_nested: + type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested + directives: + - substitutable + properties: + p1: + get_input: + - subinterface_nested_p1 + - index_value + service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value + substitute_service_template: nestedServiceTemplate.yaml + mandatory: true + net1: + get_input: + - subinterface_nested_net1 + - index_value + requirements: + - binding_template_Vlan_vmi_1: + capability: tosca.capabilities.network.Bindable + node: pd_server_pd_server_port_1 + relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -177,6 +177,9 @@ topology_template: disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outgoing.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.packets.rate memory.usage_pd_server: - pd_server - memory.usage @@ -186,18 +189,18 @@ topology_template: disk.device.usage_pd_server: - pd_server - disk.device.usage - network.outgoing.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.packets.rate + forwarder_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - forwarder os_pd_server: - pd_server - os disk.write.bytes.rate_pd_server: - pd_server - disk.write.bytes.rate - network.incoming.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu @@ -213,9 +216,6 @@ topology_template: disk.device.read.bytes.rate_pd_server: - pd_server - disk.device.read.bytes.rate - network.outgoing.bytes_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes disk.iops_pd_server: - pd_server - disk.iops @@ -225,30 +225,30 @@ topology_template: cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + attachment_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - attachment + network.incoming.bytes.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes.rate disk.device.write.requests_pd_server: - pd_server - disk.device.write.requests endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity - feature_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature_template_Vlan_vmi_1 + feature_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -258,30 +258,30 @@ topology_template: binding_pd_server: - pd_server - binding + network.incoming.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.bytes disk.read.requests_pd_server: - pd_server - disk.read.requests - feature_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - feature feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port + binding_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 - binding + feature_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - feature disk.write.bytes_pd_server: - pd_server - disk.write.bytes - network.incoming.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.bytes.rate - network.incoming.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.incoming.packets + feature_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - feature_template_Vlan_vmi_1 disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -294,6 +294,9 @@ topology_template: disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes + network.incoming.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests @@ -303,12 +306,9 @@ topology_template: host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.outgoing.bytes_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -318,9 +318,6 @@ topology_template: disk.write.requests_pd_server: - pd_server - disk.write.requests - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -330,9 +327,12 @@ topology_template: disk.device.capacity_pd_server: - pd_server - disk.device.capacity - network.outgoing.bytes.rate_pd_server_pd01_port: - - pd_server_pd01_port - - network.outgoing.bytes.rate + network.incoming.packets.rate_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.incoming.packets.rate + network.outpoing.packets_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - network.outpoing.packets disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -340,21 +340,21 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency - dependency_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - subinterface_link_template_Vlan_vmi_1 + dependency_template_Vlan_vmi_1_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency_template_Vlan_vmi_1 dependency_pd_server: - pd_server - dependency - dependency_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - dependency_template_Vlan_vmi_1 - subinterface_link_template_Vlan_vmi_1_pd_server_pd01_port_nested: - - pd_server_pd01_port_nested - - subinterface_link_template_Vlan_vmi_1
\ No newline at end of file + link_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - link + dependency_pd_server_pd_server_port_1: + - pd_server_pd_server_port_1 + - dependency + dependency_pd_server_pd_server_port_1_nested: + - pd_server_pd_server_port_1_nested + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml index b4eb432e8d..4e7e15e638 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/in/main.yml @@ -187,8 +187,8 @@ resources: name: get_param: vdbe_name_1 networks: - - port: {get_resource: vdbe_untr_1_port_2} - vdbe_untr_1_port_2: + - port: {get_resource: vdbe_1_untr_1_port_1} + vdbe_1_untr_1_port_1: type: OS::ContrailV2::VirtualMachineInterface properties: name: @@ -313,7 +313,7 @@ resources: mac_address: get_param: vdbe_hw_untr_mac_1 parent_interface: - get_resource: vdbe_untr_1_port_2 + get_resource: vdbe_1_untr_1_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/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml index 094898920f..54a6020581 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,12 +8,26 @@ node_types: org.openecomp.resource.abstract.nodes.vdbe: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + status: SUPPORTED + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED subinterface_nested_parent_interface: type: list required: true status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json subinterface_nested_aap_address_mode: type: list required: true @@ -32,12 +46,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_related_networks: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_service_template_filter_count: type: list required: true @@ -50,21 +58,37 @@ node_types: status: SUPPORTED entry_schema: type: string + port_vdbe_untr_1_port_1_network_role: + type: string + required: true + status: SUPPORTED vm_flavor_name: type: string required: true status: SUPPORTED + port_vdbe_untr_1_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string subinterface_nested_aap_untrusted_ip_prefix: type: list required: true status: SUPPORTED entry_schema: type: string - vm_image_name: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true status: SUPPORTED - port_vdbe_untr_1_port_network_role: + vm_image_name: type: string required: true status: SUPPORTED @@ -92,44 +116,34 @@ node_types: status: SUPPORTED entry_schema: type: json - subinterface_nested_mac_address: - type: list + port_vdbe_untr_1_port_1_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: string - port_vdbe_untr_1_port_virtual_network_refs: + subinterface_nested_mac_address: type: list required: true status: SUPPORTED entry_schema: - type: json - port_vdbe_untr_1_port_ip_requirements: + type: string + subinterface_nested_ip_address: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_nested_ip_address: + type: string + port_vdbe_untr_1_port_1_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested_ip_v6_address: type: list required: true status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - port_vdbe_untr_1_port_order: - type: integer - required: true - status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -150,30 +164,32 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_vdbe_untr_1_port_1_related_networks: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_subnetpoolid: - type: string + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + subinterface_nested_aap_untrusted_ip_prefix_len: + type: list required: true status: SUPPORTED - port_vdbe_untr_1_port_name: + entry_schema: + type: string + port_vdbe_untr_1_port_1_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: + type: json + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - subinterface_nested_aap_untrusted_ip_prefix_len: - type: list + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: string subinterface_nested_counter: type: list required: true @@ -192,65 +208,49 @@ node_types: status: SUPPORTED entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_vdbe_untr_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json requirements: - - dependency_vdbe_vdbe_untr_1_port_nested: + - dependency_vdbe: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - local_storage_vdbe: + capability: tosca.capabilities.Attachment + node: tosca.nodes.BlockStorage + relationship: tosca.relationships.AttachesTo + occurrences: + - 0 + - UNBOUNDED + - dependency_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_vdbe: + - dependency_vdbe_vdbe_untr_1_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - local_storage_vdbe: - capability: tosca.capabilities.Attachment - node: tosca.nodes.BlockStorage - relationship: tosca.relationships.AttachesTo - occurrences: - - 0 - - UNBOUNDED - - dependency_vdbe_vdbe_untr_1_port: + - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_vdbe_vdbe_untr_1_port: + - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -279,8 +279,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - type: tosca.capabilities.Node + network.outpoing.packets_vdbe_vdbe_untr_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 @@ -302,36 +303,31 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.device.latency_vdbe: + network.outgoing.packets.rate_vdbe_vdbe_untr_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.write.requests.rate_vdbe: + disk.device.latency_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 - feature_vdbe_vdbe_untr_1_port: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.write.bytes.rate_vdbe: + disk.device.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. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: + network.incoming.bytes_vdbe_vdbe_untr_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_vdbe_vdbe_untr_1_port: + 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: @@ -360,12 +356,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_vdbe_vdbe_untr_1_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_1_port_1_nested: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + binding_vdbe_vdbe_untr_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.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. @@ -384,18 +387,29 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.bytes_vdbe_vdbe_untr_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.requests_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_vdbe_vdbe_untr_1_port: + network.incoming.packets.rate_vdbe_vdbe_untr_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 + forwarder_vdbe_vdbe_untr_1_port_1: + type: org.openecomp.capabilities.Forwarder + 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. @@ -408,14 +422,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_vdbe_vdbe_untr_1_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 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. @@ -434,16 +440,6 @@ node_types: occurrences: - 1 - UNBOUNDED - forwarder_vdbe_vdbe_untr_1_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - feature_vdbe_vdbe_untr_1_port_nested: - 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. @@ -468,6 +464,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED disk.device.read.bytes_vdbe: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -480,7 +481,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: + network.outgoing.bytes.rate_vdbe_vdbe_untr_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: @@ -505,15 +506,8 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_vdbe_vdbe_untr_1_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_vdbe_vdbe_untr_1_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_1_port_1: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -540,24 +534,30 @@ node_types: occurrences: - 1 - UNBOUNDED - memory_vdbe: + network.incoming.packets_vdbe_vdbe_untr_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 - binding_vdbe: - type: tosca.capabilities.network.Bindable + network.incoming.bytes.rate_vdbe_vdbe_untr_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.write.bytes_vdbe: + memory_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_1_port: + binding_vdbe: + type: tosca.capabilities.network.Bindable + occurrences: + - 1 + - UNBOUNDED + disk.device.write.bytes_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: @@ -686,4 +686,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/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml index 8a3bf941d1..e5c29a52c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/out/MainServiceTemplate.yaml @@ -401,6 +401,8 @@ topology_template: properties: subinterface_nested_parent_interface: - vdbe_untr_1_port_1 + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -413,6 +415,14 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -432,8 +442,6 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: @@ -442,16 +450,10 @@ topology_template: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net subinterface_nested_counter: - get_property: - SELF @@ -467,8 +469,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -478,7 +478,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo @@ -497,7 +497,9 @@ topology_template: - substitutable properties: subinterface_nested_parent_interface: - - vdbe_untr_1_port_2 + - vdbe_1_untr_1_port_1 + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + - - get_input: vdbe_hw_untr_mac_1 subinterface_nested_aap_address_mode: - get_input: aap_address_mode subinterface_nested_vlan_tag_list: @@ -510,6 +512,14 @@ topology_template: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: get_input: vdbe_flavor_name + port_vdbe_untr_1_port_1_name: + - str_replace: + template: VM_NAMEDBE001p1n004 + params: + DBE: + get_input: vdbe_device_name + VM_NAME: + get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix: - get_input: vdbe_aap_untrusted_ip_prefix vm_image_name: @@ -529,8 +539,6 @@ topology_template: get_input: vnf_name subinterface_nested_mac_address: - get_input: vdbe_hw_untr_mac_1 - port_vdbe_untr_1_port_virtual_network_refs: - - - control_int_net subinterface_nested_ip_address: - get_input: vdbe_untrusted_ip_1 subinterface_nested_ip_v6_address: @@ -539,16 +547,10 @@ topology_template: - get_input: vdbe_untrusted_vmac_address subinterface_nested_vn_network_list: - get_input: untrusted_vn_networks - port_vdbe_untr_1_port_name: - - str_replace: - template: VM_NAMEDBE001p1n004 - params: - DBE: - get_input: vdbe_device_name - VM_NAME: - get_input: vdbe_name_1 subinterface_nested_aap_untrusted_ip_prefix_len: - get_input: vdbe_aap_untrusted_ip_prefix_len + port_vdbe_untr_1_port_1_virtual_network_refs: + - - control_int_net subinterface_nested_counter: - get_input: counter subinterface_nested_subinterfaces_name_prefix: @@ -561,8 +563,6 @@ topology_template: get_input: vdbe_name_1 compute_vdbe_name: - get_input: vdbe_name_1 - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - - - get_input: vdbe_hw_untr_mac_1 service_template_filter: substitute_service_template: Nested_vdbeServiceTemplate.yaml count: 1 @@ -572,7 +572,7 @@ topology_template: - service_template_filter - index_value requirements: - - link_vdbe_vdbe_untr_1_port: + - link_vdbe_vdbe_untr_1_port_1: capability: tosca.capabilities.network.Linkable node: control_int_net relationship: tosca.relationships.network.LinksTo diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml index 39bf635d05..3563d416a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c2/differentResourceGroupCount/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/pattern1c2/differentResourceGroupCount/out/Nested_vdbeServiceTemplate.yaml @@ -11,11 +11,22 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_vdbe_untr_1_port_1_order: + type: integer + required: true + port_vdbe_untr_1_port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true subinterface_nested_parent_interface: type: list required: true entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses: + type: list + required: true + entry_schema: + type: json subinterface_nested_aap_address_mode: type: list required: true @@ -31,11 +42,6 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_related_networks: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_service_template_filter_count: type: list required: true @@ -46,18 +52,31 @@ topology_template: required: true entry_schema: type: string + port_vdbe_untr_1_port_1_network_role: + type: string + required: true vm_flavor_name: type: string required: true + port_vdbe_untr_1_port_1_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_vdbe_untr_1_port_1_name: + type: list + required: true + entry_schema: + type: string subinterface_nested_aap_untrusted_ip_prefix: type: list required: true entry_schema: type: string - vm_image_name: + port_vdbe_untr_1_port_1_network_role_tag: type: string required: true - port_vdbe_untr_1_port_network_role: + vm_image_name: type: string required: true subinterface_nested_aap_sec_untrusted_ip_prefix_len: @@ -80,37 +99,29 @@ topology_template: required: true entry_schema: type: json + port_vdbe_untr_1_port_1_subnetpoolid: + type: string + required: true subinterface_nested_mac_address: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_virtual_network_refs: - type: list - required: true - entry_schema: - type: json - port_vdbe_untr_1_port_ip_requirements: + subinterface_nested_ip_address: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - subinterface_nested_ip_address: + type: string + port_vdbe_untr_1_port_1_vlan_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.VlanRequirements subinterface_nested_ip_v6_address: type: list required: true entry_schema: type: string - port_vdbe_untr_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_vdbe_untr_1_port_order: - type: integer - required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -128,25 +139,27 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_vdbe_untr_1_port_subnetpoolid: - type: string - required: true - port_vdbe_untr_1_port_name: + port_vdbe_untr_1_port_1_related_networks: type: list required: true entry_schema: - type: string - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments subinterface_nested_aap_untrusted_ip_prefix_len: type: list required: true entry_schema: type: string + port_vdbe_untr_1_port_1_virtual_network_refs: + type: list + required: true + entry_schema: + type: json + port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + required: true + port_vdbe_untr_1_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true subinterface_nested_counter: type: list required: true @@ -162,21 +175,70 @@ topology_template: required: true entry_schema: type: string - port_vdbe_untr_1_port_network_role_tag: - type: string - required: true - port_vdbe_untr_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses: - type: list - required: true - entry_schema: - type: json node_templates: - vdbe_vdbe_untr_1_port_nested: + vdbe: + type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe + properties: + availability_zone: + get_input: + - compute_vdbe_availability_zone + - index_value + flavor: + get_input: vm_flavor_name + metadata: + get_input: + - compute_vdbe_metadata + - index_value + image: + get_input: vm_image_name + name: + get_input: + - compute_vdbe_name + - index_value + vdbe_vdbe_untr_1_port_1: + type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface + properties: + mac_requirements: + get_input: port_vdbe_untr_1_port_1_mac_requirements + order: + get_input: port_vdbe_untr_1_port_1_order + exCP_naming: + get_input: port_vdbe_untr_1_port_1_exCP_naming + virtual_machine_interface_allowed_address_pairs: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_allowed_address_pairs + - index_value + vlan_requirements: + get_input: port_vdbe_untr_1_port_1_vlan_requirements + subinterface_indicator: true + related_networks: + get_input: port_vdbe_untr_1_port_1_related_networks + virtual_network_refs: + get_input: + - port_vdbe_untr_1_port_1_virtual_network_refs + - index_value + ip_requirements: + get_input: port_vdbe_untr_1_port_1_ip_requirements + network_role_tag: + get_input: port_vdbe_untr_1_port_1_network_role_tag + virtual_machine_interface_mac_addresses: + get_input: + - port_vdbe_untr_1_port_1_virtual_machine_interface_mac_addresses + - index_value + network_role: + get_input: port_vdbe_untr_1_port_1_network_role + subnetpoolid: + get_input: port_vdbe_untr_1_port_1_subnetpoolid + name: + get_input: + - port_vdbe_untr_1_port_1_name + - index_value + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: vdbe + relationship: tosca.relationships.network.BindsTo + vdbe_vdbe_untr_1_port_1_nested: type: org.openecomp.resource.abstract.nodes.heat.subinterface.nested directives: - substitutable @@ -255,69 +317,7 @@ topology_template: requirements: - binding_vdbe_untr_x_subport: capability: tosca.capabilities.network.Bindable - node: vdbe_vdbe_untr_1_port - relationship: tosca.relationships.network.BindsTo - vdbe: - type: org.openecomp.resource.vfc.compute.nodes.heat.vdbe - properties: - availability_zone: - get_input: - - compute_vdbe_availability_zone - - index_value - flavor: - get_input: vm_flavor_name - metadata: - get_input: - - compute_vdbe_metadata - - index_value - image: - get_input: vm_image_name - name: - get_input: - - compute_vdbe_name - - index_value - vdbe_vdbe_untr_1_port: - type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface - properties: - mac_requirements: - get_input: port_vdbe_untr_1_port_mac_requirements - order: - get_input: port_vdbe_untr_1_port_order - exCP_naming: - get_input: port_vdbe_untr_1_port_exCP_naming - virtual_machine_interface_allowed_address_pairs: - get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_allowed_address_pairs - - index_value - vlan_requirements: - get_input: port_vdbe_untr_1_port_vlan_requirements - subinterface_indicator: true - related_networks: - get_input: port_vdbe_untr_1_port_related_networks - virtual_network_refs: - get_input: - - port_vdbe_untr_1_port_virtual_network_refs - - index_value - ip_requirements: - get_input: port_vdbe_untr_1_port_ip_requirements - network_role_tag: - get_input: port_vdbe_untr_1_port_network_role_tag - virtual_machine_interface_mac_addresses: - get_input: - - port_vdbe_untr_1_port_virtual_machine_interface_mac_addresses - - index_value - network_role: - get_input: port_vdbe_untr_1_port_network_role - subnetpoolid: - get_input: port_vdbe_untr_1_port_subnetpoolid - name: - get_input: - - port_vdbe_untr_1_port_name - - index_value - requirements: - - binding: - capability: tosca.capabilities.network.Bindable - node: vdbe + node: vdbe_vdbe_untr_1_port_1 relationship: tosca.relationships.network.BindsTo substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.vdbe @@ -334,9 +334,9 @@ topology_template: disk.ephemeral.size_vdbe: - vdbe - disk.ephemeral.size - feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - feature_vdbe_untr_x_subport + network.outpoing.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outpoing.packets cpu_util_vdbe: - vdbe - cpu_util @@ -346,24 +346,21 @@ topology_template: disk.write.requests_vdbe: - vdbe - disk.write.requests + network.outgoing.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.packets.rate disk.device.latency_vdbe: - vdbe - disk.device.latency disk.device.write.requests.rate_vdbe: - vdbe - disk.device.write.requests.rate - feature_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - feature + network.incoming.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes disk.write.bytes.rate_vdbe: - vdbe - disk.write.bytes.rate - network.incoming.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes.rate - network.incoming.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets.rate scalable_vdbe: - vdbe - scalable @@ -376,9 +373,12 @@ topology_template: disk.device.capacity_vdbe: - vdbe - disk.device.capacity - network.outgoing.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes + feature_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - feature + binding_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - binding disk.device.allocation_vdbe: - vdbe - disk.device.allocation @@ -388,21 +388,24 @@ topology_template: memory.usage_vdbe: - vdbe - memory.usage + network.outgoing.bytes_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes disk.read.requests_vdbe: - vdbe - disk.read.requests - network.incoming.bytes_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.bytes + network.incoming.packets.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets.rate + forwarder_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - forwarder instance_vdbe: - vdbe - instance cpu.delta_vdbe: - vdbe - cpu.delta - binding_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - binding disk.device.read.bytes.rate_vdbe: - vdbe - disk.device.read.bytes.rate @@ -412,12 +415,6 @@ topology_template: memory.resident_vdbe: - vdbe - memory.resident - forwarder_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - forwarder - feature_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - feature disk.write.requests.rate_vdbe: - vdbe - disk.write.requests.rate @@ -430,15 +427,18 @@ topology_template: disk.device.usage_vdbe: - vdbe - disk.device.usage + feature_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - feature_vdbe_untr_x_subport disk.device.read.bytes_vdbe: - vdbe - disk.device.read.bytes disk.latency_vdbe: - vdbe - disk.latency - network.outgoing.packets.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.outgoing.bytes.rate disk.capacity_vdbe: - vdbe - disk.capacity @@ -448,12 +448,9 @@ topology_template: disk.allocation_vdbe: - vdbe - disk.allocation - network.outpoing.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outpoing.packets - network.incoming.packets_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.incoming.packets + feature_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - feature disk.read.bytes.rate_vdbe: - vdbe - disk.read.bytes.rate @@ -466,6 +463,12 @@ topology_template: disk.root.size_vdbe: - vdbe - disk.root.size + network.incoming.packets_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.packets + network.incoming.bytes.rate_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 + - network.incoming.bytes.rate memory_vdbe: - vdbe - memory @@ -475,9 +478,6 @@ topology_template: disk.device.write.bytes_vdbe: - vdbe - disk.device.write.bytes - network.outgoing.bytes.rate_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port - - network.outgoing.bytes.rate disk.device.read.requests.rate_vdbe: - vdbe - disk.device.read.requests.rate @@ -485,23 +485,23 @@ topology_template: - vdbe - disk.read.bytes requirements: - subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested + dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested + - dependency_vdbe_untr_x_subport + subinterface_link_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested - subinterface_link_vdbe_untr_x_subport - dependency_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + dependency_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - dependency local_storage_vdbe: - vdbe - local_storage - dependency_vdbe_untr_x_subport_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested - - dependency_vdbe_untr_x_subport - dependency_vdbe_vdbe_untr_1_port_nested: - - vdbe_vdbe_untr_1_port_nested + dependency_vdbe_vdbe_untr_1_port_1_nested: + - vdbe_vdbe_untr_1_port_1_nested - dependency - link_vdbe_vdbe_untr_1_port: - - vdbe_vdbe_untr_1_port + link_vdbe_vdbe_untr_1_port_1: + - vdbe_vdbe_untr_1_port_1 - link dependency_vdbe: - vdbe |