From 68ccc45de18f41cddb79de33a245bceb3b063ffb Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 22 Jun 2017 18:23:07 +0300 Subject: [sdc] - latest code changes Change-Id: I861387094b000367218bb417624fe50d3c37f70e Signed-off-by: Tal Gitelman --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 64 +++++++++---- .../out/MainServiceTemplate.yaml | 48 +++++++--- .../out/Nested_pd_serverServiceTemplate.yaml | 60 ++++-------- .../out/nested-pcm_v0.1ServiceTemplate.yaml | 104 ++++++++++----------- 4 files changed, 150 insertions(+), 126 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4ecc127055..fb81c9e7ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -33,11 +33,9 @@ node_types: required: true status: SUPPORTED port_pd01_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -55,9 +53,11 @@ node_types: entry_schema: type: string port_pd02_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -67,7 +67,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true @@ -103,11 +103,9 @@ node_types: entry_schema: type: string port_pd02_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pd01_port_network_role: type: list required: true @@ -121,15 +119,17 @@ node_types: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: string + type: list required: true status: SUPPORTED + entry_schema: + type: string port_pd01_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true @@ -565,6 +565,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string availabilityzone_name: type: string description: availabilityzone name @@ -575,7 +581,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: type: string description: PCRF CM image name @@ -604,6 +610,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string pcm_server_name: type: string description: PCRF CM server name @@ -615,17 +627,13 @@ node_types: required: true status: SUPPORTED port_pcm_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json port_pcm_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: json oam_net_name: type: string description: OAM network name @@ -637,6 +645,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pcm_port_0_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: type: string description: CPS network gateway @@ -652,6 +666,10 @@ node_types: description: CPS network ip required: true status: SUPPORTED + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED pcm_volumes: type: string description: CPS Cluman Cinder Volume @@ -662,7 +680,7 @@ node_types: required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: type: string description: flavor name of PCRF CM instance @@ -673,6 +691,16 @@ node_types: description: CPS Cluman Cinder Volume required: true status: SUPPORTED + port_pcm_port_1_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_pcm_port_0_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED cps_net_name: type: string description: CPS network name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index 726b8dd8ae..1da54ccd72 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -426,10 +426,30 @@ topology_template: properties: service_template_filter: substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml + port_pcm_port_1_network_role_tag: oam availabilityzone_name: get_input: availabilityzone_name + port_pcm_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false security_group_name: get_input: security_group_name + port_pcm_port_1_mac_requirements: + mac_count_required: + is_required: false + port_pcm_port_1_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_pcm_port_0_network_role_tag: cps + port_pcm_port_0_mac_requirements: + mac_count_required: + is_required: false abstract_pd_server: type: org.openecomp.resource.abstract.nodes.pd_server directives: @@ -446,27 +466,29 @@ topology_template: is_required: false vm_flavor_name: get_input: pd_flavor_name - port_pd02_port_network_role_tag: oam + port_pd02_port_network_role_tag: + - oam port_pd01_port_mac_requirements: mac_count_required: is_required: false vm_image_name: get_input: pd_image_name port_pd01_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: - - - ip_version: 4 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false - port_pd01_port_network_role_tag: oam + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + port_pd01_port_network_role_tag: + - oam port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -487,4 +509,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_pcm_server_0 + - abstract_pcm_server_0 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml index 8a9b737df1..f66e9f46ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/Nested_pd_serverServiceTemplate.yaml @@ -32,10 +32,8 @@ topology_template: type: org.openecomp.datatypes.network.MacRequirements required: true port_pd01_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json vm_flavor_name: type: string required: true @@ -50,8 +48,10 @@ topology_template: entry_schema: type: string port_pd02_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_pd01_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -59,7 +59,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true @@ -89,10 +89,8 @@ topology_template: entry_schema: type: string port_pd02_port_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pd01_port_network_role: type: list required: true @@ -104,13 +102,15 @@ topology_template: entry_schema: type: org.openecomp.datatypes.network.IpRequirements port_pd01_port_network_role_tag: - type: string + type: list required: true + entry_schema: + type: string port_pd01_port_vlan_requirements: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements port_pd02_port_network: type: list required: true @@ -145,13 +145,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_pd01_port_exCP_naming - - index_value + get_input: port_pd01_port_exCP_naming vlan_requirements: - get_input: - - port_pd01_port_vlan_requirements - - index_value + get_input: port_pd01_port_vlan_requirements ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -159,17 +155,11 @@ topology_template: mac_requirements: get_input: port_pd01_port_mac_requirements order: - get_input: - - port_pd01_port_order - - index_value + get_input: port_pd01_port_order network_role: - get_input: - - port_pd01_port_network_role - - index_value + get_input: port_pd01_port_network_role subnetpoolid: - get_input: - - port_pd01_port_subnetpoolid - - index_value + get_input: port_pd01_port_subnetpoolid network: get_input: - port_pd01_port_network @@ -183,13 +173,9 @@ topology_template: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: exCP_naming: - get_input: - - port_pd02_port_exCP_naming - - index_value + get_input: port_pd02_port_exCP_naming vlan_requirements: - get_input: - - port_pd02_port_vlan_requirements - - index_value + get_input: port_pd02_port_vlan_requirements ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: @@ -197,17 +183,11 @@ topology_template: mac_requirements: get_input: port_pd02_port_mac_requirements order: - get_input: - - port_pd02_port_order - - index_value + get_input: port_pd02_port_order network_role: - get_input: - - port_pd02_port_network_role - - index_value + get_input: port_pd02_port_network_role subnetpoolid: - get_input: - - port_pd02_port_subnetpoolid - - index_value + get_input: port_pd02_port_subnetpoolid network: get_input: - port_pd02_port_network diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/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/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml index 8d7c6bd66a..5530999168 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/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/singleSubstitution/computewithtwodiffporttypesandnested/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -16,6 +16,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_1_network_role_tag: + type: list + required: true + entry_schema: + type: string availabilityzone_name: label: availabilityzone name hidden: false @@ -26,7 +31,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_image_name: label: image name hidden: false @@ -54,6 +59,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_0_network_role_tag: + type: list + required: true + entry_schema: + type: string pcm_server_name: label: PCRF CM server name hidden: false @@ -67,15 +77,11 @@ topology_template: type: string description: CPS network mask port_pcm_port_1_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json port_pcm_port_0_exCP_naming: - type: list + type: org.openecomp.datatypes.Naming required: true - entry_schema: - type: json oam_net_name: label: OAM network name hidden: false @@ -87,6 +93,11 @@ topology_template: required: true entry_schema: type: string + port_pcm_port_0_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements oam_net_gw: label: CPS network gateway hidden: false @@ -105,6 +116,9 @@ topology_template: immutable: false type: string description: CPS network ip + port_pcm_port_1_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true pcm_volumes: label: CPS Cluman Cinder Volume hidden: false @@ -115,7 +129,7 @@ topology_template: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.VlanRequirements pcm_flavor_name: label: PCRF CM flavor name hidden: false @@ -128,6 +142,14 @@ topology_template: 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 + required: true cps_net_name: label: CPS network name hidden: false @@ -156,42 +178,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_port_1_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_1_network_role - - index_value + get_input: port_pcm_port_1_network_role fixed_ips: - ip_address: get_input: oam_net_ip subnetpoolid: - get_input: - - port_pcm_port_1_subnetpoolid - - index_value + get_input: port_pcm_port_1_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_1_mac_requirements exCP_naming: - get_input: - - port_pcm_port_1_exCP_naming - - index_value + get_input: port_pcm_port_1_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_1_vlan_requirements - - index_value - network_role_tag: oam + get_input: port_pcm_port_1_vlan_requirements + network_role_tag: + get_input: port_pcm_port_1_network_role_tag network: get_input: oam_net_name order: - get_input: - - port_pcm_port_1_order - - index_value + get_input: port_pcm_port_1_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -214,42 +222,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_port_0_ip_requirements security_groups: - get_input: security_group_name network_role: - get_input: - - port_pcm_port_0_network_role - - index_value + get_input: port_pcm_port_0_network_role fixed_ips: - ip_address: get_input: cps_net_ip subnetpoolid: - get_input: - - port_pcm_port_0_subnetpoolid - - index_value + get_input: port_pcm_port_0_subnetpoolid mac_requirements: - mac_count_required: - is_required: false + get_input: port_pcm_port_0_mac_requirements exCP_naming: - get_input: - - port_pcm_port_0_exCP_naming - - index_value + get_input: port_pcm_port_0_exCP_naming vlan_requirements: - get_input: - - port_pcm_port_0_vlan_requirements - - index_value - network_role_tag: cps + get_input: port_pcm_port_0_vlan_requirements + network_role_tag: + get_input: port_pcm_port_0_network_role_tag network: get_input: cps_net_name order: - get_input: - - port_pcm_port_0_order - - index_value + get_input: port_pcm_port_0_order requirements: - binding: capability: tosca.capabilities.network.Bindable @@ -500,4 +494,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency \ No newline at end of file + - dependency -- cgit 1.2.3-korg