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/mixPatterns/connectivityBetweenPatterns | |
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/mixPatterns/connectivityBetweenPatterns')
9 files changed, 229 insertions, 21 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index 93674458d4..f32cc59857 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -1048,6 +1048,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_3_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1086,6 +1092,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_3_network: type: list required: true @@ -1594,6 +1606,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_00_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_00_ip_requirements: type: list required: true @@ -1613,6 +1631,12 @@ node_types: description: CPS network gateway 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 @@ -2126,6 +2150,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c2_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c2_t2_port_network_role: type: string required: true @@ -2166,6 +2196,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2682,6 +2718,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_network_role_tag: type: string required: true @@ -2726,6 +2768,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 @@ -3271,6 +3319,12 @@ node_types: type: string required: true status: SUPPORTED + port_1b_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t1_port_ip_requirements: type: list required: true @@ -3307,6 +3361,12 @@ node_types: type: string required: true status: SUPPORTED + port_1b_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3831,6 +3891,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1c1_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c1_t2_port_network_role_tag: type: string required: true @@ -3839,6 +3905,12 @@ node_types: type: string required: true status: SUPPORTED + port_1c1_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c1_t1_port_ip_requirements: type: list required: true @@ -4456,6 +4528,12 @@ node_types: type: string required: true status: SUPPORTED + port_1a_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1a_t2_port_ip_requirements: type: list required: true @@ -4492,6 +4570,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_1a_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1a_t1_port_network_role_tag: type: string required: true @@ -4990,6 +5074,12 @@ node_types: type: string required: true status: SUPPORTED + port_1b_t2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t1_port_ip_requirements: type: list required: true @@ -5026,6 +5116,12 @@ node_types: type: string required: true status: SUPPORTED + port_1b_t1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -5536,4 +5632,4 @@ node_types: type: tosca.capabilities.Node 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/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml index d83e7cc273..03cc64cfd6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c1_scalling_instanceServiceTemplate.yaml @@ -24,12 +24,22 @@ topology_template: required: true entry_schema: type: string + port_1c1_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c1_t2_port_network_role_tag: type: string required: true vm_flavor_name: type: string required: true + port_1c1_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c1_t1_port_ip_requirements: type: list required: true @@ -150,6 +160,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_1c1_t1_port_ip_requirements + related_networks: + get_input: port_1c1_t1_port_related_networks network_role_tag: get_input: port_1c1_t1_port_network_role_tag network_role: @@ -214,6 +226,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_1c1_t2_port_ip_requirements + related_networks: + get_input: port_1c1_t2_port_related_networks network_role_tag: get_input: port_1c1_t2_port_network_role_tag network_role: @@ -472,4 +486,4 @@ topology_template: - link local_storage_1c1_scalling_instance: - 1c1_scalling_instance - - 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/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml index 9178a58df9..f3cf7861ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_1c2_catalog_instanceServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_1c2_t2_port_subnetpoolid: type: string required: true + port_1c2_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c2_t2_port_network_role: type: string required: true @@ -53,6 +58,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_1c2_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -151,6 +161,8 @@ topology_template: vlan_requirements: get_input: port_1c2_t2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1c2_t2_port_related_networks ip_requirements: get_input: port_1c2_t2_port_ip_requirements network_role_tag: @@ -180,6 +192,8 @@ topology_template: vlan_requirements: get_input: port_1c2_t1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1c2_t1_port_related_networks ip_requirements: get_input: port_1c2_t1_port_ip_requirements network_role_tag: @@ -430,4 +444,4 @@ topology_template: - dependency link_1c2_catalog_instance_1c2_t2_port: - 1c2_catalog_instance_1c2_t2_port - - link + - link
\ 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/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml index 3a130a9584..98912ac570 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_a_single_1aServiceTemplate.yaml @@ -49,6 +49,11 @@ topology_template: vm_image_name: type: string required: true + port_1a_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1a_t2_port_ip_requirements: type: list required: true @@ -79,6 +84,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_1a_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1a_t1_port_network_role_tag: type: string required: true @@ -124,6 +134,8 @@ topology_template: vlan_requirements: get_input: port_1a_t1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1a_t1_port_related_networks ip_requirements: get_input: port_1a_t1_port_ip_requirements network_role_tag: @@ -180,6 +192,8 @@ topology_template: vlan_requirements: get_input: port_1a_t2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1a_t2_port_related_networks ip_requirements: get_input: port_1a_t2_port_ip_requirements network_role_tag: @@ -430,4 +444,4 @@ topology_template: - dependency local_storage_a_single_1a: - a_single_1a - - 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/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml index 35a7e0973a..163cde466b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1bServiceTemplate.yaml @@ -23,6 +23,11 @@ topology_template: vm_flavor_name: type: string required: true + port_1b_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t1_port_ip_requirements: type: list required: true @@ -51,6 +56,11 @@ topology_template: port_1b_t2_port_subnetpoolid: type: string required: true + port_1b_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -146,6 +156,8 @@ topology_template: vlan_requirements: get_input: port_1b_t1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1b_t1_port_related_networks ip_requirements: get_input: port_1b_t1_port_ip_requirements network_role_tag: @@ -175,6 +187,8 @@ topology_template: vlan_requirements: get_input: port_1b_t2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1b_t2_port_related_networks ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: @@ -425,4 +439,4 @@ topology_template: - link dependency_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - - 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/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml index 1473c76637..d2a4c87502 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_b_single_1b_1ServiceTemplate.yaml @@ -23,6 +23,11 @@ topology_template: vm_flavor_name: type: string required: true + port_1b_t2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t1_port_ip_requirements: type: list required: true @@ -51,6 +56,11 @@ topology_template: port_1b_t2_port_subnetpoolid: type: string required: true + port_1b_t1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -142,6 +152,10 @@ topology_template: b_single_1b_1b_t1_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + mac_requirements: + get_input: port_1b_t1_port_mac_requirements + order: + get_input: port_1b_t1_port_order value_specs: get_input: - port_1b_t1_port_value_specs @@ -153,12 +167,10 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_1b_t1_port_ip_requirements + related_networks: + get_input: port_1b_t1_port_related_networks network_role_tag: get_input: port_1b_t1_port_network_role_tag - mac_requirements: - get_input: port_1b_t1_port_mac_requirements - order: - get_input: port_1b_t1_port_order network_role: get_input: port_1b_t1_port_network_role subnetpoolid: @@ -180,6 +192,8 @@ topology_template: vlan_requirements: get_input: port_1b_t2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_1b_t2_port_related_networks ip_requirements: get_input: port_1b_t2_port_ip_requirements network_role_tag: @@ -430,4 +444,4 @@ topology_template: - link dependency_b_single_1b_1b_t2_port: - b_single_1b_1b_t2_port - - 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/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml index 42c8b54010..3b3e7bc0ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_serverServiceTemplate.yaml @@ -89,6 +89,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_pcm_port_3_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -120,6 +125,11 @@ topology_template: port_pcm_port_2_network_role_tag: type: string required: true + port_pcm_port_2_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_3_network: type: list required: true @@ -181,6 +191,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_3_ip_requirements + related_networks: + get_input: port_pcm_port_3_related_networks network_role_tag: get_input: port_pcm_port_3_network_role_tag network_role: @@ -218,6 +230,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_2_ip_requirements + related_networks: + get_input: port_pcm_port_2_related_networks network_role_tag: get_input: port_pcm_port_2_network_role_tag network_role: @@ -453,4 +467,4 @@ topology_template: - link link_pcma_server_pcm_port_3: - pcma_server_pcm_port_3 - - link + - link
\ 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/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml index d42796a554..a149bdc39c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/Nested_pcma_server_1ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_pcm_port_0_network_role: type: string required: true + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_network_role_tag: type: string required: true @@ -49,6 +54,11 @@ topology_template: vm_image_name: 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 @@ -172,6 +182,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_0_ip_requirements + related_networks: + get_input: port_pcm_port_0_related_networks network_role_tag: get_input: port_pcm_port_0_network_role_tag network_role: @@ -209,6 +221,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_1_ip_requirements + related_networks: + get_input: port_pcm_port_1_related_networks network_role_tag: get_input: port_pcm_port_1_network_role_tag network_role: @@ -444,4 +458,4 @@ topology_template: - link dependency_pcma_server_pcm_port_0: - pcma_server_pcm_port_0 - - 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/mixPatterns/connectivityBetweenPatterns/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/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml index 5dc6de3055..c5b67a5ebc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/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/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: port_pcm_port_00_network_role: type: string required: true + port_pcm_port_00_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_00_ip_requirements: type: list required: true @@ -88,6 +93,11 @@ topology_template: immutable: false type: string description: CPS network gateway + 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 @@ -157,6 +167,12 @@ topology_template: pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_00_subnetpoolid + related_networks: + get_input: port_pcm_port_00_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_00_ip_requirements security_groups: @@ -166,8 +182,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_00_subnetpoolid mac_requirements: get_input: port_pcm_port_00_mac_requirements subinterface_indicator: false @@ -177,8 +191,6 @@ topology_template: get_input: port_pcm_port_00_vlan_requirements network_role_tag: get_input: port_pcm_port_00_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_00_order requirements: @@ -205,6 +217,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: oam_net_name ip_requirements: get_input: port_pcm_port_01_ip_requirements security_groups: @@ -214,8 +232,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements subinterface_indicator: false @@ -225,8 +241,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: oam_net_name order: get_input: port_pcm_port_01_order requirements: @@ -464,4 +478,4 @@ topology_template: - link dependency_server_pcm: - server_pcm - - dependency + - dependency
\ No newline at end of file |