diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out')
4 files changed, 178 insertions, 136 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 670f8d23ae..4214d0dd3f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,102 +8,135 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_1port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements availabilityzone_name: type: string description: availabilityzone name required: true status: SUPPORTED - port_pcm_2port_1_network_role: + port_pcm_1port_0_network_role_tag: type: list required: true status: SUPPORTED entry_schema: type: string - oam_net_gw: - type: string - description: CPS network gateway - required: true - status: SUPPORTED pcm_image_name: type: string description: PCRF CM image name required: true status: SUPPORTED - port_pcm_1port_0_network_role: + port_pcm_1port_0_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - port_pcm_1port_0_subnetpoolid: + port_pcm_1port_0_order: + type: list + required: true + status: SUPPORTED + entry_schema: + type: integer + port_pcm_2port_1_subnetpoolid: type: list required: true status: SUPPORTED entry_schema: type: string - security_group_name: - type: string - description: the name of security group + port_pcm_2port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_pcm_1port_0_order: + port_pcm_1port_0_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: integer - cps_net_ip: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_1port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + pcm_server_name: type: string - description: CPS network ip + description: PCRF CM server name required: true status: SUPPORTED - port_pcm_2port_1_subnetpoolid: + cps_net_mask: + type: string + description: CPS network mask + required: true + status: SUPPORTED + oam_net_name: + type: string + description: OAM network name + required: true + status: SUPPORTED + port_pcm_1port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_pcm_2port_1_network_role: type: list required: true status: SUPPORTED entry_schema: type: string - pcm_flavor_name: + oam_net_gw: type: string - description: flavor name of PCRF CM instance + description: CPS network gateway required: true status: SUPPORTED - port_pcm_2port_1_exCP_naming: + port_pcm_1port_0_network_role: type: list required: true status: SUPPORTED entry_schema: - type: json - pcm_vol: + type: string + port_pcm_2port_1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + security_group_name: type: string - description: CPS Cluman Cinder Volume + description: the name of security group required: true status: SUPPORTED - port_pcm_1port_0_vlan_requirements: - type: list + cps_net_ip: + type: string + description: CPS network ip required: true status: SUPPORTED - entry_schema: - type: json - port_pcm_1port_0_exCP_naming: + port_pcm_2port_1_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - pcm_server_name: + type: org.openecomp.datatypes.network.IpRequirements + pcm_flavor_name: type: string - description: PCRF CM server name + description: flavor name of PCRF CM instance required: true status: SUPPORTED - cps_net_name: + port_pcm_2port_1_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + pcm_vol: type: string - description: CPS network name + description: CPS Cluman Cinder Volume required: true status: SUPPORTED - cps_net_mask: + cps_net_name: type: string - description: CPS network mask + description: CPS network name required: true status: SUPPORTED oam_net_ip: @@ -116,11 +149,6 @@ node_types: description: CPS network mask required: true status: SUPPORTED - oam_net_name: - type: string - description: OAM network name - required: true - status: SUPPORTED port_pcm_2port_1_order: type: list required: true @@ -132,7 +160,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements attributes: server_pcm_id: type: string @@ -852,4 +880,4 @@ node_types: type: tosca.capabilities.network.Bindable 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/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml index 03d069f43d..0aea357dee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml @@ -125,18 +125,38 @@ topology_template: directives: - substitutable properties: + port_pcm_1port_0_mac_requirements: + mac_count_required: + is_required: false + port_pcm_1port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false availabilityzone_name: get_input: availabilityzone_name + port_pcm_1port_0_network_role_tag: cps oam_net_gw: get_input: oam_net_gw pcm_image_name: get_input: pcm_image_name + port_pcm_2port_1_network_role_tag: oam security_group_name: get_input: security_group_name cps_net_ip: get_input: - cps_net_ips - 0 + port_pcm_2port_1_mac_requirements: + mac_count_required: + is_required: false + port_pcm_2port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false pcm_flavor_name: get_input: pcm_flavor_name service_template_filter: @@ -240,4 +260,4 @@ topology_template: - packet_mirror_network - compute_port_0 - abstract_compute - - abstract_pcm_server_0
\ No newline at end of file + - abstract_pcm_server_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/Nested_computeServiceTemplate.yaml index 22bdef3d42..cd2a098c90 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/Nested_computeServiceTemplate.yaml @@ -200,4 +200,4 @@ topology_template: - local_storage dependency_compute: - compute - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml index ad1fe6a24e..017b37cd78 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,12 +11,75 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_1port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements availabilityzone_name: label: availabilityzone name hidden: false immutable: false type: string description: availabilityzone name + port_pcm_1port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string + pcm_image_name: + label: image name + hidden: false + immutable: false + type: string + description: PCRF CM image name + port_pcm_1port_0_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pcm_1port_0_order: + type: list + required: true + entry_schema: + type: integer + port_pcm_2port_1_subnetpoolid: + type: list + required: true + entry_schema: + type: string + port_pcm_2port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_pcm_1port_0_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_pcm_1port_0_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + pcm_server_name: + label: PCRF CM server name + hidden: false + immutable: false + type: string + description: PCRF CM server name + cps_net_mask: + label: CPS network mask + hidden: false + immutable: false + type: string + description: CPS network mask + oam_net_name: + label: OAM network name + hidden: false + immutable: false + type: string + description: OAM network name + port_pcm_1port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true port_pcm_2port_1_network_role: type: list required: true @@ -28,18 +91,12 @@ topology_template: immutable: false type: string description: CPS network gateway - pcm_image_name: - label: image name - hidden: false - immutable: false - type: string - description: PCRF CM image name port_pcm_1port_0_network_role: type: list required: true entry_schema: type: string - port_pcm_1port_0_subnetpoolid: + port_pcm_2port_1_network_role_tag: type: list required: true entry_schema: @@ -50,22 +107,17 @@ topology_template: immutable: false type: string description: the name of security group - port_pcm_1port_0_order: - type: list - required: true - entry_schema: - type: integer cps_net_ip: label: CPS network ip hidden: false immutable: false type: string description: CPS network ip - port_pcm_2port_1_subnetpoolid: + port_pcm_2port_1_ip_requirements: type: list required: true entry_schema: - type: string + type: org.openecomp.datatypes.network.IpRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false @@ -73,44 +125,20 @@ topology_template: type: string description: flavor name of PCRF CM instance port_pcm_2port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json pcm_vol: label: CPS Cluman Cinder Volume hidden: false immutable: false type: string description: CPS Cluman Cinder Volume - port_pcm_1port_0_vlan_requirements: - type: list - required: true - entry_schema: - type: json - port_pcm_1port_0_exCP_naming: - type: list - required: true - entry_schema: - type: json - pcm_server_name: - label: PCRF CM server name - hidden: false - immutable: false - type: string - description: PCRF CM server name cps_net_name: label: CPS network name hidden: false immutable: false type: string description: CPS network name - cps_net_mask: - label: CPS network mask - hidden: false - immutable: false - type: string - description: CPS network mask oam_net_ip: label: OAM network ip hidden: false @@ -123,12 +151,6 @@ topology_template: immutable: false type: string description: CPS network mask - oam_net_name: - label: OAM network name - hidden: false - immutable: false - type: string - description: OAM network name port_pcm_2port_1_order: type: list required: true @@ -138,7 +160,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements node_templates: server_pcm: type: org.openecomp.resource.vfc.nodes.heat.pcm_server @@ -157,42 +179,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_1port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_1port_0_network_role - - index_value + get_input: port_pcm_1port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_1port_0_subnetpoolid - - index_value + get_input: port_pcm_1port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_1port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_1port_0_exCP_naming - - index_value + get_input: port_pcm_1port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_1port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_1port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_1port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_1port_0_order - - index_value + get_input: port_pcm_1port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -202,42 +210,28 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false + get_input: port_pcm_2port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_2port_1_network_role - - index_value + get_input: port_pcm_2port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_2port_1_subnetpoolid - - index_value + get_input: port_pcm_2port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_2port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_2port_1_exCP_naming - - index_value + get_input: port_pcm_2port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_2port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_2port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_2port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_2port_1_order - - index_value + get_input: port_pcm_2port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -467,4 +461,4 @@ topology_template: - dependency link_pcm_2port_1: - pcm_2port_1 - - link
\ No newline at end of file + - link |