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/singleSubstitution/inputOutputParamType | |
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/singleSubstitution/inputOutputParamType')
3 files changed, 633 insertions, 633 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml index ddd2d22fa3..1b612b79fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,110 +8,120 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_template_VMInt_OAM_lb_4_network_role: + type: string + required: true + status: SUPPORTED compute_pd_server_key_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pd01_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_personality: type: list required: true status: SUPPORTED entry_schema: type: json + port_pd01_port_0_replacement_policy: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string compute_pd_server_image_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string + port_pd01_port_0_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd01_port_0_binding:vnic_type: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd01_port_0_order: + type: integer required: true status: SUPPORTED - vm_image_name: - type: string + port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + vm_image_name: + type: string required: true status: SUPPORTED - port_template_VMInt_OAM_lb_related_networks: + port_pd01_port_0_port_security_enabled: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_device_id: + type: boolean + port_pd01_port_0_value_specs: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_admin_state_up: + type: json + port_pd01_port_0_admin_state_up: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_pd01_port_vlan_requirements: + port_pd01_port_0_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_virtual_network_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: json compute_pd_server_metadata: type: list required: true status: SUPPORTED entry_schema: type: json - port_template_VMInt_OAM_lb_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_pd_server_diskConfig: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_mac_address: + port_pd01_port_0_mac_address: type: string required: true status: SUPPORTED - port_template_VMInt_OAM_lb_network_role: + port_pd01_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_allowed_address_pairs: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED compute_pd_server_admin_pass: type: list required: true @@ -124,39 +134,39 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_related_networks: + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_security_group_refs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_template_VMInt_OAM_lb_ip_requirements: + type: json + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_template_VMInt_OAM_lb_exCP_naming: + type: json + port_template_VMInt_OAM_lb_4_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - status: SUPPORTED - port_pd01_port_value_specs: + port_template_VMInt_OAM_lb_4_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_pd_server_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_0_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_template_VMInt_OAM_lb_port_tuple_refs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_pd_server_security_groups: type: list required: true status: SUPPORTED @@ -168,74 +178,70 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_network_role_tag: - type: string - required: true - status: SUPPORTED - compute_pd_server_scheduler_hints: + port_pd01_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: type: json - port_pd01_port_name: + compute_pd_server_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: string + type: json compute_pd_server_contrail_service_instance_ind: type: list required: true status: SUPPORTED entry_schema: type: boolean - compute_pd_server_availability_zone: + port_template_VMInt_OAM_lb_4_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - compute_pd_server_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_template_VMInt_OAM_lb_network_role_tag: + port_pd01_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_binding:vnic_type: + compute_pd_server_availability_zone: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_device_owner: + compute_pd_server_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_fixed_ips: - type: list + port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: + port_template_VMInt_OAM_lb_4_ip_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_qos_policy: - type: list + port_template_VMInt_OAM_lb_4_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_template_VMInt_OAM_lb_4_network_role_tag: + type: string required: true status: SUPPORTED - entry_schema: - type: string compute_pd_server_config_drive: type: list required: true @@ -248,192 +254,186 @@ node_types: status: SUPPORTED entry_schema: type: string - port_template_VMInt_OAM_lb_virtual_network_refs: + port_pd01_port_0_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: json - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_template_VMInt_OAM_lb_order: - type: integer - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: org.openecomp.datatypes.heat.network.AddressPair + port_pd01_port_0_device_id: type: list required: true status: SUPPORTED entry_schema: - type: json - port_template_VMInt_OAM_lb_name: + type: string + port_pd01_port_0_qos_policy: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_port_security_enabled: + port_pd01_port_0_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_template_VMInt_OAM_lb_vlan_requirements: - type: list - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_pd_server_user_data_update_policy: + constraints: + - greater_or_equal: 0 + port_template_VMInt_OAM_lb_4_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_network: + port_template_VMInt_OAM_lb_4_order: + type: integer + required: true + status: SUPPORTED + compute_pd_server_user_data_update_policy: type: list required: true status: SUPPORTED entry_schema: type: string - compute_pd_server_reservation_id: + port_pd01_port_0_device_owner: type: list required: true status: SUPPORTED entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_mac_requirements: + port_template_VMInt_OAM_lb_4_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_network_role: - type: string - required: true - status: SUPPORTED - port_template_VMInt_OAM_lb_security_group_refs: + compute_pd_server_reservation_id: type: list required: true status: SUPPORTED entry_schema: - type: json - attributes: - pd_server_pd01_port_allowed_address_pairs: + type: string + port_template_VMInt_OAM_lb_4_port_tuple_refs: type: list + required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: json + port_pd01_port_0_vlan_requirements: type: list + required: true status: SUPPORTED entry_schema: - type: string - pd_server_template_VMInt_OAM_lb_virtual_network_refs: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + attributes: + pd_server_pd01_port_0_port_security_enabled: + type: boolean status: SUPPORTED - entry_schema: - type: string - pd_server_template_VMInt_OAM_lb_fq_name: + pd_server_show: type: string status: SUPPORTED - pd_server_show: + pd_server_template_VMInt_OAM_lb_4_name: type: string status: SUPPORTED + pd_server_pd01_port_0_allowed_address_pairs: + type: list + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair pd_server_console_urls: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - status: SUPPORTED - pd_server_pd01_port_security_groups: + pd_server_pd01_port_0_security_groups: type: list status: SUPPORTED entry_schema: type: string - pd_server_pd01_port_port_security_enabled: - type: boolean - status: SUPPORTED - pd_server_pd01_port_status: + pd_server_pd01_port_0_tenant_id: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_port_tuple_refs: + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list status: SUPPORTED entry_schema: type: string - pd_server_pd01_port_fixed_ips: - type: list + pd_server_template_VMInt_OAM_lb_4_fq_name: + type: string status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - pd_server_accessIPv6: + pd_server_pd01_port_0_name: type: string status: SUPPORTED - pd_server_pd01_port_admin_state_up: - type: boolean + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties status: SUPPORTED - pd_server_instance_name: - type: string + pd_server_pd01_port_0_subnets: + type: list status: SUPPORTED - pd_server_template_VMInt_OAM_lb_name: + entry_schema: + type: string + pd_server_pd01_port_0_show: type: string status: SUPPORTED - pd_server_accessIPv4: + pd_server_pd01_port_0_status: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_pd01_port_0_qos_policy: type: string status: SUPPORTED - pd_server_pd01_port_show: + pd_server_accessIPv6: type: string status: SUPPORTED - pd_server_pd01_port_network: + pd_server_instance_name: type: string status: SUPPORTED - pd_server_pd01_port_qos_policy: + pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_mac_address: - type: string + pd_server_pd01_port_0_admin_state_up: + type: boolean status: SUPPORTED + pd_server_template_VMInt_OAM_lb_4_virtual_network_refs: + type: list + status: SUPPORTED + entry_schema: + type: string pd_server_addresses: type: map status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - pd_server_pd01_port_tenant_id: + pd_server_pd01_port_0_device_id: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties - status: SUPPORTED - pd_server_pd01_port_device_id: + pd_server_pd01_port_0_network: type: string status: SUPPORTED - pd_server_pd01_port_name: + pd_server_pd01_port_0_mac_address: type: string status: SUPPORTED - pd_server_template_VMInt_OAM_lb_show: + pd_server_pd01_port_0_device_owner: type: string status: SUPPORTED - pd_server_pd01_port_subnets: + pd_server_pd01_port_0_fixed_ips: + type: list + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + pd_server_template_VMInt_OAM_lb_4_port_tuple_refs: type: list status: SUPPORTED entry_schema: type: string + pd_server_template_VMInt_OAM_lb_4_show: + type: string + status: SUPPORTED + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + status: SUPPORTED requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -449,33 +449,41 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_template_VMInt_OAM_lb: + - dependency_pd_server_template_VMInt_OAM_lb_4: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_template_VMInt_OAM_lb: + - link_pd_server_template_VMInt_OAM_lb_4: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd01_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_pd_server_pd01_port: + - link_pd_server_pd01_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: + binding_pd_server_pd01_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED scalable_pd_server: type: tosca.capabilities.Scalable occurrences: @@ -487,31 +495,31 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.usage_pd_server: + network.outpoing.packets_pd_server_template_VMInt_OAM_lb_4: type: org.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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - disk.device.usage_pd_server: + memory_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.outgoing.packets.rate_pd_server_pd01_port: + disk.device.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. occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb: + network.incoming.packets_pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -528,7 +536,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -540,12 +548,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_template_VMInt_OAM_lb: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu_util_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. @@ -570,7 +572,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + network.incoming.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: @@ -582,70 +584,80 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb: + memory.resident_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 - memory.resident_pd_server: + cpu.delta_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 - cpu.delta_pd_server: + network.incoming.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - vcpus_pd_server: + network.outgoing.packets.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.write.bytes.rate_pd_server: + 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 - disk.device.write.requests_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 - endpoint_pd_server: - type: tosca.capabilities.Endpoint.Admin + forwarder_pd_server_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.Forwarder occurrences: - 1 - UNBOUNDED - attachment_pd_server_pd01_port: + attachment_pd_server_pd01_port_0: type: tosca.capabilities.Attachment occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_template_VMInt_OAM_lb: + disk.device.write.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 + endpoint_pd_server: + type: tosca.capabilities.Endpoint.Admin + 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 + forwarder_pd_server_pd01_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.device.allocation_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. @@ -669,62 +681,60 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server: - type: tosca.capabilities.Node + network.incoming.bytes_pd_server_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.usage_pd_server: + network.outgoing.bytes.rate_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - binding_pd_server_pd01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface + feature_pd_server: + type: tosca.capabilities.Node occurrences: - - 0 + - 1 - UNBOUNDED - disk.write.bytes_pd_server: + disk.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. 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: + network.outgoing.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.device.read.requests.rate_pd_server: + network.incoming.bytes_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - disk.root.size_pd_server: + disk.device.read.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. occurrences: - 1 - UNBOUNDED - disk.device.read.bytes_pd_server: + disk.root.size_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.bytes_pd_server_template_VMInt_OAM_lb: + disk.device.read.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: @@ -736,24 +746,19 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_pd_server_template_VMInt_OAM_lb: - type: tosca.capabilities.Node - occurrences: - - 1 - - UNBOUNDED - disk.device.read.requests_pd_server: + network.outpoing.packets_pd_server_pd01_port_0: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb: + network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb_4: type: org.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_template_VMInt_OAM_lb: + 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. occurrences: @@ -772,27 +777,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.packets_pd_server_pd01_port: + network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb_4: type: org.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_template_VMInt_OAM_lb: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED - binding_pd_server_template_VMInt_OAM_lb: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + feature_pd_server_pd01_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED @@ -808,20 +800,21 @@ node_types: occurrences: - 1 - UNBOUNDED - disk.write.requests_pd_server: + network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb: + disk.write.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 - feature_pd_server_pd01_port: - type: tosca.capabilities.Node + network.outgoing.bytes_pd_server_template_VMInt_OAM_lb_4: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - UNBOUNDED @@ -843,12 +836,19 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.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. + feature_pd_server_template_VMInt_OAM_lb_4: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED + binding_pd_server_template_VMInt_OAM_lb_4: + 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.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. diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml index 4712348457..efc5e3cf12 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml @@ -264,20 +264,20 @@ topology_template: availability_zone: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses - mac_address image: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_port_tuple_refs + - pd_server_template_VMInt_OAM_lb_4_port_tuple_refs metadata: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses volume_type: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip @@ -285,7 +285,7 @@ topology_template: volume_id: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip @@ -293,30 +293,30 @@ topology_template: snapshot_id: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - address_mode description: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_network_refs + - pd_server_template_VMInt_OAM_lb_4_virtual_network_refs device_type: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties - virtual_machine_interface_properties_service_interface_type disk_bus: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - ip source_volid: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - allowed_address_pair - 0 - mac @@ -324,79 +324,79 @@ topology_template: name: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_name + - pd_server_template_VMInt_OAM_lb_4_name swap_size: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_show + - pd_server_template_VMInt_OAM_lb_4_show delete_on_termination: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_fq_name + - pd_server_template_VMInt_OAM_lb_4_fq_name multiattach: get_attribute: - abstract_pd_server - - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties + - pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties cmaui_volume_test_neutron_port_properties: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: image: get_attribute: - abstract_pd_server - - pd_server_pd01_port_admin_state_up + - pd_server_pd01_port_0_admin_state_up metadata: get_attribute: - abstract_pd_server - - pd_server_pd01_port_allowed_address_pairs + - pd_server_pd01_port_0_allowed_address_pairs volume_type: get_attribute: - abstract_pd_server - - pd_server_pd01_port_security_groups + - pd_server_pd01_port_0_security_groups volume_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_qos_policy + - pd_server_pd01_port_0_qos_policy snapshot_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_name + - pd_server_pd01_port_0_name device_type: get_attribute: - abstract_pd_server - - pd_server_pd01_port_show + - pd_server_pd01_port_0_show disk_bus: get_attribute: - abstract_pd_server - - pd_server_pd01_port_subnets + - pd_server_pd01_port_0_subnets backup_id: get_attribute: - abstract_pd_server - - pd_server_pd01_port_network + - pd_server_pd01_port_0_network source_volid: get_attribute: - abstract_pd_server - - pd_server_pd01_port_port_security_enabled + - pd_server_pd01_port_0_port_security_enabled size: '(get_attribute : [pd01_port_0, network]) * 1024' read_only: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd01_port_0_device_owner name: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_id + - pd_server_pd01_port_0_device_id scheduler_hints: get_attribute: - abstract_pd_server - - pd_server_pd01_port_fixed_ips + - pd_server_pd01_port_0_fixed_ips swap_size: get_attribute: - abstract_pd_server - - pd_server_pd01_port_tenant_id + - pd_server_pd01_port_0_tenant_id delete_on_termination: get_attribute: - abstract_pd_server - - pd_server_pd01_port_status + - pd_server_pd01_port_0_status jsa_net4: type: org.openecomp.resource.vl.nodes.heat.network.contrail.VirtualNetwork properties: @@ -409,98 +409,98 @@ topology_template: properties: compute_pd_server_key_name: - SERVER_PD_KEY_NAME - port_pd01_port_replacement_policy: - - AUTO + port_pd01_port_0_mac_requirements: + mac_count_required: + is_required: true + port_pd01_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false compute_pd_server_personality: - value: SERVER_PD_PERSONALITY + port_pd01_port_0_replacement_policy: + - AUTO compute_pd_server_image_update_policy: - REBUILD_PRESERVE_EPHEMERAL + port_pd01_port_0_name: + - PORT_PD_NAME vm_flavor_name: get_input: pd_flavor_name - port_pd01_port_security_groups: - - - DB_Affinity_group - port_pd01_port_mac_requirements: - mac_count_required: - is_required: true + port_pd01_port_0_binding:vnic_type: + - direct-physical vm_image_name: get_input: pd_image_name - port_pd01_port_device_id: - - PORT_PD_DEVICE_ID - port_pd01_port_admin_state_up: + port_pd01_port_0_port_security_enabled: + - false + port_pd01_port_0_value_specs: + - value: PORT_PD_VALUE_SPECS + port_pd01_port_0_admin_state_up: - true + port_template_VMInt_OAM_lb_4_virtual_network_refs: + - - get_attribute: + - jsa_net4 + - fq_name compute_pd_server_metadata: - value: SERVER_PD_METADATA compute_pd_server_diskConfig: - AUTO - port_pd01_port_mac_address: 00-13-24-01-44-35 - port_pd01_port_allowed_address_pairs: - - mac_address: 00-14-22-01-23-45 - ip_address: 10.12.13.134 - - mac_address: 00-13-24-01-44-35 - ip_address: 127.0.13.134 + port_pd01_port_0_mac_address: 00-13-24-01-44-35 compute_pd_server_admin_pass: - SERVER_PD_ADMIN_PASS compute_pd_server_flavor_update_policy: - REPLACE - port_pd01_port_value_specs: - - value: PORT_PD_VALUE_SPECS + port_template_VMInt_OAM_lb_4_security_group_refs: + - - get_input: oam_sec_group_name + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: + - - get_input: mac_address + port_pd01_port_0_fixed_ips: + - ip_address: + get_input: pd_port_fixed_ips_address + - subnet: + get_input: pd_port_fixed_ips_subnet compute_pd_server_security_groups: - - get_input: pd_security_group_name - port_template_VMInt_OAM_lb_port_tuple_refs: - - - get_input: template_PortTuple_LB1 compute_pd_server_software_config_transport: - POLL_SERVER_HEAT + port_pd01_port_0_security_groups: + - - DB_Affinity_group compute_pd_server_scheduler_hints: - group: DB_Affinity_group - port_pd01_port_name: - - PORT_PD_NAME compute_pd_server_contrail_service_instance_ind: - true + port_pd01_port_0_network: + - PORT_PD_NETWORK_ID compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: - get_input: - pd_server_names - 0 - port_pd01_port_binding:vnic_type: - - direct-physical - port_pd01_port_device_owner: - - PORT_PD_DEVICE_OWNER - port_pd01_port_fixed_ips: - - ip_address: - get_input: pd_port_fixed_ips_address - - subnet: - get_input: pd_port_fixed_ips_subnet - port_pd01_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_pd01_port_qos_policy: - - PORT_PD_QOS_POLICY compute_pd_server_config_drive: - true compute_pd_server_user_data_format: - RAW - port_template_VMInt_OAM_lb_virtual_network_refs: - - - get_attribute: - - jsa_net4 - - fq_name - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: - - - get_input: mac_address - port_template_VMInt_OAM_lb_name: + port_pd01_port_0_allowed_address_pairs: + - mac_address: 00-14-22-01-23-45 + ip_address: 10.12.13.134 + - mac_address: 00-13-24-01-44-35 + ip_address: 127.0.13.134 + port_pd01_port_0_device_id: + - PORT_PD_DEVICE_ID + port_pd01_port_0_qos_policy: + - PORT_PD_QOS_POLICY + port_template_VMInt_OAM_lb_4_name: - template_VMInt_OAM_lb_NAME - port_pd01_port_port_security_enabled: - - false compute_pd_server_user_data_update_policy: - IGNORE - port_pd01_port_network: - - PORT_PD_NETWORK_ID + port_pd01_port_0_device_owner: + - PORT_PD_DEVICE_OWNER compute_pd_server_reservation_id: - SERVER_PD_RESERVATION_ID - port_template_VMInt_OAM_lb_security_group_refs: - - - get_input: oam_sec_group_name + port_template_VMInt_OAM_lb_4_port_tuple_refs: + - - get_input: template_PortTuple_LB1 service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 1 @@ -558,4 +558,4 @@ topology_template: properties: container_type: host targets: - - DB_Affinity_group + - DB_Affinity_group
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml index d3a355c174..20ce70c20b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/Nested_pd_serverServiceTemplate.yaml @@ -11,90 +11,98 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_template_VMInt_OAM_lb_4_network_role: + type: string + required: true compute_pd_server_key_name: type: list required: true entry_schema: type: string - port_pd01_port_replacement_policy: + port_pd01_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pd01_port_0_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements compute_pd_server_personality: type: list required: true entry_schema: type: json + port_pd01_port_0_replacement_policy: + type: list + required: true + entry_schema: + type: string compute_pd_server_image_update_policy: type: list required: true entry_schema: type: string + port_pd01_port_0_name: + type: list + required: true + entry_schema: + type: string vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd01_port_0_binding:vnic_type: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd01_port_0_order: + type: integer + required: true + port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs required: true vm_image_name: type: string required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties - required: true - port_template_VMInt_OAM_lb_related_networks: + port_pd01_port_0_port_security_enabled: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_pd01_port_device_id: + type: boolean + port_pd01_port_0_value_specs: type: list required: true entry_schema: - type: string - port_pd01_port_admin_state_up: + type: json + port_pd01_port_0_admin_state_up: type: list required: true entry_schema: type: boolean - port_pd01_port_vlan_requirements: + port_pd01_port_0_subnetpoolid: + type: string + required: true + port_template_VMInt_OAM_lb_4_virtual_network_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: json compute_pd_server_metadata: type: list required: true entry_schema: type: json - port_template_VMInt_OAM_lb_subnetpoolid: - type: string - required: true compute_pd_server_diskConfig: type: list required: true entry_schema: type: string - port_pd01_port_mac_address: + port_pd01_port_0_mac_address: type: string required: true - port_template_VMInt_OAM_lb_network_role: + port_pd01_port_0_network_role_tag: type: string required: true - port_pd01_port_allowed_address_pairs: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true compute_pd_server_admin_pass: type: list required: true @@ -105,33 +113,33 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_related_networks: + port_pd01_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_template_VMInt_OAM_lb_4_security_group_refs: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_template_VMInt_OAM_lb_ip_requirements: + type: json + port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_template_VMInt_OAM_lb_exCP_naming: + type: json + port_template_VMInt_OAM_lb_4_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs - required: true - port_pd01_port_value_specs: + port_template_VMInt_OAM_lb_4_related_networks: type: list required: true entry_schema: - type: json - compute_pd_server_security_groups: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd01_port_0_fixed_ips: type: list required: true entry_schema: - type: json - port_template_VMInt_OAM_lb_port_tuple_refs: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_pd_server_security_groups: type: list required: true entry_schema: @@ -141,62 +149,58 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_network_role_tag: - type: string - required: true - compute_pd_server_scheduler_hints: + port_pd01_port_0_security_groups: type: list required: true entry_schema: type: json - port_pd01_port_name: + compute_pd_server_scheduler_hints: type: list required: true entry_schema: - type: string + type: json compute_pd_server_contrail_service_instance_ind: type: list required: true entry_schema: type: boolean - compute_pd_server_availability_zone: + port_template_VMInt_OAM_lb_4_vlan_requirements: type: list required: true entry_schema: - type: string - compute_pd_server_name: + type: org.openecomp.datatypes.network.VlanRequirements + port_pd01_port_0_network: type: list required: true entry_schema: type: string - port_template_VMInt_OAM_lb_network_role_tag: + port_pd01_port_0_network_role: type: string required: true - port_pd01_port_binding:vnic_type: + compute_pd_server_availability_zone: type: list required: true entry_schema: type: string - port_pd01_port_device_owner: + compute_pd_server_name: type: list required: true entry_schema: type: string - port_pd01_port_fixed_ips: - type: list + port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pd01_port_ip_requirements: + port_template_VMInt_OAM_lb_4_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_qos_policy: - type: list + port_template_VMInt_OAM_lb_4_subnetpoolid: + type: string + required: true + port_template_VMInt_OAM_lb_4_network_role_tag: + type: string required: true - entry_schema: - type: string compute_pd_server_config_drive: type: list required: true @@ -207,73 +211,69 @@ topology_template: required: true entry_schema: type: string - port_template_VMInt_OAM_lb_virtual_network_refs: + port_pd01_port_0_allowed_address_pairs: type: list required: true entry_schema: - type: json - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_template_VMInt_OAM_lb_order: - type: integer - required: true - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + type: org.openecomp.datatypes.heat.network.AddressPair + port_pd01_port_0_device_id: type: list required: true entry_schema: - type: json - port_template_VMInt_OAM_lb_name: + type: string + port_pd01_port_0_qos_policy: type: list required: true entry_schema: type: string - port_pd01_port_port_security_enabled: + port_pd01_port_0_related_networks: type: list required: true entry_schema: - type: boolean - port_template_VMInt_OAM_lb_vlan_requirements: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_template_VMInt_OAM_lb_4_name: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: string + port_template_VMInt_OAM_lb_4_order: + type: integer + required: true compute_pd_server_user_data_update_policy: type: list required: true entry_schema: type: string - port_pd01_port_network: + port_pd01_port_0_device_owner: type: list required: true entry_schema: type: string + port_template_VMInt_OAM_lb_4_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true compute_pd_server_reservation_id: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: - type: string - required: true - port_template_VMInt_OAM_lb_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pd01_port_network_role: - type: string - required: true - port_template_VMInt_OAM_lb_security_group_refs: + port_template_VMInt_OAM_lb_4_port_tuple_refs: type: list required: true entry_schema: type: json + port_pd01_port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -350,134 +350,134 @@ topology_template: get_input: - compute_pd_server_flavor_update_policy - index_value - pd_server_template_VMInt_OAM_lb: + pd_server_template_VMInt_OAM_lb_4: type: org.openecomp.resource.cp.nodes.heat.contrailV2.VirtualMachineInterface properties: mac_requirements: - get_input: port_template_VMInt_OAM_lb_mac_requirements + get_input: port_template_VMInt_OAM_lb_4_mac_requirements order: - get_input: port_template_VMInt_OAM_lb_order + get_input: port_template_VMInt_OAM_lb_4_order exCP_naming: - get_input: port_template_VMInt_OAM_lb_exCP_naming + get_input: port_template_VMInt_OAM_lb_4_exCP_naming virtual_machine_interface_allowed_address_pairs: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs - index_value vlan_requirements: - get_input: port_template_VMInt_OAM_lb_vlan_requirements + get_input: port_template_VMInt_OAM_lb_4_vlan_requirements virtual_machine_interface_properties: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_properties + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_properties - index_value subinterface_indicator: false related_networks: - get_input: port_template_VMInt_OAM_lb_related_networks + get_input: port_template_VMInt_OAM_lb_4_related_networks security_group_refs: get_input: - - port_template_VMInt_OAM_lb_security_group_refs + - port_template_VMInt_OAM_lb_4_security_group_refs - index_value virtual_network_refs: get_input: - - port_template_VMInt_OAM_lb_virtual_network_refs + - port_template_VMInt_OAM_lb_4_virtual_network_refs - index_value ip_requirements: - get_input: port_template_VMInt_OAM_lb_ip_requirements + get_input: port_template_VMInt_OAM_lb_4_ip_requirements network_role_tag: - get_input: port_template_VMInt_OAM_lb_network_role_tag + get_input: port_template_VMInt_OAM_lb_4_network_role_tag virtual_machine_interface_mac_addresses: get_input: - - port_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses + - port_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses - index_value port_tuple_refs: get_input: - - port_template_VMInt_OAM_lb_port_tuple_refs + - port_template_VMInt_OAM_lb_4_port_tuple_refs - index_value network_role: - get_input: port_template_VMInt_OAM_lb_network_role + get_input: port_template_VMInt_OAM_lb_4_network_role subnetpoolid: - get_input: port_template_VMInt_OAM_lb_subnetpoolid + get_input: port_template_VMInt_OAM_lb_4_subnetpoolid name: get_input: - - port_template_VMInt_OAM_lb_name + - port_template_VMInt_OAM_lb_4_name - index_value requirements: - binding: capability: tosca.capabilities.network.Bindable node: pd_server relationship: tosca.relationships.network.BindsTo - pd_server_pd01_port: + pd_server_pd01_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: allowed_address_pairs: - get_input: port_pd01_port_allowed_address_pairs + get_input: port_pd01_port_0_allowed_address_pairs binding:vnic_type: get_input: - - port_pd01_port_binding:vnic_type + - port_pd01_port_0_binding:vnic_type - index_value value_specs: get_input: - - port_pd01_port_value_specs + - port_pd01_port_0_value_specs - index_value network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd01_port_0_network_role_tag fixed_ips: get_input: - - port_pd01_port_fixed_ips + - port_pd01_port_0_fixed_ips - index_value subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd01_port_0_subnetpoolid name: get_input: - - port_pd01_port_name + - port_pd01_port_0_name - index_value network: get_input: - - port_pd01_port_network + - port_pd01_port_0_network - index_value replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd01_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd01_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd01_port_0_order device_owner: get_input: - - port_pd01_port_device_owner + - port_pd01_port_0_device_owner - index_value mac_address: - get_input: port_pd01_port_mac_address + get_input: port_pd01_port_0_mac_address security_groups: get_input: - - port_pd01_port_security_groups + - port_pd01_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd01_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd01_port_0_vlan_requirements qos_policy: get_input: - - port_pd01_port_qos_policy + - port_pd01_port_0_qos_policy - index_value subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd01_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd01_port_0_related_networks port_security_enabled: get_input: - - port_pd01_port_port_security_enabled + - port_pd01_port_0_port_security_enabled - index_value admin_state_up: get_input: - - port_pd01_port_admin_state_up + - port_pd01_port_0_admin_state_up - index_value network_role: - get_input: port_pd01_port_network_role + get_input: port_pd01_port_0_network_role device_id: get_input: - - port_pd01_port_device_id + - port_pd01_port_0_device_id - index_value requirements: - binding: @@ -485,150 +485,136 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: - pd_server_pd01_port_allowed_address_pairs: + pd_server_pd01_port_0_port_security_enabled: + type: boolean + value: + get_attribute: + - pd_server_pd01_port_0 + - port_security_enabled + pd_server_show: + type: string + value: + get_attribute: + - pd_server + - show + pd_server_template_VMInt_OAM_lb_4_name: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - name + pd_server_pd01_port_0_allowed_address_pairs: type: list value: get_attribute: - - pd_server_pd01_port + - pd_server_pd01_port_0 - allowed_address_pairs entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_mac_addresses: + pd_server_console_urls: + type: string + value: + get_attribute: + - pd_server + - console_urls + pd_server_pd01_port_0_security_groups: type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_mac_addresses + - pd_server_pd01_port_0 + - security_groups entry_schema: type: string - pd_server_template_VMInt_OAM_lb_virtual_network_refs: + pd_server_pd01_port_0_tenant_id: + type: string + value: + get_attribute: + - pd_server_pd01_port_0 + - tenant_id + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_mac_addresses: type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_network_refs + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_mac_addresses entry_schema: type: string - pd_server_template_VMInt_OAM_lb_fq_name: + pd_server_template_VMInt_OAM_lb_4_fq_name: type: string value: get_attribute: - - pd_server_template_VMInt_OAM_lb + - pd_server_template_VMInt_OAM_lb_4 - fq_name - pd_server_show: - type: string - value: - get_attribute: - - pd_server - - show - pd_server_console_urls: + pd_server_pd01_port_0_name: type: string value: get_attribute: - - pd_server - - console_urls - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_allowed_address_pairs: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + - pd_server_pd01_port_0 + - name + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_properties: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_allowed_address_pairs - pd_server_pd01_port_security_groups: + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_properties + pd_server_pd01_port_0_subnets: type: list value: get_attribute: - - pd_server_pd01_port - - security_groups + - pd_server_pd01_port_0 + - subnets entry_schema: type: string - pd_server_pd01_port_port_security_enabled: - type: boolean + pd_server_pd01_port_0_show: + type: string value: get_attribute: - - pd_server_pd01_port - - port_security_enabled - pd_server_pd01_port_status: + - pd_server_pd01_port_0 + - show + pd_server_pd01_port_0_status: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd01_port_0 - status - pd_server_template_VMInt_OAM_lb_port_tuple_refs: - type: list - value: - get_attribute: - - pd_server_template_VMInt_OAM_lb - - port_tuple_refs - entry_schema: - type: string - pd_server_pd01_port_fixed_ips: - type: list + pd_server_pd01_port_0_qos_policy: + type: string value: get_attribute: - - pd_server_pd01_port - - fixed_ips - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps + - pd_server_pd01_port_0 + - qos_policy pd_server_accessIPv6: type: string value: get_attribute: - pd_server - accessIPv6 - pd_server_pd01_port_admin_state_up: - type: boolean - value: - get_attribute: - - pd_server_pd01_port - - admin_state_up pd_server_instance_name: type: string value: get_attribute: - pd_server - instance_name - pd_server_template_VMInt_OAM_lb_name: - type: string - value: - get_attribute: - - pd_server_template_VMInt_OAM_lb - - name pd_server_accessIPv4: type: string value: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: - type: string - value: - get_attribute: - - pd_server_pd01_port - - device_owner - pd_server_pd01_port_show: - type: string - value: - get_attribute: - - pd_server_pd01_port - - show - pd_server_pd01_port_network: - type: string - value: - get_attribute: - - pd_server_pd01_port - - network - pd_server_pd01_port_qos_policy: - type: string + pd_server_pd01_port_0_admin_state_up: + type: boolean value: get_attribute: - - pd_server_pd01_port - - qos_policy - pd_server_pd01_port_mac_address: - type: string + - pd_server_pd01_port_0 + - admin_state_up + pd_server_template_VMInt_OAM_lb_4_virtual_network_refs: + type: list value: get_attribute: - - pd_server_pd01_port - - mac_address + - pd_server_template_VMInt_OAM_lb_4 + - virtual_network_refs + entry_schema: + type: string pd_server_addresses: type: map value: @@ -637,53 +623,73 @@ topology_template: - addresses entry_schema: type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo - pd_server_pd01_port_tenant_id: + pd_server_pd01_port_0_device_id: type: string value: get_attribute: - - pd_server_pd01_port - - tenant_id - pd_server_template_VMInt_OAM_lb_virtual_machine_interface_properties: - type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties + - pd_server_pd01_port_0 + - device_id + pd_server_pd01_port_0_network: + type: string value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - virtual_machine_interface_properties - pd_server_pd01_port_device_id: + - pd_server_pd01_port_0 + - network + pd_server_pd01_port_0_mac_address: type: string value: get_attribute: - - pd_server_pd01_port - - device_id - pd_server_pd01_port_name: + - pd_server_pd01_port_0 + - mac_address + pd_server_pd01_port_0_device_owner: type: string value: get_attribute: - - pd_server_pd01_port - - name - pd_server_template_VMInt_OAM_lb_show: - type: string + - pd_server_pd01_port_0 + - device_owner + pd_server_pd01_port_0_fixed_ips: + type: list value: get_attribute: - - pd_server_template_VMInt_OAM_lb - - show - pd_server_pd01_port_subnets: + - pd_server_pd01_port_0 + - fixed_ips + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + pd_server_template_VMInt_OAM_lb_4_port_tuple_refs: type: list value: get_attribute: - - pd_server_pd01_port - - subnets + - pd_server_template_VMInt_OAM_lb_4 + - port_tuple_refs entry_schema: type: string + pd_server_template_VMInt_OAM_lb_4_show: + type: string + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - show + pd_server_template_VMInt_OAM_lb_4_virtual_machine_interface_allowed_address_pairs: + type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs + value: + get_attribute: + - pd_server_template_VMInt_OAM_lb_4 + - virtual_machine_interface_allowed_address_pairs substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: + binding_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - binding scalable_pd_server: - pd_server - scalable disk.read.bytes.rate_pd_server: - pd_server - disk.read.bytes.rate + network.outpoing.packets_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outpoing.packets memory.usage_pd_server: - pd_server - memory.usage @@ -693,27 +699,21 @@ 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 - network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.packets.rate + network.incoming.packets_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.packets 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_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.bytes.rate cpu_pd_server: - pd_server - cpu - network.outpoing.packets_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outpoing.packets cpu_util_pd_server: - pd_server - cpu_util @@ -726,45 +726,51 @@ 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 + network.incoming.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.packets disk.iops_pd_server: - pd_server - disk.iops - network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.packets.rate memory.resident_pd_server: - pd_server - memory.resident cpu.delta_pd_server: - pd_server - cpu.delta - network.incoming.packets.rate_pd_server_pd01_port: - - pd_server_pd01_port + network.incoming.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 - network.incoming.packets.rate + network.incoming.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes.rate + network.outgoing.packets.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.packets.rate vcpus_pd_server: - pd_server - vcpus disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate + forwarder_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - forwarder + attachment_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - attachment 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 - network.outgoing.bytes_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.bytes disk.capacity_pd_server: - pd_server - disk.capacity + forwarder_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - forwarder disk.device.allocation_pd_server: - pd_server - disk.device.allocation @@ -777,24 +783,27 @@ topology_template: disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.bytes + network.outgoing.bytes.rate_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes.rate feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding 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 + network.outgoing.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outgoing.bytes + network.incoming.bytes_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.incoming.bytes disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -804,57 +813,45 @@ topology_template: disk.device.read.bytes_pd_server: - pd_server - disk.device.read.bytes - network.incoming.bytes_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.bytes disk.device.write.bytes_pd_server: - pd_server - disk.device.write.bytes - feature_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - feature + network.outpoing.packets_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - network.outpoing.packets + network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.bytes.rate disk.device.read.requests_pd_server: - pd_server - disk.device.read.requests - network.incoming.bytes.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.bytes.rate - network.incoming.packets_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.incoming.packets instance_pd_server: - pd_server - instance host_pd_server: - pd_server - host - network.outpoing.packets_pd_server_pd01_port: - - pd_server_pd01_port - - network.outpoing.packets - forwarder_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - forwarder - binding_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - binding - forwarder_pd_server_pd01_port: - - pd_server_pd01_port - - forwarder + network.incoming.packets.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.incoming.packets.rate + feature_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - feature disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate disk.ephemeral.size_pd_server: - pd_server - disk.ephemeral.size + network.outgoing.packets.rate_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.packets.rate disk.write.requests_pd_server: - pd_server - disk.write.requests - network.outgoing.bytes.rate_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - network.outgoing.bytes.rate - feature_pd_server_pd01_port: - - pd_server_pd01_port - - feature + network.outgoing.bytes_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - network.outgoing.bytes disk.device.latency_pd_server: - pd_server - disk.device.latency @@ -864,9 +861,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 + feature_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - feature + binding_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - binding disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -874,18 +874,18 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - dependency_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - dependency - link_pd_server_pd01_port: - - pd_server_pd01_port - - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - dependency - link_pd_server_template_VMInt_OAM_lb: - - pd_server_template_VMInt_OAM_lb - - link
\ No newline at end of file + link_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - link + dependency_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - dependency + link_pd_server_pd01_port_0: + - pd_server_pd01_port_0 + - link + dependency_pd_server_template_VMInt_OAM_lb_4: + - pd_server_template_VMInt_OAM_lb_4 + - dependency
\ No newline at end of file |