From 1b700c8606f319cbda416a8abb70ea16dceb7a29 Mon Sep 17 00:00:00 2001 From: "Assaf, Shay (sa726r)" Date: Sun, 26 Aug 2018 11:53:35 +0300 Subject: related-networks property support as input Change-Id: I2d6fb011f7440127559a8f02b1c8a72095694403 Issue-ID: SDC-1658 Signed-off-by: Assaf, Shay (sa726r) --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 38 +++++++++++++++++++++- .../out/nested-pcm_v0.1ServiceTemplate.yaml | 32 +++++++++++++----- .../out/nested-pcm_v0.2ServiceTemplate.yaml | 32 +++++++++++++----- .../out/nested-pcm_v0.3ServiceTemplate.yaml | 32 +++++++++++++----- 4 files changed, 106 insertions(+), 28 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index bc682ab7b5..3ad4ddf56f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -12,6 +12,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_11_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availabilityzone_name: type: string description: availabilityzone name @@ -80,6 +86,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: type: string description: the name of security group @@ -617,6 +629,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_12_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -706,6 +724,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_02_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -1150,6 +1174,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -1182,6 +1212,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -1717,4 +1753,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ 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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/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/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 0a53c42257..007653707e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/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/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +45,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -149,6 +159,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: 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 requirements: @@ -194,6 +206,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: 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 requirements: @@ -453,4 +467,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency + - dependency \ 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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/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/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index c76abdd78d..3e8eddce92 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/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/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_pcm_port_11_network_role_tag: type: string required: true + port_pcm_port_11_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availabilityzone_name: label: availabilityzone name hidden: false @@ -80,6 +85,11 @@ topology_template: port_pcm_port_11_network_role: type: string required: true + port_pcm_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: label: security group name hidden: false @@ -149,6 +159,12 @@ topology_template: pcm_port_11: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_11_subnetpoolid + related_networks: + get_input: port_pcm_port_11_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_11_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_11_subnetpoolid mac_requirements: get_input: port_pcm_port_11_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_11_vlan_requirements network_role_tag: get_input: port_pcm_port_11_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_11_order requirements: @@ -181,6 +193,12 @@ topology_template: pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_01_subnetpoolid + related_networks: + get_input: port_pcm_port_01_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_01_ip_requirements security_groups: @@ -190,8 +208,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements subinterface_indicator: false @@ -201,8 +217,6 @@ topology_template: get_input: port_pcm_port_01_vlan_requirements network_role_tag: get_input: port_pcm_port_01_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_01_order requirements: @@ -453,4 +467,4 @@ topology_template: - link local_storage_server_pcm_1: - server_pcm_1 - - local_storage + - local_storage \ 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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml index 1026374596..856c876f3f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: port_pcm_port_02_network_role_tag: type: string required: true + port_pcm_port_12_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -137,6 +142,11 @@ topology_template: port_pcm_port_12_network_role_tag: type: string required: true + port_pcm_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -149,6 +159,12 @@ topology_template: pcm_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_12_subnetpoolid + related_networks: + get_input: port_pcm_port_12_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_12_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_12_subnetpoolid mac_requirements: get_input: port_pcm_port_12_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_12_vlan_requirements network_role_tag: get_input: port_pcm_port_12_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_12_order requirements: @@ -181,6 +193,12 @@ topology_template: pcm_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_02_subnetpoolid + related_networks: + get_input: port_pcm_port_02_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_02_ip_requirements security_groups: @@ -190,8 +208,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_02_subnetpoolid mac_requirements: get_input: port_pcm_port_02_mac_requirements subinterface_indicator: false @@ -201,8 +217,6 @@ topology_template: get_input: port_pcm_port_02_vlan_requirements network_role_tag: get_input: port_pcm_port_02_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_02_order requirements: @@ -453,4 +467,4 @@ topology_template: - link local_storage_server_pcm_2: - server_pcm_2 - - local_storage + - local_storage \ No newline at end of file -- cgit 1.2.3-korg