diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml')
1 files changed, 149 insertions, 149 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 0fbb5e3cd9..f6d3eae817 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -11,39 +11,44 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_pcm_port_0_network_role: - type: string + port_pcm_port_02_order: + type: integer required: true - port_pcm_port_1_network_role_tag: - type: string + port_pcm_port_12_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_port_02_vlan_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name - port_pcm_port_0_vlan_requirements: - type: list + port_pcm_port_12_order: + type: integer + required: true + port_pcm_port_02_network_role: + type: string required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false immutable: false type: string description: PCRF CM image name - port_pcm_port_0_order: - type: integer - required: true - port_pcm_port_0_subnetpoolid: + port_pcm_port_02_network_role_tag: type: string required: true - port_pcm_port_1_subnetpoolid: - type: string + port_pcm_port_12_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - port_pcm_port_0_network_role_tag: + port_pcm_port_02_subnetpoolid: type: string required: true pcm_server_name: @@ -58,26 +63,18 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_pcm_port_0_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true oam_net_name: label: OAM network name hidden: false immutable: false type: string description: OAM network name - port_pcm_port_1_network_role: + port_pcm_port_12_network_role: type: string required: true - port_pcm_port_0_ip_requirements: - type: list + port_pcm_port_02_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false @@ -96,33 +93,28 @@ topology_template: immutable: false type: string description: CPS network ip - port_pcm_port_1_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - port_pcm_port_1_vlan_requirements: + port_pcm_port_12_ip_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_12_subnetpoolid: + type: string + required: true pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_port_1_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_pcm_port_0_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_pcm_port_02_exCP_naming: + type: org.openecomp.datatypes.Naming required: true cps_net_name: label: CPS network name @@ -142,80 +134,88 @@ topology_template: immutable: false type: string description: CPS network mask - port_pcm_port_1_order: - type: integer + port_pcm_port_12_network_role_tag: + type: string + required: true + port_pcm_port_12_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_pcm_port_02_ip_requirements: + type: list required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: - pcm_port_1: + server_pcm: + type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server + properties: + flavor: + get_input: pcm_flavor_name + availability_zone: + get_input: availabilityzone_name + image: + get_input: pcm_image_name + config_drive: true + user_data_format: RAW + name: + get_input: pcm_server_name + pcm_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_1_ip_requirements + get_input: port_pcm_port_12_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_1_network_role + get_input: port_pcm_port_12_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid + get_input: port_pcm_port_12_subnetpoolid mac_requirements: - get_input: port_pcm_port_1_mac_requirements + get_input: port_pcm_port_12_mac_requirements exCP_naming: - get_input: port_pcm_port_1_exCP_naming + get_input: port_pcm_port_12_exCP_naming vlan_requirements: - get_input: port_pcm_port_1_vlan_requirements + get_input: port_pcm_port_12_vlan_requirements network_role_tag: - get_input: port_pcm_port_1_network_role_tag + get_input: port_pcm_port_12_network_role_tag network: get_input: oam_net_name order: - get_input: port_pcm_port_1_order + get_input: port_pcm_port_12_order requirements: - binding: capability: tosca.capabilities.network.Bindable node: server_pcm relationship: tosca.relationships.network.BindsTo - server_pcm: - type: org.openecomp.resource.vfc.compute.nodes.heat.pcm_server - properties: - flavor: - get_input: pcm_flavor_name - availability_zone: - get_input: availabilityzone_name - image: - get_input: pcm_image_name - config_drive: true - user_data_format: RAW - name: - get_input: pcm_server_name - pcm_port_0: + pcm_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - get_input: port_pcm_port_0_ip_requirements + get_input: port_pcm_port_02_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: port_pcm_port_0_network_role + get_input: port_pcm_port_02_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid + get_input: port_pcm_port_02_subnetpoolid mac_requirements: - get_input: port_pcm_port_0_mac_requirements + get_input: port_pcm_port_02_mac_requirements exCP_naming: - get_input: port_pcm_port_0_exCP_naming + get_input: port_pcm_port_02_exCP_naming vlan_requirements: - get_input: port_pcm_port_0_vlan_requirements + get_input: port_pcm_port_02_vlan_requirements network_role_tag: - get_input: port_pcm_port_0_network_role_tag + get_input: port_pcm_port_02_network_role_tag network: get_input: cps_net_name order: - get_input: port_pcm_port_0_order + get_input: port_pcm_port_02_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -228,9 +228,9 @@ topology_template: heat_file: ../Artifacts/nested-pcm_v0.2.yaml description: heat template that creates PCRF Cluman stack members: - - pcm_port_1 - server_pcm - - pcm_port_0 + - pcm_port_12 + - pcm_port_02 outputs: server_pcm_id: description: the pcm nova service id @@ -238,27 +238,24 @@ topology_template: substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.pcm_server capabilities: - network.incoming.packets.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.packets.rate cpu_server_pcm: - server_pcm - cpu - network.incoming.packets.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.packets.rate - network.outpoing.packets_pcm_port_1: - - pcm_port_1 - - network.outpoing.packets memory_server_pcm: - server_pcm - memory disk.write.requests_server_pcm: - server_pcm - disk.write.requests - network.outpoing.packets_pcm_port_0: - - pcm_port_0 - - network.outpoing.packets + network.incoming.packets_pcm_port_02: + - pcm_port_02 + - network.incoming.packets + feature_pcm_port_02: + - pcm_port_02 + - feature + network.outgoing.bytes_pcm_port_12: + - pcm_port_12 + - network.outgoing.bytes disk.device.iops_server_pcm: - server_pcm - disk.device.iops @@ -268,42 +265,48 @@ topology_template: disk.device.write.requests_server_pcm: - server_pcm - disk.device.write.requests + network.incoming.bytes_pcm_port_02: + - pcm_port_02 + - network.incoming.bytes disk.device.usage_server_pcm: - server_pcm - disk.device.usage disk.allocation_server_pcm: - server_pcm - disk.allocation + network.incoming.bytes.rate_pcm_port_12: + - pcm_port_12 + - network.incoming.bytes.rate disk.usage_server_pcm: - server_pcm - disk.usage disk.device.write.bytes_server_pcm: - server_pcm - disk.device.write.bytes + attachment_pcm_port_02: + - pcm_port_02 + - attachment disk.root.size_server_pcm: - server_pcm - disk.root.size + feature_pcm_port_12: + - pcm_port_12 + - feature disk.ephemeral.size_server_pcm: - server_pcm - disk.ephemeral.size disk.device.latency_server_pcm: - server_pcm - disk.device.latency - network.incoming.bytes_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes - network.incoming.bytes_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes - binding_pcm_port_0: - - pcm_port_0 - - binding - binding_pcm_port_1: - - pcm_port_1 - - binding + network.outgoing.packets.rate_pcm_port_02: + - pcm_port_02 + - network.outgoing.packets.rate memory.usage_server_pcm: - server_pcm - memory.usage + network.outgoing.bytes_pcm_port_02: + - pcm_port_02 + - network.outgoing.bytes disk.read.requests_server_pcm: - server_pcm - disk.read.requests @@ -316,45 +319,39 @@ topology_template: disk.read.bytes_server_pcm: - server_pcm - disk.read.bytes - network.outgoing.packets.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.packets.rate - network.outgoing.packets.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.packets.rate - feature_pcm_port_1: - - pcm_port_1 - - feature - network.outgoing.bytes_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes disk.device.read.bytes_server_pcm: - server_pcm - disk.device.read.bytes - feature_pcm_port_0: - - pcm_port_0 - - feature - network.outgoing.bytes_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes - attachment_pcm_port_0: - - pcm_port_0 - - attachment - attachment_pcm_port_1: - - pcm_port_1 - - attachment + network.outgoing.bytes.rate_pcm_port_12: + - pcm_port_12 + - network.outgoing.bytes.rate + network.incoming.packets.rate_pcm_port_12: + - pcm_port_12 + - network.incoming.packets.rate + binding_pcm_port_12: + - pcm_port_12 + - binding endpoint_server_pcm: - server_pcm - endpoint + network.incoming.bytes.rate_pcm_port_02: + - pcm_port_02 + - network.incoming.bytes.rate disk.device.read.requests.rate_server_pcm: - server_pcm - disk.device.read.requests.rate + attachment_pcm_port_12: + - pcm_port_12 + - attachment vcpus_server_pcm: - server_pcm - vcpus disk.write.bytes_server_pcm: - server_pcm - disk.write.bytes + network.outgoing.packets.rate_pcm_port_12: + - pcm_port_12 + - network.outgoing.packets.rate disk.iops_server_pcm: - server_pcm - disk.iops @@ -373,9 +370,21 @@ topology_template: cpu_util_server_pcm: - server_pcm - cpu_util + network.outgoing.bytes.rate_pcm_port_02: + - pcm_port_02 + - network.outgoing.bytes.rate + network.outpoing.packets_pcm_port_12: + - pcm_port_12 + - network.outpoing.packets + network.incoming.packets.rate_pcm_port_02: + - pcm_port_02 + - network.incoming.packets.rate disk.write.requests.rate_server_pcm: - server_pcm - disk.write.requests.rate + binding_pcm_port_02: + - pcm_port_02 + - binding disk.device.write.bytes.rate_server_pcm: - server_pcm - disk.device.write.bytes.rate @@ -385,24 +394,15 @@ topology_template: cpu.delta_server_pcm: - server_pcm - cpu.delta - network.outgoing.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.outgoing.bytes.rate - network.incoming.packets_pcm_port_0: - - pcm_port_0 + network.incoming.packets_pcm_port_12: + - pcm_port_12 - network.incoming.packets binding_server_pcm: - server_pcm - binding - network.outgoing.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.outgoing.bytes.rate disk.device.capacity_server_pcm: - server_pcm - disk.device.capacity - network.incoming.packets_pcm_port_1: - - pcm_port_1 - - network.incoming.packets instance_server_pcm: - server_pcm - instance @@ -415,34 +415,34 @@ topology_template: disk.device.read.requests_server_pcm: - server_pcm - disk.device.read.requests + network.incoming.bytes_pcm_port_12: + - pcm_port_12 + - network.incoming.bytes feature_server_pcm: - server_pcm - feature - network.incoming.bytes.rate_pcm_port_0: - - pcm_port_0 - - network.incoming.bytes.rate + network.outpoing.packets_pcm_port_02: + - pcm_port_02 + - network.outpoing.packets disk.write.bytes.rate_server_pcm: - server_pcm - disk.write.bytes.rate - network.incoming.bytes.rate_pcm_port_1: - - pcm_port_1 - - network.incoming.bytes.rate requirements: - link_pcm_port_0: - - pcm_port_0 - - link - link_pcm_port_1: - - pcm_port_1 - - link + dependency_pcm_port_02: + - pcm_port_02 + - dependency local_storage_server_pcm: - server_pcm - local_storage - dependency_pcm_port_0: - - pcm_port_0 + dependency_pcm_port_12: + - pcm_port_12 - dependency + link_pcm_port_12: + - pcm_port_12 + - link dependency_server_pcm: - server_pcm - dependency - dependency_pcm_port_1: - - pcm_port_1 - - dependency + link_pcm_port_02: + - pcm_port_02 + - link
\ No newline at end of file |