diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances')
42 files changed, 2077 insertions, 2077 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/in/hot-mog-0108-bs1271.yml index 5e25e96923..552febb573 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/in/hot-mog-0108-bs1271.yml @@ -30,7 +30,7 @@ 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_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -40,14 +40,14 @@ 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_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2f86795f4a..5005610295 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -111,14 +111,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -154,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -171,19 +171,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -207,13 +212,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -231,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -243,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -260,11 +271,6 @@ 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. @@ -283,6 +289,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -294,6 +305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -305,31 +322,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -374,14 +385,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -403,11 +414,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. @@ -426,15 +432,9 @@ 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. - occurrences: - - 1 - - 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. 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/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml index 27902bc77b..d048466cf3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml @@ -88,25 +88,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml index 7f4ab4aa0f..2812df418b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -155,24 +155,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -182,24 +185,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -209,9 +215,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -221,30 +224,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -266,12 +272,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -281,9 +287,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 @@ -293,9 +296,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -303,12 +303,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/in/hot-mog-0108-bs1271.yml index 1a753deeb2..364be4c182 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -30,7 +30,7 @@ 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_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -40,14 +40,14 @@ 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_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 @@ -63,4 +63,4 @@ resources: network_policy_port0: type: OS::Contrail::NetworkPolicy properties: - entries: {get_attr: [pd01_port_0, device_owner]}
\ No newline at end of file + entries: {get_attr: [pd_server_0_mgmt_port_0, device_owner]}
\ 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/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 524008669b..efd25af52b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -97,13 +97,13 @@ node_types: entry_schema: type: string attributes: - pd_server_accessIPv6: + pd_server_pd_server_mgmt_port_0_device_owner: type: string status: SUPPORTED - pd_server_accessIPv4: + pd_server_accessIPv6: type: string status: SUPPORTED - pd_server_pd01_port_device_owner: + pd_server_accessIPv4: type: string status: SUPPORTED requirements: @@ -121,14 +121,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -164,7 +164,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -181,19 +181,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -217,13 +222,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -241,7 +246,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -253,6 +258,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -270,11 +281,6 @@ 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. @@ -293,6 +299,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -304,6 +315,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -315,31 +332,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -384,14 +395,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -413,11 +424,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. @@ -436,15 +442,9 @@ 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. - occurrences: - - 1 - - 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. 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/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml index dd4e11a31a..b194d421c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml @@ -102,25 +102,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 @@ -138,7 +138,7 @@ topology_template: entries: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_owner + - pd_server_pd_server_mgmt_port_0_device_owner groups: hot-mog-0108-bs1271_group: type: org.openecomp.groups.heat.HeatStack diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 28b65b6e47..2f499b7e98 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -138,6 +138,12 @@ topology_template: node: pd_server relationship: tosca.relationships.network.BindsTo outputs: + pd_server_pd_server_mgmt_port_0_device_owner: + type: string + value: + get_attribute: + - pd_server_pd_server_mgmt_port_0 + - device_owner pd_server_accessIPv6: type: string value: @@ -150,12 +156,6 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_owner: - type: string - value: - get_attribute: - - pd_server_pd01_port - - device_owner substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server capabilities: @@ -174,24 +174,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -201,24 +204,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -228,9 +234,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -240,30 +243,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -285,12 +291,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -300,9 +306,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 @@ -312,9 +315,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -322,12 +322,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/in/hot-mog-0108-bs1271.yml index 09cabbf097..1df88783bb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/in/hot-mog-0108-bs1271.yml @@ -33,7 +33,7 @@ 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_0_mgmt_port_0} user_data_format: {get_attr: [network_policy_server, name]} server_pd_02: type: OS::Nova::Server @@ -43,15 +43,15 @@ 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_mgmt_port_0} metadata: {get_attr: [network_policy_server, name]} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 389ae7404a..2e65005e29 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -117,14 +117,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -160,7 +160,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -177,19 +177,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -213,13 +218,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -237,7 +242,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -249,6 +254,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -266,11 +277,6 @@ 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. @@ -289,6 +295,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -300,6 +311,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -311,31 +328,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -380,14 +391,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -409,11 +420,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. @@ -432,15 +438,9 @@ 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. - occurrences: - - 1 - - 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. 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/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml index aa9558e0f4..534b0c9f32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml @@ -103,27 +103,27 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: + port_pd_server_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: - get_attribute: - network_policy_server - name - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: - mac_count_required: - is_required: false vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - get_attribute: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml index 3b9665a316..a9a05cb5d4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -111,35 +111,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -164,24 +164,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -191,24 +194,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -218,9 +224,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -230,30 +233,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -275,12 +281,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -290,9 +296,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 @@ -302,9 +305,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -312,12 +312,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/in/hot-mog-0108-bs1271.yml index fe0b9b1c39..7a0ce5d2cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/in/hot-mog-0108-bs1271.yml @@ -30,8 +30,8 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_0} - user_data_format: {get_attr: [pd01_port_0, device_id]} + - port: {get_resource: pd_server_0_mgmt_port_0} + user_data_format: {get_attr: [pd_server_0_mgmt_port_0, device_id]} server_pd_02: type: OS::Nova::Server properties: @@ -40,14 +40,14 @@ resources: flavor: {get_param: pd_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: pd01_port_1} - user_data_format: {get_attr: [pd01_port_1, device_id]} - pd01_port_0: + - port: {get_resource: pd_server_1_mgmt_port_0} + user_data_format: {get_attr: [pd_server_1_mgmt_port_0, device_id]} + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: {get_attr: [server_pd_01, accessIPv4]} - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0869edfb2a..e9fdc8d8ec 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,62 +38,52 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string + required: true + status: SUPPORTED + port_pd_server_mgmt_port_0_network: 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_pd01_port_network_role: + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -99,14 +99,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -142,7 +142,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -159,19 +159,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -195,13 +200,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -219,7 +224,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -231,6 +236,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -248,11 +259,6 @@ 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. @@ -271,6 +277,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -282,6 +293,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -293,31 +310,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -362,14 +373,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -391,11 +402,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. @@ -414,15 +420,9 @@ 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. - occurrences: - - 1 - - 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. 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/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml index 091e767de5..7d98912a3d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml @@ -88,22 +88,22 @@ topology_template: - get_input: - pd_server_names - 0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 service_template_filter: substitute_service_template: Nested_pd_serverServiceTemplate.yaml count: 2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml index 376d974422..3854e84393 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,50 +36,42 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string + required: true + port_pd_server_mgmt_port_0_network: type: list required: true entry_schema: type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_network_role_tag: - type: string - required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -90,9 +90,9 @@ topology_template: - index_value user_data_format: get_attribute: - - pd_server_pd01_port + - pd_server_pd_server_mgmt_port_0 - device_id - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: @@ -100,27 +100,27 @@ topology_template: - pd_server - accessIPv4 mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -145,24 +145,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -172,24 +175,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -199,9 +205,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -211,30 +214,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -256,12 +262,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -271,9 +277,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 @@ -283,9 +286,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -293,12 +293,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/in/hot-mog-0108-bs1271.yml index f949b8e431..bc72cac5fa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/in/hot-mog-0108-bs1271.yml @@ -33,7 +33,7 @@ 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_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -43,15 +43,15 @@ 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_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 security_groups: [{get_resource: jsa_security_group}] replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4cac9ccc47..5a99ad93ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,74 +38,64 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_security_groups: + port_pd_server_mgmt_port_0_order: + type: integer + required: true + status: SUPPORTED + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd_server_mgmt_port_0_vlan_requirements: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: json + port_pd_server_mgmt_port_0_network: 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_pd01_port_network_role: + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -117,14 +117,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -160,7 +160,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -177,19 +177,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -213,13 +218,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -237,7 +242,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -249,6 +254,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -266,11 +277,6 @@ 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. @@ -289,6 +295,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -300,6 +311,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -311,31 +328,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -380,14 +391,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -409,11 +420,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. @@ -432,15 +438,9 @@ 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. - occurrences: - - 1 - - 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. 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/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml index fab4956ec6..68e221bb64 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml @@ -99,7 +99,7 @@ topology_template: direction: ingress requirements: - port: - capability: attachment_pd_server_pd01_port + capability: attachment_pd_server_pd_server_mgmt_port_0 node: abstract_pd_server relationship: org.openecomp.relationships.AttachesTo abstract_pd_server: @@ -117,28 +117,28 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_security_groups: - - - jsa_security_group - - - jsa_security_group - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_security_groups: + - - jsa_security_group + - - jsa_security_group + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml index 974367b48b..4db809022a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,60 +36,52 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_security_groups: + port_pd_server_mgmt_port_0_order: + type: integer + required: true + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: json - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: string + port_pd_server_mgmt_port_0_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_security_groups: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: json + port_pd_server_mgmt_port_0_network: 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_pd01_port_network_role: + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -107,39 +107,39 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order security_groups: get_input: - - port_pd01_port_security_groups + - port_pd_server_mgmt_port_0_security_groups - index_value exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -164,24 +164,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -191,24 +194,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -218,9 +224,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -230,30 +233,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -275,12 +281,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -290,9 +296,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 @@ -302,9 +305,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -312,12 +312,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/in/hot-mog-0108-bs1271.yml index b8d704178f..fb96dcfb80 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/in/hot-mog-0108-bs1271.yml @@ -43,7 +43,7 @@ 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_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -55,14 +55,14 @@ 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_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_resource: packet_mirror_network } replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: { get_resource: packet_mirror_network } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2f86795f4a..5005610295 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -111,14 +111,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -154,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -171,19 +171,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -207,13 +212,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -231,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -243,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -260,11 +271,6 @@ 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. @@ -283,6 +289,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -294,6 +305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -305,31 +322,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -374,14 +385,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -403,11 +414,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. @@ -426,15 +432,9 @@ 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. - occurrences: - - 1 - - 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. 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/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml index bdf50b94e4..8768ffd8eb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml @@ -141,25 +141,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - packet_mirror_network + - packet_mirror_network + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - packet_mirror_network - - packet_mirror_network compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 @@ -176,7 +176,7 @@ topology_template: capability: tosca.capabilities.Node node: packet_mirror_network relationship: tosca.relationships.DependsOn - - link_pd_server_pd01_port: + - link_pd_server_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable node: packet_mirror_network relationship: tosca.relationships.network.LinksTo @@ -208,4 +208,4 @@ topology_template: members: - packet_mirror_network - pd01_volume - - abstract_pd_server
\ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml index 7f4ab4aa0f..2812df418b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -155,24 +155,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -182,24 +185,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -209,9 +215,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -221,30 +224,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -266,12 +272,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -281,9 +287,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 @@ -293,9 +296,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -303,12 +303,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/in/hot-mog-0108-bs1271.yml index 200fe3cf09..1cbae9e675 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/in/hot-mog-0108-bs1271.yml @@ -31,7 +31,7 @@ resources: availability_zone: {get_param: availabilityzone_name} scheduler_hints: { group: { get_resource: BE_Affinity } } networks: - - port: {get_resource: pd01_port_0} + - port: {get_resource: pd_server_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -42,14 +42,14 @@ resources: availability_zone: {get_param: availabilityzone_name} scheduler_hints: { group: { get_resource: BE_Affinity } } networks: - - port: {get_resource: pd01_port_1} + - port: {get_resource: pd_server_1_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3c33dadc4c..21efa9de25 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -14,6 +14,16 @@ node_types: status: SUPPORTED entry_schema: type: json + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -34,68 +44,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -117,14 +117,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -160,7 +160,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -177,19 +177,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -213,13 +218,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -237,7 +242,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -249,6 +254,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -266,11 +277,6 @@ 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. @@ -289,6 +295,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -300,6 +311,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -311,31 +328,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -380,14 +391,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -409,11 +420,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. @@ -432,15 +438,9 @@ 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. - occurrences: - - 1 - - 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. 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/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml index 41df4372dd..7f55e00553 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml @@ -91,25 +91,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 @@ -140,4 +140,4 @@ topology_template: name: Policy_BE_Affinity affinity: host targets: - - BE_Affinity_group
\ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml index 51236d7661..97ae77f1be 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/Nested_pd_serverServiceTemplate.yaml @@ -16,6 +16,14 @@ topology_template: required: true entry_schema: type: json + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -33,55 +41,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -111,35 +111,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -164,24 +164,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -191,24 +194,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -218,9 +224,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -230,30 +233,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -275,12 +281,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -290,9 +296,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 @@ -302,9 +305,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -312,12 +312,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/in/hot-mog-0108-bs1271.yml index 1180cb6e8e..09276b82c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/in/hot-mog-0108-bs1271.yml @@ -30,7 +30,7 @@ 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_0_mgmt_port_0} user_data_format: RAW_SERVER_PD_1 server_pd_02: type: OS::Nova::Server @@ -40,14 +40,14 @@ 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_mgmt_port_0} user_data_format: RAW_SERVER_PD_2 - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-0 replacement_policy: AUTO_PORT_0 - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-1 @@ -62,4 +62,4 @@ outputs: output_attr_port_pd_0: description: output attr port0 value: - get_attr: [pd01_port_0, device_id]
\ No newline at end of file + get_attr: [pd_server_0_mgmt_port_0, device_id]
\ 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/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 9dcebc39ab..0d6c5f68cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -103,7 +103,7 @@ node_types: pd_server_accessIPv4: type: string status: SUPPORTED - pd_server_pd01_port_device_id: + pd_server_pd_server_mgmt_port_0_device_id: type: string status: SUPPORTED requirements: @@ -121,14 +121,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -164,7 +164,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -181,19 +181,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -217,13 +222,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -241,7 +246,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -253,6 +258,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -270,11 +281,6 @@ 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. @@ -293,6 +299,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -304,6 +315,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -315,31 +332,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -384,14 +395,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -413,11 +424,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. @@ -436,15 +442,9 @@ 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. - occurrences: - - 1 - - 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. 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/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml index f0de88c8cc..504ef96d67 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -88,25 +88,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO_PORT_1 - - AUTO_PORT_0 - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO_PORT_1 + - AUTO_PORT_0 vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-1 + - Network-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-1 - - Network-0 compute_pd_server_user_data_format: - RAW_SERVER_PD_2 - RAW_SERVER_PD_1 @@ -132,7 +132,7 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_pd01_port_device_id + - pd_server_pd_server_mgmt_port_0_device_id output_attr_server_pd_1: description: output attr pd1 value: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml index 2bbdf87416..1bd6282fc4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -150,11 +150,11 @@ topology_template: get_attribute: - pd_server - accessIPv4 - pd_server_pd01_port_device_id: + pd_server_pd_server_mgmt_port_0_device_id: type: string value: get_attribute: - - pd_server_pd01_port + - pd_server_pd_server_mgmt_port_0 - device_id substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.pd_server @@ -174,24 +174,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -201,24 +204,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -228,9 +234,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -240,30 +243,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -285,12 +291,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -300,9 +306,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 @@ -312,9 +315,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -322,12 +322,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml index 8d21459478..6133829189 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/in/hot-mog-0108-bs1271.yml @@ -42,7 +42,7 @@ 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_0_mgmt_port_0} user_data_format: RAW server_pd_02: type: OS::Nova::Server @@ -52,7 +52,7 @@ 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_mgmt_port_0} server_ps_01: type: OS::Nova::Server properties: @@ -61,7 +61,7 @@ resources: flavor: {get_param: ps_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: ps01_port_0} + - port: {get_resource: ps_server_0_mgmt_port_0} server_ps_02: type: OS::Nova::Server properties: @@ -70,24 +70,24 @@ resources: flavor: {get_param: ps_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: ps01_port_1} + - port: {get_resource: ps_server_1_mgmt_port_0} user_data_format: RAW - pd01_port_0: + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PD-0 replacement_policy: AUTO - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PD-1 replacement_policy: AUTO - ps01_port_0: + ps_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PS-0 replacement_policy: AUTO - ps01_port_1: + ps_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PS-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml index bf6c64994a..51118f5860 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -111,14 +111,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -154,7 +154,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -171,19 +171,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -207,13 +212,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -231,7 +236,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -243,6 +248,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -260,11 +271,6 @@ 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. @@ -283,6 +289,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -294,6 +305,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -305,31 +322,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -374,14 +385,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -403,11 +414,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. @@ -426,12 +432,6 @@ 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. - occurrences: - - 1 - - 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. @@ -447,10 +447,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_ps_server_availability_zone: type: list required: true @@ -471,7 +467,17 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -481,52 +487,46 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_ps01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_ps01_port_network: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED requirements: @@ -544,38 +544,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_ps01_port: + - dependency_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: + - link_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED instance_ps_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.outpoing.packets_ps_server_ps01_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 host_ps_server: type: tosca.capabilities.Container valid_source_types: @@ -583,12 +571,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu.delta_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -601,8 +583,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: - type: tosca.capabilities.Node + network.incoming.packets.rate_ps_server_ps_server_mgmt_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 @@ -623,6 +606,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -635,6 +623,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_ps_server_mgmt_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.bytes_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -653,7 +647,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_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: @@ -665,12 +659,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_ps_server_mgmt_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.read.bytes.rate_ps_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 + binding_ps_server_ps_server_mgmt_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 memory_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -694,6 +702,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -730,13 +743,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_mgmt_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_ps_server_ps01_port: + memory.resident_ps_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: @@ -754,7 +767,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_ps_server_ps_server_mgmt_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: @@ -789,11 +813,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -805,19 +824,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - forwarder_ps_server_ps01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -842,32 +848,26 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps_server: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.capacity_ps_server: + network.outgoing.bytes_ps_server_ps_server_mgmt_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_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.allocation_ps_server: + disk.capacity_ps_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.bytes_ps_server_ps01_port: + disk.device.allocation_ps_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
\ 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/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml index 95d4c73702..68cf463a7e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml @@ -139,25 +139,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO - - AUTO - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO + - AUTO vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-PD-1 + - Network-PD-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-PD-1 - - Network-PD-0 compute_pd_server_user_data_format: - null - RAW @@ -187,20 +187,20 @@ topology_template: compute_ps_server_user_data_format: - null - RAW + port_ps_server_mgmt_port_0_network: + - Network-PS-0 + - Network-PS-1 + port_ps_server_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: ps_flavor_name - vm_image_name: - get_input: ps_image_name - port_ps01_port_replacement_policy: + port_ps_server_mgmt_port_0_replacement_policy: - AUTO - AUTO - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: - - Network-PS-0 - - Network-PS-1 - port_ps01_port_ip_requirements: + vm_image_name: + get_input: ps_image_name + port_ps_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml index 7f4ab4aa0f..2812df418b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -155,24 +155,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -182,24 +185,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -209,9 +215,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -221,30 +224,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -266,12 +272,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -281,9 +287,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 @@ -293,9 +296,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -303,12 +303,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml index adb7631cbf..acf65cf0ba 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/Nested_ps_serverServiceTemplate.yaml @@ -16,9 +16,6 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true compute_ps_server_availability_zone: type: list required: true @@ -36,7 +33,15 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,43 +49,38 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true - port_ps01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps01_port_network: - type: list + port_ps_server_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true node_templates: ps_server: @@ -102,35 +102,35 @@ topology_template: get_input: - compute_ps_server_user_data_format - index_value - ps_server_ps01_port: + ps_server_ps_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps01_port_replacement_policy + - port_ps_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps_server_mgmt_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps_server_mgmt_port_0_order exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps_server_mgmt_port_0_network_role_tag network_role: - get_input: port_ps01_port_network_role + get_input: port_ps_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps_server_mgmt_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps_server_mgmt_port_0_network - index_value requirements: - binding: @@ -140,30 +140,21 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature + network.incoming.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets.rate feature_ps_server: - ps_server - feature @@ -173,12 +164,18 @@ topology_template: disk.device.read.requests.rate_ps_server: - ps_server - disk.device.read.requests.rate + feature_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - feature cpu_ps_server: - ps_server - cpu disk.device.write.bytes_ps_server: - ps_server - disk.device.write.bytes + network.incoming.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes disk.device.read.bytes_ps_server: - ps_server - disk.device.read.bytes @@ -188,15 +185,21 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.latency_ps_server: - ps_server - disk.device.latency + network.outpoing.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outpoing.packets disk.read.bytes.rate_ps_server: - ps_server - disk.read.bytes.rate + binding_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - binding memory_ps_server: - ps_server - memory @@ -209,6 +212,9 @@ topology_template: disk.write.requests_ps_server: - ps_server - disk.write.requests + forwarder_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - forwarder disk.latency_ps_server: - ps_server - disk.latency @@ -227,21 +233,27 @@ topology_template: cpu_util_ps_server: - ps_server - cpu_util + network.outgoing.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.packets.rate memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes.rate + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets + attachment_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - attachment + network.incoming.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate @@ -257,21 +269,12 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port - - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port - - forwarder disk.device.write.bytes.rate_ps_server: - ps_server - disk.device.write.bytes.rate @@ -284,31 +287,28 @@ topology_template: disk.device.write.requests_ps_server: - ps_server - disk.device.write.requests + network.outgoing.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes endpoint_ps_server: - ps_server - endpoint disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 - dependency + link_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/in/hot-mog-0108-bs1271.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/in/hot-mog-0108-bs1271.yml index 79db7ad66b..e0ff94b820 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/in/hot-mog-0108-bs1271.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/in/hot-mog-0108-bs1271.yml @@ -42,7 +42,7 @@ 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_0_mgmt_port_0} user_data_format: {get_attr: [server_ps_01, accessIPv4]} server_pd_02: type: OS::Nova::Server @@ -52,7 +52,7 @@ 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_mgmt_port_0} server_ps_01: type: OS::Nova::Server properties: @@ -61,7 +61,7 @@ resources: flavor: {get_param: ps_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: ps01_port_0} + - port: {get_resource: ps_server_0_mgmt_port_0} user_data_format: {get_attr: [server_pd_01, accessIPv4]} server_ps_02: type: OS::Nova::Server @@ -71,23 +71,23 @@ resources: flavor: {get_param: ps_flavor_name} availability_zone: {get_param: availabilityzone_name} networks: - - port: {get_resource: ps01_port_1} - pd01_port_0: + - port: {get_resource: ps_server_1_mgmt_port_0} + pd_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PD-0 replacement_policy: AUTO - pd01_port_1: + pd_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PD-1 replacement_policy: AUTO - ps01_port_0: + ps_server_0_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PS-0 replacement_policy: AUTO - ps01_port_1: + ps_server_1_mgmt_port_0: type: OS::Neutron::Port properties: network: Network-PS-1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml index 2fb8dca3c6..ee5b626d47 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,16 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,68 +38,58 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_pd01_port_order: - type: integer + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: + type: string required: true status: SUPPORTED - port_pd01_port_subnetpoolid: - type: string + port_pd_server_mgmt_port_0_network: + type: list required: true status: SUPPORTED - port_pd01_port_network_role: + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true status: SUPPORTED - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -115,14 +115,14 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_pd_server_pd01_port: + - dependency_pd_server_pd_server_mgmt_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_pd_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: @@ -158,7 +158,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_pd_server_pd01_port: + network.incoming.bytes.rate_pd_server_pd_server_mgmt_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: @@ -175,19 +175,24 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.bytes_pd_server_pd01_port: + cpu_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_pd_server: + 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. occurrences: - 1 - UNBOUNDED - cpu_util_pd_server: + attachment_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.packets_pd_server_pd_server_mgmt_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: @@ -211,13 +216,13 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes_pd_server_pd01_port: + 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. occurrences: - 1 - UNBOUNDED - disk.iops_pd_server: + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_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: @@ -235,7 +240,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets.rate_pd_server_pd01_port: + network.outpoing.packets_pd_server_pd_server_mgmt_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: @@ -247,6 +252,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outgoing.packets.rate_pd_server_pd_server_mgmt_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: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -264,11 +275,6 @@ 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. @@ -287,6 +293,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED binding_pd_server: type: tosca.capabilities.network.Bindable occurrences: @@ -298,6 +309,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED feature_pd_server: type: tosca.capabilities.Node occurrences: @@ -309,31 +326,25 @@ node_types: 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 - occurrences: - - 0 - - UNBOUNDED - disk.write.bytes_pd_server: + network.incoming.packets.rate_pd_server_pd_server_mgmt_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_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. + binding_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - - 1 + - 0 - UNBOUNDED disk.device.read.requests.rate_pd_server: type: org.openecomp.capabilities.metric.Ceilometer @@ -378,14 +389,14 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outpoing.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_pd_server_pd_server_mgmt_port_0: + type: tosca.capabilities.Node occurrences: - 1 - UNBOUNDED - forwarder_pd_server_pd01_port: - type: org.openecomp.capabilities.Forwarder + network.outgoing.bytes_pd_server_pd_server_mgmt_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 @@ -407,11 +418,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. @@ -430,12 +436,6 @@ 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. - occurrences: - - 1 - - 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. @@ -451,10 +451,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true - status: SUPPORTED compute_ps_server_availability_zone: type: list required: true @@ -475,7 +471,17 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true status: SUPPORTED @@ -485,52 +491,46 @@ node_types: type: string required: true status: SUPPORTED - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true status: SUPPORTED - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true status: SUPPORTED - port_ps01_port_replacement_policy: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_ps_server_mgmt_port_0_order: + type: integer required: true status: SUPPORTED - port_ps01_port_network: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_ps01_port_ip_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true status: SUPPORTED - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true status: SUPPORTED attributes: @@ -552,38 +552,26 @@ node_types: occurrences: - 0 - UNBOUNDED - - dependency_ps_server_ps01_port: + - dependency_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.Node node: tosca.nodes.Root relationship: tosca.relationships.DependsOn occurrences: - 0 - UNBOUNDED - - link_ps_server_ps01_port: + - link_ps_server_ps_server_mgmt_port_0: capability: tosca.capabilities.network.Linkable relationship: tosca.relationships.network.LinksTo occurrences: - 1 - 1 capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED instance_ps_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.outpoing.packets_ps_server_ps01_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 host_ps_server: type: tosca.capabilities.Container valid_source_types: @@ -591,12 +579,6 @@ node_types: occurrences: - 1 - UNBOUNDED - network.incoming.packets_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. - occurrences: - - 1 - - UNBOUNDED cpu.delta_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -609,8 +591,9 @@ node_types: occurrences: - 1 - UNBOUNDED - feature_ps_server_ps01_port: - type: tosca.capabilities.Node + network.incoming.packets.rate_ps_server_ps_server_mgmt_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 @@ -631,6 +614,11 @@ node_types: occurrences: - 1 - UNBOUNDED + feature_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Node + occurrences: + - 1 + - UNBOUNDED cpu_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -643,6 +631,12 @@ node_types: occurrences: - 1 - UNBOUNDED + network.incoming.bytes_ps_server_ps_server_mgmt_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.bytes_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -661,7 +655,7 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.packets.rate_ps_server_ps01_port: + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_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: @@ -673,12 +667,26 @@ node_types: occurrences: - 1 - UNBOUNDED + network.outpoing.packets_ps_server_ps_server_mgmt_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.read.bytes.rate_ps_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 + binding_ps_server_ps_server_mgmt_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 memory_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -702,6 +710,11 @@ node_types: occurrences: - 1 - UNBOUNDED + forwarder_ps_server_ps_server_mgmt_port_0: + type: org.openecomp.capabilities.Forwarder + occurrences: + - 1 + - UNBOUNDED disk.latency_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -738,13 +751,13 @@ node_types: occurrences: - 1 - UNBOUNDED - memory.resident_ps_server: + network.outgoing.packets.rate_ps_server_ps_server_mgmt_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_ps_server_ps01_port: + memory.resident_ps_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: @@ -762,7 +775,18 @@ node_types: occurrences: - 1 - UNBOUNDED - network.outgoing.bytes.rate_ps_server_ps01_port: + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + type: org.openecomp.capabilities.metric.Ceilometer + description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + occurrences: + - 1 + - UNBOUNDED + attachment_ps_server_ps_server_mgmt_port_0: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + network.incoming.bytes.rate_ps_server_ps_server_mgmt_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: @@ -797,11 +821,6 @@ node_types: occurrences: - 1 - UNBOUNDED - attachment_ps_server_ps01_port: - type: tosca.capabilities.Attachment - occurrences: - - 1 - - UNBOUNDED os_ps_server: type: tosca.capabilities.OperatingSystem occurrences: @@ -813,19 +832,6 @@ node_types: occurrences: - 1 - UNBOUNDED - binding_ps_server_ps01_port: - type: tosca.capabilities.network.Bindable - valid_source_types: - - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface - - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface - occurrences: - - 0 - - UNBOUNDED - forwarder_ps_server_ps01_port: - type: org.openecomp.capabilities.Forwarder - occurrences: - - 1 - - UNBOUNDED disk.device.write.bytes.rate_ps_server: type: org.openecomp.capabilities.metric.Ceilometer description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. @@ -850,32 +856,26 @@ node_types: occurrences: - 1 - UNBOUNDED - endpoint_ps_server: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - disk.capacity_ps_server: + network.outgoing.bytes_ps_server_ps_server_mgmt_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_ps_server_ps01_port: - type: org.openecomp.capabilities.metric.Ceilometer - description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. + endpoint_ps_server: + type: tosca.capabilities.Endpoint.Admin occurrences: - 1 - UNBOUNDED - disk.device.allocation_ps_server: + disk.capacity_ps_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.bytes_ps_server_ps01_port: + disk.device.allocation_ps_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
\ 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/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index 78b4cc40d4..53045684e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -139,25 +139,25 @@ topology_template: - get_input: - pd_server_names - 0 - port_pd01_port_replacement_policy: - - AUTO - - AUTO - vm_flavor_name: - get_input: pd_flavor_name - port_pd01_port_mac_requirements: + port_pd_server_mgmt_port_0_mac_requirements: mac_count_required: is_required: false + vm_flavor_name: + get_input: pd_flavor_name + port_pd_server_mgmt_port_0_replacement_policy: + - AUTO + - AUTO vm_image_name: get_input: pd_image_name - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_network: + - Network-PD-1 + - Network-PD-0 + port_pd_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false floating_ip_count_required: is_required: false - port_pd01_port_network: - - Network-PD-1 - - Network-PD-0 compute_pd_server_user_data_format: - null - get_attribute: @@ -191,20 +191,20 @@ topology_template: - abstract_pd_server - pd_server_accessIPv4 - null + port_ps_server_mgmt_port_0_network: + - Network-PS-0 + - Network-PS-1 + port_ps_server_mgmt_port_0_mac_requirements: + mac_count_required: + is_required: false vm_flavor_name: get_input: ps_flavor_name - vm_image_name: - get_input: ps_image_name - port_ps01_port_replacement_policy: + port_ps_server_mgmt_port_0_replacement_policy: - AUTO - AUTO - port_ps01_port_mac_requirements: - mac_count_required: - is_required: false - port_ps01_port_network: - - Network-PS-0 - - Network-PS-1 - port_ps01_port_ip_requirements: + vm_image_name: + get_input: ps_image_name + port_ps_server_mgmt_port_0_ip_requirements: - ip_version: 4 ip_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml index 520dd11d47..453cef9980 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,14 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pd_server_mgmt_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true index_value: type: integer description: Index value of this substitution service template runtime instance @@ -28,55 +36,47 @@ topology_template: required: true entry_schema: type: string - port_pd01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_pd01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_pd_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pd01_port_related_networks: - type: list + port_pd_server_mgmt_port_0_subnetpoolid: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_pd01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - vm_image_name: - type: string + port_pd_server_mgmt_port_0_order: + type: integer required: true - port_pd01_port_ip_requirements: + port_pd_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pd01_port_network: + type: string + port_pd_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: - type: string - port_pd01_port_order: - type: integer - required: true - port_pd01_port_subnetpoolid: + type: org.openecomp.datatypes.network.VlanRequirements + vm_image_name: type: string required: true - port_pd01_port_network_role: + port_pd_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_pd_server_mgmt_port_0_network_role: type: string required: true - port_pd01_port_network_role_tag: + port_pd_server_mgmt_port_0_network_role_tag: type: string required: true - port_pd01_port_vlan_requirements: + port_pd_server_mgmt_port_0_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 @@ -102,35 +102,35 @@ topology_template: get_input: - compute_pd_server_user_data_format - index_value - pd_server_pd01_port: + pd_server_pd_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_pd01_port_replacement_policy + - port_pd_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_pd01_port_mac_requirements + get_input: port_pd_server_mgmt_port_0_mac_requirements order: - get_input: port_pd01_port_order + get_input: port_pd_server_mgmt_port_0_order exCP_naming: - get_input: port_pd01_port_exCP_naming + get_input: port_pd_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_pd01_port_vlan_requirements + get_input: port_pd_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_pd01_port_ip_requirements + get_input: port_pd_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_pd01_port_related_networks + get_input: port_pd_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_pd01_port_network_role_tag + get_input: port_pd_server_mgmt_port_0_network_role_tag network_role: - get_input: port_pd01_port_network_role + get_input: port_pd_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_pd01_port_subnetpoolid + get_input: port_pd_server_mgmt_port_0_subnetpoolid network: get_input: - - port_pd01_port_network + - port_pd_server_mgmt_port_0_network - index_value requirements: - binding: @@ -162,24 +162,27 @@ 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.incoming.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes.rate 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 cpu_pd_server: - pd_server - cpu cpu_util_pd_server: - pd_server - cpu_util + attachment_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - attachment + network.incoming.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets disk.device.write.requests.rate_pd_server: - pd_server - disk.device.write.requests.rate @@ -189,24 +192,27 @@ 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 + network.outgoing.bytes.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes.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 + network.outpoing.packets_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outpoing.packets vcpus_pd_server: - pd_server - vcpus + network.outgoing.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.packets.rate disk.device.write.bytes.rate_pd_server: - pd_server - disk.device.write.bytes.rate @@ -216,9 +222,6 @@ topology_template: endpoint_pd_server: - pd_server - endpoint - attachment_pd_server_pd01_port: - - pd_server_pd01_port - - attachment disk.capacity_pd_server: - pd_server - disk.capacity @@ -228,30 +231,33 @@ topology_template: disk.allocation_pd_server: - pd_server - disk.allocation + forwarder_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - forwarder binding_pd_server: - pd_server - binding disk.read.requests_pd_server: - pd_server - disk.read.requests + network.incoming.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.bytes feature_pd_server: - pd_server - feature disk.usage_pd_server: - pd_server - disk.usage - binding_pd_server_pd01_port: - - pd_server_pd01_port - - binding + network.incoming.packets.rate_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.incoming.packets.rate 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 + binding_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - binding disk.device.read.requests.rate_pd_server: - pd_server - disk.device.read.requests.rate @@ -273,12 +279,12 @@ 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 + feature_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - feature + network.outgoing.bytes_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - network.outgoing.bytes disk.write.requests.rate_pd_server: - pd_server - disk.write.requests.rate @@ -288,9 +294,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 @@ -300,9 +303,6 @@ 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 disk.device.iops_pd_server: - pd_server - disk.device.iops @@ -310,12 +310,12 @@ topology_template: local_storage_pd_server: - pd_server - local_storage - link_pd_server_pd01_port: - - pd_server_pd01_port + link_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 - link - dependency_pd_server_pd01_port: - - pd_server_pd01_port - - dependency dependency_pd_server: - pd_server - - dependency
\ No newline at end of file + - dependency + dependency_pd_server_pd_server_mgmt_port_0: + - pd_server_pd_server_mgmt_port_0 + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml index 1a9e52500e..31c2a274c4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/Nested_ps_serverServiceTemplate.yaml @@ -16,9 +16,6 @@ topology_template: required: true entry_schema: type: string - port_ps01_port_subnetpoolid: - type: string - required: true compute_ps_server_availability_zone: type: list required: true @@ -36,7 +33,15 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 - port_ps01_port_vlan_requirements: + port_ps_server_mgmt_port_0_network: + type: list + required: true + entry_schema: + type: string + port_ps_server_mgmt_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_ps_server_mgmt_port_0_vlan_requirements: type: list required: true entry_schema: @@ -44,43 +49,38 @@ topology_template: vm_flavor_name: type: string required: true - port_ps01_port_related_networks: + port_ps_server_mgmt_port_0_replacement_policy: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.RelatedNetworksAssignments - port_ps01_port_order: - type: integer + type: string + port_ps_server_mgmt_port_0_related_networks: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true - port_ps01_port_network_role: + port_ps_server_mgmt_port_0_network_role: type: string required: true - port_ps01_port_replacement_policy: - type: list - required: true - entry_schema: - type: string - port_ps01_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_ps01_port_network: - type: list + port_ps_server_mgmt_port_0_order: + type: integer required: true - entry_schema: - type: string - port_ps01_port_ip_requirements: + port_ps_server_mgmt_port_0_ip_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_ps01_port_network_role_tag: + port_ps_server_mgmt_port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_ps_server_mgmt_port_0_subnetpoolid: type: string required: true - port_ps01_port_exCP_naming: - type: org.openecomp.datatypes.Naming + port_ps_server_mgmt_port_0_network_role_tag: + type: string required: true node_templates: ps_server: @@ -102,35 +102,35 @@ topology_template: get_input: - compute_ps_server_user_data_format - index_value - ps_server_ps01_port: + ps_server_ps_server_mgmt_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: replacement_policy: get_input: - - port_ps01_port_replacement_policy + - port_ps_server_mgmt_port_0_replacement_policy - index_value mac_requirements: - get_input: port_ps01_port_mac_requirements + get_input: port_ps_server_mgmt_port_0_mac_requirements order: - get_input: port_ps01_port_order + get_input: port_ps_server_mgmt_port_0_order exCP_naming: - get_input: port_ps01_port_exCP_naming + get_input: port_ps_server_mgmt_port_0_exCP_naming vlan_requirements: - get_input: port_ps01_port_vlan_requirements + get_input: port_ps_server_mgmt_port_0_vlan_requirements subinterface_indicator: false ip_requirements: - get_input: port_ps01_port_ip_requirements + get_input: port_ps_server_mgmt_port_0_ip_requirements related_networks: - get_input: port_ps01_port_related_networks + get_input: port_ps_server_mgmt_port_0_related_networks network_role_tag: - get_input: port_ps01_port_network_role_tag + get_input: port_ps_server_mgmt_port_0_network_role_tag network_role: - get_input: port_ps01_port_network_role + get_input: port_ps_server_mgmt_port_0_network_role subnetpoolid: - get_input: port_ps01_port_subnetpoolid + get_input: port_ps_server_mgmt_port_0_subnetpoolid network: get_input: - - port_ps01_port_network + - port_ps_server_mgmt_port_0_network - index_value requirements: - binding: @@ -147,30 +147,21 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.ps_server capabilities: - network.incoming.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets.rate instance_ps_server: - ps_server - instance - network.outpoing.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.outpoing.packets host_ps_server: - ps_server - host - network.incoming.packets_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.packets cpu.delta_ps_server: - ps_server - cpu.delta disk.write.bytes.rate_ps_server: - ps_server - disk.write.bytes.rate - feature_ps_server_ps01_port: - - ps_server_ps01_port - - feature + network.incoming.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets.rate feature_ps_server: - ps_server - feature @@ -180,12 +171,18 @@ topology_template: disk.device.read.requests.rate_ps_server: - ps_server - disk.device.read.requests.rate + feature_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - feature cpu_ps_server: - ps_server - cpu disk.device.write.bytes_ps_server: - ps_server - disk.device.write.bytes + network.incoming.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes disk.device.read.bytes_ps_server: - ps_server - disk.device.read.bytes @@ -195,15 +192,21 @@ topology_template: disk.device.iops_ps_server: - ps_server - disk.device.iops - network.outgoing.packets.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.packets.rate + network.outgoing.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes.rate disk.device.latency_ps_server: - ps_server - disk.device.latency + network.outpoing.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outpoing.packets disk.read.bytes.rate_ps_server: - ps_server - disk.read.bytes.rate + binding_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - binding memory_ps_server: - ps_server - memory @@ -216,6 +219,9 @@ topology_template: disk.write.requests_ps_server: - ps_server - disk.write.requests + forwarder_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - forwarder disk.latency_ps_server: - ps_server - disk.latency @@ -234,21 +240,27 @@ topology_template: cpu_util_ps_server: - ps_server - cpu_util + network.outgoing.packets.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.packets.rate memory.resident_ps_server: - ps_server - memory.resident - network.incoming.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes disk.device.read.requests_ps_server: - ps_server - disk.device.read.requests disk.write.bytes_ps_server: - ps_server - disk.write.bytes - network.outgoing.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes.rate + network.incoming.packets_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.packets + attachment_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - attachment + network.incoming.bytes.rate_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.incoming.bytes.rate disk.device.write.requests.rate_ps_server: - ps_server - disk.device.write.requests.rate @@ -264,21 +276,12 @@ topology_template: binding_ps_server: - ps_server - binding - attachment_ps_server_ps01_port: - - ps_server_ps01_port - - attachment os_ps_server: - ps_server - os disk.device.usage_ps_server: - ps_server - disk.device.usage - binding_ps_server_ps01_port: - - ps_server_ps01_port - - binding - forwarder_ps_server_ps01_port: - - ps_server_ps01_port - - forwarder disk.device.write.bytes.rate_ps_server: - ps_server - disk.device.write.bytes.rate @@ -291,31 +294,28 @@ topology_template: disk.device.write.requests_ps_server: - ps_server - disk.device.write.requests + network.outgoing.bytes_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - network.outgoing.bytes endpoint_ps_server: - ps_server - endpoint disk.capacity_ps_server: - ps_server - disk.capacity - network.incoming.bytes.rate_ps_server_ps01_port: - - ps_server_ps01_port - - network.incoming.bytes.rate disk.device.allocation_ps_server: - ps_server - disk.device.allocation - network.outgoing.bytes_ps_server_ps01_port: - - ps_server_ps01_port - - network.outgoing.bytes requirements: dependency_ps_server: - ps_server - dependency - link_ps_server_ps01_port: - - ps_server_ps01_port - - link - dependency_ps_server_ps01_port: - - ps_server_ps01_port + dependency_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 - dependency + link_ps_server_ps_server_mgmt_port_0: + - ps_server_ps_server_mgmt_port_0 + - link local_storage_ps_server: - ps_server - - local_storage
\ No newline at end of file + - local_storage |