diff options
author | 2018-08-26 11:53:35 +0300 | |
---|---|---|
committer | 2018-08-26 11:53:35 +0300 | |
commit | 1b700c8606f319cbda416a8abb70ea16dceb7a29 (patch) | |
tree | 1febba7da1dbdddccf917612acab08363a476f93 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out | |
parent | b111bbed40e9fe02d980fe0af360f60ca47f5ac6 (diff) |
related-networks property support as input
Change-Id: I2d6fb011f7440127559a8f02b1c8a72095694403
Issue-ID: SDC-1658
Signed-off-by: Assaf, Shay (sa726r) <sa726r@intl.att.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out')
2 files changed, 48 insertions, 10 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3a0a107c2b..81a73531c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: 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 @@ -40,6 +46,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 @@ -579,6 +591,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 @@ -611,6 +629,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 @@ -1441,4 +1465,4 @@ node_types: type: tosca.capabilities.network.Bindable 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/twoNestedNodeTemplatesWithSameComputeType/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/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 1e7caa5fd8..1c527e6c36 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/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/twoNestedNodeTemplatesWithSameComputeType/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 |