diff options
author | ojasdubey <ojas.dubey@amdocs.com> | 2018-11-29 20:46:49 +0530 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 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/differentNetwork | |
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/differentNetwork')
4 files changed, 237 insertions, 237 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 |