diff options
| author |   Assaf, Shay (sa726r) <sa726r@intl.att.com> | 2018-08-26 11:53:35 +0300 |
|---|---|---|
| committer | Assaf, Shay (sa726r) <sa726r@intl.att.com> | 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/nestedOtherScenarios | |
| 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/nestedOtherScenarios')
74 files changed, 1025 insertions, 106 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 037768dd4f..75e2b7f6b6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -80,6 +80,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_nested2_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_nested2_1b_port_network: type: list required: true @@ -734,6 +740,18 @@ node_types: description: Flavor for PD server required: true status: SUPPORTED + port_pd_server_pattern4_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_port_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_pattern4_port_1_network_role: type: string required: true @@ -1287,6 +1305,12 @@ node_types: type: integer required: true status: SUPPORTED + port_pd_server_pattern4_port_02_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server @@ -1308,6 +1332,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_pattern4_port_02_network_role_tag: type: string required: true @@ -1844,6 +1874,12 @@ node_types: type: integer required: true status: SUPPORTED + port_pd_server_pattern4_port_02_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server @@ -1865,6 +1901,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_pattern4_port_02_network_role_tag: type: string required: true @@ -2331,6 +2373,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_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 @@ -7024,6 +7072,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_main_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -9867,6 +9921,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_main_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -10294,6 +10354,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_main_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -10798,6 +10864,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_main_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -11197,6 +11269,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_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 @@ -11630,6 +11708,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_ps_server_nested2_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_nested2_1b_availability_zone: type: list required: true @@ -12051,6 +12135,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_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 @@ -12547,6 +12637,12 @@ node_types: type: integer required: true status: SUPPORTED + port_pd_server_pattern4_port_02_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: type: string description: Flavor for PD server @@ -12568,6 +12664,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_pattern4_port_02_network_role_tag: type: string required: true @@ -13008,4 +13110,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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml index ebe44ed6db..55c18354ce 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_mainServiceTemplate.yaml @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_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 @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements + related_networks: + get_input: port_cmaui_port_related_networks network_role_tag: get_input: port_cmaui_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - local_storage dependency_cmaui_1c1_main: - cmaui_1c1_main - - 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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml index 627a385a37..c68dba003a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_main_1ServiceTemplate.yaml @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_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 @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements + related_networks: + get_input: port_cmaui_port_related_networks network_role_tag: get_input: port_cmaui_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - local_storage dependency_cmaui_1c1_main: - cmaui_1c1_main - - 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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml index 028c8b3716..5541d71406 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_cmaui_1c1_nested2ServiceTemplate.yaml @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_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 @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements + related_networks: + get_input: port_cmaui_port_related_networks network_role_tag: get_input: port_cmaui_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - local_storage dependency_cmaui_1c1_nested2_cmaui_port: - cmaui_1c1_nested2_cmaui_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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml index 6124951e17..f8f07113b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1bServiceTemplate.yaml @@ -40,6 +40,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_main_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pd_server_main_1b_port_ip_requirements + related_networks: + get_input: port_pd_server_main_1b_port_related_networks network_role_tag: get_input: port_pd_server_main_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - local_storage dependency_pd_server_main_1b_pd_server_main_1b_port: - pd_server_main_1b_pd_server_main_1b_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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml index c572dc5e47..2c92263120 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_main_1b_1ServiceTemplate.yaml @@ -40,6 +40,11 @@ topology_template: vm_flavor_name: type: string required: true + port_pd_server_main_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pd_server_main_1b_port_ip_requirements + related_networks: + get_input: port_pd_server_main_1b_port_related_networks network_role_tag: get_input: port_pd_server_main_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - local_storage dependency_pd_server_main_1b_pd_server_main_1b_port: - pd_server_main_1b_pd_server_main_1b_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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml index 6619eb85b6..5a29af80ad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_pd_server_nested2_1bServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: port_pd_server_nested2_1b_port_network_role_tag: type: string required: true + port_pd_server_nested2_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_nested2_1b_port_network: type: list required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pd_server_nested2_1b_port_ip_requirements + related_networks: + get_input: port_pd_server_nested2_1b_port_related_networks network_role_tag: get_input: port_pd_server_nested2_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency link_pd_server_nested2_1b_pd_server_nested2_1b_port: - pd_server_nested2_1b_pd_server_nested2_1b_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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml index 698772dd9c..3f68b28f1f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1bServiceTemplate.yaml @@ -51,6 +51,11 @@ topology_template: port_ps_server_main_1b_port_network_role_tag: type: string required: true + port_ps_server_main_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_main_1b_port_ip_requirements + related_networks: + get_input: port_ps_server_main_1b_port_related_networks network_role_tag: get_input: port_ps_server_main_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - - 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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml index 106f1659ae..edb49ea4f2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_main_1b_1ServiceTemplate.yaml @@ -51,6 +51,11 @@ topology_template: port_ps_server_main_1b_port_network_role_tag: type: string required: true + port_ps_server_main_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_main_1b_port_ip_requirements + related_networks: + get_input: port_ps_server_main_1b_port_related_networks network_role_tag: get_input: port_ps_server_main_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency local_storage_ps_server_main_1b: - ps_server_main_1b - - 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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml index 41a8b66e77..c788016757 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/Nested_ps_server_nested2_1bServiceTemplate.yaml @@ -34,6 +34,11 @@ topology_template: required: true entry_schema: type: string + port_ps_server_nested2_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_ps_server_nested2_1b_availability_zone: type: list required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_nested2_1b_port_ip_requirements + related_networks: + get_input: port_ps_server_nested2_1b_port_related_networks network_role_tag: get_input: port_ps_server_nested2_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency link_ps_server_nested2_1b_ps_server_nested2_1b_port: - ps_server_nested2_1b_ps_server_nested2_1b_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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml index 3a9ca34c65..ba3537795a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4-same-typeServiceTemplate.yaml @@ -98,6 +98,16 @@ topology_template: immutable: false type: string description: Flavor for PD server + port_pd_server_pattern4_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_pd_server_pattern4_port_2_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_pattern4_port_1_network_role: type: string required: true @@ -124,6 +134,12 @@ topology_template: pd_server_pattern4_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pd_server_pattern4_port_1_subnetpoolid + related_networks: + get_input: port_pd_server_pattern4_port_1_related_networks + network: + get_input: net replacement_policy: AUTO ip_requirements: get_input: port_pd_server_pattern4_port_1_ip_requirements @@ -134,8 +150,6 @@ topology_template: get_input: - pd_server_pattern4_ips - 0 - subnetpoolid: - get_input: port_pd_server_pattern4_port_1_subnetpoolid mac_requirements: get_input: port_pd_server_pattern4_port_1_mac_requirements subinterface_indicator: false @@ -145,8 +159,6 @@ topology_template: get_input: port_pd_server_pattern4_port_1_vlan_requirements network_role_tag: get_input: port_pd_server_pattern4_port_1_network_role_tag - network: - get_input: net order: get_input: port_pd_server_pattern4_port_1_order requirements: @@ -170,6 +182,12 @@ topology_template: pd_server_pattern4_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pd_server_pattern4_port_2_subnetpoolid + related_networks: + get_input: port_pd_server_pattern4_port_2_related_networks + network: + get_input: net replacement_policy: AUTO ip_requirements: get_input: port_pd_server_pattern4_port_2_ip_requirements @@ -180,8 +198,6 @@ topology_template: get_input: - pd_server_pattern4_ips - 1 - subnetpoolid: - get_input: port_pd_server_pattern4_port_2_subnetpoolid mac_requirements: get_input: port_pd_server_pattern4_port_2_mac_requirements subinterface_indicator: false @@ -191,8 +207,6 @@ topology_template: get_input: port_pd_server_pattern4_port_2_vlan_requirements network_role_tag: get_input: port_pd_server_pattern4_port_2_network_role_tag - network: - get_input: net order: get_input: port_pd_server_pattern4_port_2_order requirements: @@ -430,4 +444,4 @@ topology_template: - link dependency_server_pd_pattern4_1: - server_pd_pattern4_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/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml index 695ecf07cc..640a075c1e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -92,6 +92,11 @@ topology_template: port_pd_server_pattern4_port_01_order: type: integer required: true + port_pd_server_pattern4_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments pd_server_pattern4_image: hidden: false immutable: false @@ -110,6 +115,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_pattern4_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_pattern4_port_02_network_role_tag: type: string required: true @@ -124,6 +134,12 @@ topology_template: pd_server_pattern4_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pd_server_pattern4_port_01_subnetpoolid + related_networks: + get_input: port_pd_server_pattern4_port_01_related_networks + network: + get_input: net replacement_policy: AUTO ip_requirements: get_input: port_pd_server_pattern4_port_01_ip_requirements @@ -134,8 +150,6 @@ topology_template: get_input: - pd_server_pattern4_ips - 0 - subnetpoolid: - get_input: port_pd_server_pattern4_port_01_subnetpoolid mac_requirements: get_input: port_pd_server_pattern4_port_01_mac_requirements subinterface_indicator: false @@ -145,8 +159,6 @@ topology_template: get_input: port_pd_server_pattern4_port_01_vlan_requirements network_role_tag: get_input: port_pd_server_pattern4_port_01_network_role_tag - network: - get_input: net order: get_input: port_pd_server_pattern4_port_01_order requirements: @@ -170,6 +182,12 @@ topology_template: pd_server_pattern4_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pd_server_pattern4_port_02_subnetpoolid + related_networks: + get_input: port_pd_server_pattern4_port_02_related_networks + network: + get_input: net replacement_policy: AUTO ip_requirements: get_input: port_pd_server_pattern4_port_02_ip_requirements @@ -180,8 +198,6 @@ topology_template: get_input: - pd_server_pattern4_ips - 1 - subnetpoolid: - get_input: port_pd_server_pattern4_port_02_subnetpoolid mac_requirements: get_input: port_pd_server_pattern4_port_02_mac_requirements subinterface_indicator: false @@ -191,8 +207,6 @@ topology_template: get_input: port_pd_server_pattern4_port_02_vlan_requirements network_role_tag: get_input: port_pd_server_pattern4_port_02_network_role_tag - network: - get_input: net order: get_input: port_pd_server_pattern4_port_02_order requirements: @@ -430,4 +444,4 @@ topology_template: - link dependency_server_pd_pattern4: - server_pd_pattern4 - - 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/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 06e161e034..c04600a16e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -92,6 +92,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -479,6 +485,12 @@ node_types: type: integer required: true status: SUPPORTED + port_cmaui_port_7_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_7_network_role_tag: type: string required: true @@ -573,6 +585,12 @@ node_types: type: string required: true status: SUPPORTED + port_cmaui_port_8_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_cmaui_port_7: capability: tosca.capabilities.Node @@ -1054,6 +1072,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_server_port_fixed_ips: type: list required: true @@ -4607,6 +4631,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_sm_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_sm_server_port_security_groups: type: list required: true @@ -5014,6 +5044,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -5387,4 +5423,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/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml index b47f6e936e..fad2bc269f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_oam_serverServiceTemplate.yaml @@ -53,6 +53,11 @@ topology_template: vm_image_name: type: string required: true + port_oam_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_server_port_fixed_ips: type: list required: true @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_oam_server_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam_server_port_related_networks ip_requirements: get_input: port_oam_server_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - dependency link_oam_server_oam_server_port: - oam_server_oam_server_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/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml index 3130f3cf53..b38ff0b993 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -79,6 +79,11 @@ topology_template: required: true entry_schema: type: string + port_pd_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_pd_server_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd_server_port_related_networks ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - link dependency_pd_server_pd_server_port: - pd_server_pd_server_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/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml index a8789f3705..ebdd539d2c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_ps_serverServiceTemplate.yaml @@ -57,6 +57,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -103,6 +108,8 @@ topology_template: vlan_requirements: get_input: port_ps_server_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_ps_server_port_related_networks ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - link local_storage_ps_server: - ps_server - - 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/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml index 22ec89c3c2..e342b871f1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/Nested_sm_serverServiceTemplate.yaml @@ -77,6 +77,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_sm_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_sm_server_port_security_groups: type: list required: true @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_sm_server_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_sm_server_port_related_networks ip_requirements: get_input: port_sm_server_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - local_storage link_sm_server_sm_server_port: - sm_server_sm_server_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/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml index 5eccdf3d2d..46515f65b9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested3ServiceTemplate.yaml @@ -47,6 +47,11 @@ topology_template: port_cmaui_port_8_order: type: integer required: true + port_cmaui_port_7_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_7_network_role_tag: type: string required: true @@ -128,12 +133,19 @@ topology_template: port_cmaui_port_8_subnetpoolid: type: string required: true + port_cmaui_port_8_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: cmaui_port_7: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: get_input: port_cmaui_port_7_subnetpoolid + related_networks: + get_input: port_cmaui_port_7_related_networks network: get_input: net1 replacement_policy: AUTO @@ -169,6 +181,8 @@ topology_template: properties: subnetpoolid: get_input: port_cmaui_port_8_subnetpoolid + related_networks: + get_input: port_cmaui_port_8_related_networks network: get_input: net2 replacement_policy: AUTO @@ -439,4 +453,4 @@ topology_template: - dependency local_storage_server_cmaui: - server_cmaui - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index a4c69ca7ea..e00b9d0529 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -84,6 +84,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -447,6 +453,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_pd01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -886,6 +898,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_pd01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -1353,6 +1371,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_oam02_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_availability_zone: type: list required: true @@ -1764,6 +1788,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -2149,6 +2179,12 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_cmaui02_port_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 @@ -2644,6 +2680,12 @@ node_types: type: string required: true status: SUPPORTED + port_cmaui01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -6643,6 +6685,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_ps: capability: tosca.capabilities.Node @@ -7716,4 +7764,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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml index c42e264b2b..b7f6826e85 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmauiServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_cmaui02_port_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 @@ -103,6 +108,8 @@ topology_template: vlan_requirements: get_input: port_cmaui02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cmaui02_port_related_networks ip_requirements: get_input: port_cmaui02_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - dependency local_storage_cmaui: - cmaui - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml index 95de8756cc..72ebfec0cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_cmaui_1ServiceTemplate.yaml @@ -61,6 +61,11 @@ topology_template: port_cmaui01_port_network_role_tag: type: string required: true + port_cmaui01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -103,6 +108,8 @@ topology_template: vlan_requirements: get_input: port_cmaui01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cmaui01_port_related_networks ip_requirements: get_input: port_cmaui01_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - dependency local_storage_cmaui: - cmaui - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml index 285d94a86a..87232dd290 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oamServiceTemplate.yaml @@ -67,6 +67,11 @@ topology_template: required: true entry_schema: type: string + port_oam02_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_availability_zone: type: list required: true @@ -103,6 +108,8 @@ topology_template: vlan_requirements: get_input: port_oam02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam02_port_related_networks ip_requirements: get_input: port_oam02_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - dependency dependency_oam: - oam - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml index a68212a407..f6f3d190cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_oam_1ServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: vm_flavor_name: type: string required: true + port_oam01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -103,6 +108,8 @@ topology_template: vlan_requirements: get_input: port_oam01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam01_port_related_networks ip_requirements: get_input: port_oam01_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - link dependency_oam: - oam - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 0102fb5009..9d8385b905 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -72,6 +72,11 @@ topology_template: required: true entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd02_port_related_networks ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index f875aad129..34e182d166 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: port_pd01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_pd01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_related_networks ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml index f55c8f7c6c..1ef6099449 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_psServiceTemplate.yaml @@ -82,6 +82,11 @@ topology_template: required: true entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: ps: type: org.openecomp.resource.vfc.compute.nodes.heat.ps @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_pd02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd02_port_related_networks ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - dependency local_storage_ps: - ps - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml index 937a2b3864..7c142e6996 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/Nested_ps_1ServiceTemplate.yaml @@ -26,6 +26,11 @@ topology_template: port_pd01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_pd01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_related_networks ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - dependency link_ps_pd01_port: - ps_pd01_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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index c50219dfd3..1481bf653e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -32,6 +32,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_pd01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -485,6 +491,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps02_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps02_port_subnetpoolid: type: string required: true @@ -926,6 +938,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -1295,6 +1313,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_pd01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -1716,6 +1740,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_pd01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -2189,6 +2219,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -2610,6 +2646,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_pd_server: capability: tosca.capabilities.Node @@ -2979,6 +3021,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_pd01_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -7644,4 +7692,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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml index 9ce1d48341..2d01270aaf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_serverServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: port_pd01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_pd01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_related_networks ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml index cc309161c1..c46b8e7c0f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_1ServiceTemplate.yaml @@ -72,6 +72,11 @@ topology_template: required: true entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd02_port_related_networks ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml index a3c329478a..7ecfd2d3ca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_2ServiceTemplate.yaml @@ -72,6 +72,11 @@ topology_template: required: true entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd02_port_related_networks ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml index f450366600..a802e130ad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_3ServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: port_pd01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_pd01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_related_networks ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml index 62ab62f014..752fc03a07 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_4ServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: port_pd01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_pd01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_related_networks ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml index 0ef4cda950..6e87a88d97 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_5ServiceTemplate.yaml @@ -56,6 +56,11 @@ topology_template: vm_image_name: type: string required: true + port_ps02_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps02_port_subnetpoolid: type: string required: true @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_ps02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_ps02_port_related_networks ip_requirements: get_input: port_ps02_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server_ps02_port: - pd_server_ps02_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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml index 61f33e6f81..1289e6e812 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_6ServiceTemplate.yaml @@ -72,6 +72,11 @@ topology_template: required: true entry_schema: type: string + port_pd02_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: pd_server: type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd02_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd02_port_related_networks ip_requirements: get_input: port_pd02_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server_pd02_port: - pd_server_pd02_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/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml index 5423f41fe5..4c81d47d18 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/Nested_pd_server_7ServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: port_pd01_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_pd01_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -100,6 +105,8 @@ topology_template: vlan_requirements: get_input: port_pd01_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd01_port_related_networks ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: @@ -295,4 +302,4 @@ topology_template: - dependency dependency_pd_server: - pd_server - - 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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml index beb3e3d011..23264fd584 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -32,6 +32,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_1b_port_network_role_tag: type: string required: true @@ -515,6 +521,12 @@ node_types: type: integer required: true status: SUPPORTED + port_osm_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_osm_server_1c2_metadata: type: list required: true @@ -912,6 +924,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -1388,6 +1406,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_1_network_role_tag: type: string required: true @@ -1414,6 +1438,12 @@ node_types: type: integer required: true status: SUPPORTED + port_pd_server_port_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_2_network_role_tag: type: string required: true @@ -1913,6 +1943,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps_server_1b_port_network: type: list required: true @@ -2364,6 +2400,12 @@ node_types: type: string required: true status: SUPPORTED + port_BE_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -5401,6 +5443,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps_server_1b_port_network: type: list required: true @@ -5868,6 +5916,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_rd_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments attributes: rd_server_1b_accessIPv4: type: string @@ -6578,6 +6632,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_1_network_role_tag: type: string required: true @@ -6603,6 +6663,12 @@ node_types: type: integer required: true status: SUPPORTED + port_pd_server_port_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_2_network_role_tag: type: string required: true @@ -7134,6 +7200,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_1_network_role_tag: type: string required: true @@ -7159,6 +7231,12 @@ node_types: type: integer required: true status: SUPPORTED + port_pd_server_port_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_2_network_role_tag: type: string required: true @@ -7638,6 +7716,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_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 @@ -8043,4 +8127,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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml index f96e8a62d2..5833cce311 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_BE_1c1ServiceTemplate.yaml @@ -64,6 +64,11 @@ topology_template: port_BE_port_network_role_tag: type: string required: true + port_BE_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_BE_port_ip_requirements + related_networks: + get_input: port_BE_port_related_networks network_role_tag: get_input: port_BE_port_network_role_tag network_role: @@ -311,4 +318,4 @@ topology_template: - dependency dependency_BE_1c1: - BE_1c1 - - 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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml index 4f667386c6..334e680cc5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_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 @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements + related_networks: + get_input: port_cmaui_port_related_networks network_role_tag: get_input: port_cmaui_port_network_role_tag network_role: @@ -311,4 +318,4 @@ topology_template: - link local_storage_cmaui_1c1: - cmaui_1c1 - - 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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml index 6dbb4c2895..5ad7f5d029 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -40,6 +40,11 @@ topology_template: port_oam_port_subnetpoolid: type: string required: true + port_oam_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -120,6 +125,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_oam_port_ip_requirements + related_networks: + get_input: port_oam_port_related_networks network_role_tag: get_input: port_oam_port_network_role_tag network_role: @@ -320,4 +327,4 @@ topology_template: - link dependency_oam_server_1c2_oam_port: - oam_server_1c2_oam_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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml index e7e5928189..867f972c34 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_osm_server_1c2ServiceTemplate.yaml @@ -72,6 +72,11 @@ topology_template: port_osm_port_order: type: integer required: true + port_osm_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_osm_server_1c2_metadata: type: list required: true @@ -101,6 +106,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_osm_port_ip_requirements + related_networks: + get_input: port_osm_port_related_networks network_role_tag: get_input: port_osm_port_network_role_tag network_role: @@ -320,4 +327,4 @@ topology_template: - local_storage dependency_osm_server_1c2: - osm_server_1c2 - - 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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml index 3e54bf3448..4c8a635991 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1bServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: vm_flavor_name: type: string required: true + port_ps_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps_server_1b_port_network: type: list required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_1b_port_ip_requirements + related_networks: + get_input: port_ps_server_1b_port_related_networks network_role_tag: get_input: port_ps_server_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency link_pd_server_1b_ps_server_1b_port: - pd_server_1b_ps_server_1b_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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml index f371e78e35..798ca5a3de 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_pd_server_1b_1ServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_1b_port_network_role_tag: type: string required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pd_server_1b_port_ip_requirements + related_networks: + get_input: port_pd_server_1b_port_related_networks network_role_tag: get_input: port_pd_server_1b_port_network_role_tag network_role: @@ -311,4 +318,4 @@ topology_template: - link dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml index 2e1aaa5537..7406528ff1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1bServiceTemplate.yaml @@ -77,6 +77,11 @@ topology_template: port_rd_server_1b_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_rd_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: rd_server_1b_rd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_rd_server_1b_port_ip_requirements + related_networks: + get_input: port_rd_server_1b_port_related_networks network_role_tag: get_input: port_rd_server_1b_port_network_role_tag network_role: @@ -311,4 +318,4 @@ topology_template: - local_storage link_rd_server_1b_rd_server_1b_port: - rd_server_1b_rd_server_1b_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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml index 38f55fa865..001685987d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/Nested_rd_server_1b_1ServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: vm_flavor_name: type: string required: true + port_ps_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps_server_1b_port_network: type: list required: true @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_1b_port_ip_requirements + related_networks: + get_input: port_ps_server_1b_port_related_networks network_role_tag: get_input: port_ps_server_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency link_rd_server_1b_ps_server_1b_port: - rd_server_1b_ps_server_1b_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/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml index 71db42ec92..17cbb4ac54 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested-pattern-4ServiceTemplate.yaml @@ -78,6 +78,11 @@ topology_template: port_pd_server_port_1_subnetpoolid: type: string required: true + port_pd_server_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_1_network_role_tag: type: string required: true @@ -101,6 +106,11 @@ topology_template: port_pd_server_port_2_order: type: integer required: true + port_pd_server_port_2_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_2_network_role_tag: type: string required: true @@ -124,6 +134,12 @@ topology_template: pd_server_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pd_server_port_1_subnetpoolid + related_networks: + get_input: port_pd_server_port_1_related_networks + network: + get_input: net replacement_policy: AUTO ip_requirements: get_input: port_pd_server_port_1_ip_requirements @@ -134,8 +150,6 @@ topology_template: get_input: - pd_server_ips - 0 - subnetpoolid: - get_input: port_pd_server_port_1_subnetpoolid mac_requirements: get_input: port_pd_server_port_1_mac_requirements subinterface_indicator: false @@ -145,8 +159,6 @@ topology_template: get_input: port_pd_server_port_1_vlan_requirements network_role_tag: get_input: port_pd_server_port_1_network_role_tag - network: - get_input: net order: get_input: port_pd_server_port_1_order requirements: @@ -157,6 +169,12 @@ topology_template: pd_server_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pd_server_port_2_subnetpoolid + related_networks: + get_input: port_pd_server_port_2_related_networks + network: + get_input: net replacement_policy: AUTO ip_requirements: get_input: port_pd_server_port_2_ip_requirements @@ -167,8 +185,6 @@ topology_template: get_input: - pd_server_ips - 1 - subnetpoolid: - get_input: port_pd_server_port_2_subnetpoolid mac_requirements: get_input: port_pd_server_port_2_mac_requirements subinterface_indicator: false @@ -178,8 +194,6 @@ topology_template: get_input: port_pd_server_port_2_vlan_requirements network_role_tag: get_input: port_pd_server_port_2_network_role_tag - network: - get_input: net order: get_input: port_pd_server_port_2_order requirements: @@ -430,4 +444,4 @@ topology_template: - dependency dependency_pd_server_port_2: - pd_server_port_2 - - 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/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml index f2f4d3479c..efded1a6bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -44,6 +44,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -459,6 +465,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_1b_port_network_role_tag: type: string required: true @@ -3087,6 +3099,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps_server_1b_port_network: type: list required: true @@ -3500,6 +3518,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_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 @@ -3901,4 +3925,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/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml index 61df375cae..c7ec23eb2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_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 @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements + related_networks: + get_input: port_cmaui_port_related_networks network_role_tag: get_input: port_cmaui_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link local_storage_cmaui_1c1: - cmaui_1c1 - - 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/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml index f7dc996de0..7fd2a8585f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -40,6 +40,11 @@ topology_template: port_oam_port_subnetpoolid: type: string required: true + port_oam_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_oam_port_ip_requirements + related_networks: + get_input: port_oam_port_related_networks network_role_tag: get_input: port_oam_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link dependency_oam_server_1c2_oam_port: - oam_server_1c2_oam_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/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml index c3bad7cb18..d0921140a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_1b_port_network_role_tag: type: string required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pd_server_1b_port_ip_requirements + related_networks: + get_input: port_pd_server_1b_port_related_networks network_role_tag: get_input: port_pd_server_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_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/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml index 2ee92d2b40..39d5a7b78a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/Nested_ps_server_1bServiceTemplate.yaml @@ -40,6 +40,11 @@ topology_template: vm_flavor_name: type: string required: true + port_ps_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps_server_1b_port_network: type: list required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_1b_port_ip_requirements + related_networks: + get_input: port_ps_server_1b_port_related_networks network_role_tag: get_input: port_ps_server_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link dependency_ps_server_1b: - ps_server_1b - - 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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 26be6a1655..8735c51fee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -44,6 +44,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -514,6 +520,12 @@ node_types: type: string required: true status: SUPPORTED + port_pd_server_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_1_network_role_tag: type: string required: true @@ -540,6 +552,12 @@ node_types: type: integer required: true status: SUPPORTED + port_pd_server_port_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_2_network_role_tag: type: string required: true @@ -1021,6 +1039,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_1b_port_network_role_tag: type: string required: true @@ -3941,6 +3965,12 @@ node_types: type: string required: true status: SUPPORTED + port_ps_server_1b_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps_server_1b_port_network: type: list required: true @@ -4354,6 +4384,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_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 @@ -4755,4 +4791,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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml index 61df375cae..c7ec23eb2e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_cmaui_1c1ServiceTemplate.yaml @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_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 @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements + related_networks: + get_input: port_cmaui_port_related_networks network_role_tag: get_input: port_cmaui_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link local_storage_cmaui_1c1: - cmaui_1c1 - - 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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml index f2c93a18cf..688ff91cd9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_oam_server_1c2ServiceTemplate.yaml @@ -40,6 +40,11 @@ topology_template: port_oam_port_subnetpoolid: type: string required: true + port_oam_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_oam_port_ip_requirements + related_networks: + get_input: port_oam_port_related_networks network_role_tag: get_input: port_oam_port_network_role_tag network_role: @@ -311,4 +318,4 @@ topology_template: - link dependency_oam_server_1c2_oam_port: - oam_server_1c2_oam_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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml index c3bad7cb18..d0921140a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_pd_server_1bServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_pd_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_1b_port_network_role_tag: type: string required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pd_server_1b_port_ip_requirements + related_networks: + get_input: port_pd_server_1b_port_related_networks network_role_tag: get_input: port_pd_server_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml index 2ee92d2b40..39d5a7b78a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/Nested_ps_server_1bServiceTemplate.yaml @@ -40,6 +40,11 @@ topology_template: vm_flavor_name: type: string required: true + port_ps_server_1b_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_ps_server_1b_port_network: type: list required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_1b_port_ip_requirements + related_networks: + get_input: port_ps_server_1b_port_related_networks network_role_tag: get_input: port_ps_server_1b_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link dependency_ps_server_1b: - ps_server_1b - - 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/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml index 71db42ec92..17cbb4ac54 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested-pattern-4ServiceTemplate.yaml @@ -78,6 +78,11 @@ topology_template: port_pd_server_port_1_subnetpoolid: type: string required: true + port_pd_server_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_1_network_role_tag: type: string required: true @@ -101,6 +106,11 @@ topology_template: port_pd_server_port_2_order: type: integer required: true + port_pd_server_port_2_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_2_network_role_tag: type: string required: true @@ -124,6 +134,12 @@ topology_template: pd_server_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pd_server_port_1_subnetpoolid + related_networks: + get_input: port_pd_server_port_1_related_networks + network: + get_input: net replacement_policy: AUTO ip_requirements: get_input: port_pd_server_port_1_ip_requirements @@ -134,8 +150,6 @@ topology_template: get_input: - pd_server_ips - 0 - subnetpoolid: - get_input: port_pd_server_port_1_subnetpoolid mac_requirements: get_input: port_pd_server_port_1_mac_requirements subinterface_indicator: false @@ -145,8 +159,6 @@ topology_template: get_input: port_pd_server_port_1_vlan_requirements network_role_tag: get_input: port_pd_server_port_1_network_role_tag - network: - get_input: net order: get_input: port_pd_server_port_1_order requirements: @@ -157,6 +169,12 @@ topology_template: pd_server_port_2: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pd_server_port_2_subnetpoolid + related_networks: + get_input: port_pd_server_port_2_related_networks + network: + get_input: net replacement_policy: AUTO ip_requirements: get_input: port_pd_server_port_2_ip_requirements @@ -167,8 +185,6 @@ topology_template: get_input: - pd_server_ips - 1 - subnetpoolid: - get_input: port_pd_server_port_2_subnetpoolid mac_requirements: get_input: port_pd_server_port_2_mac_requirements subinterface_indicator: false @@ -178,8 +194,6 @@ topology_template: get_input: port_pd_server_port_2_vlan_requirements network_role_tag: get_input: port_pd_server_port_2_network_role_tag - network: - get_input: net order: get_input: port_pd_server_port_2_order requirements: @@ -430,4 +444,4 @@ topology_template: - dependency dependency_pd_server_port_2: - pd_server_port_2 - - 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/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 411b35e31a..1701b9971d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -30,6 +30,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_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 @@ -1213,4 +1219,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/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml index 9825e925d6..b0417f718d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/Nested_cmauiServiceTemplate.yaml @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_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 @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements + related_networks: + get_input: port_cmaui_port_related_networks network_role_tag: get_input: port_cmaui_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency local_storage_cmaui: - cmaui - - 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/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0a4871769b..2c58916cea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -30,6 +30,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cmaui_port_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 @@ -1163,4 +1169,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/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml index 9825e925d6..b0417f718d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/Nested_cmauiServiceTemplate.yaml @@ -29,6 +29,11 @@ topology_template: required: true entry_schema: type: string + port_cmaui_port_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 @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_cmaui_port_ip_requirements + related_networks: + get_input: port_cmaui_port_related_networks network_role_tag: get_input: port_cmaui_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency local_storage_cmaui: - cmaui - - 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/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5448c1ed56..01d73994bc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -86,6 +86,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1238,6 +1244,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -1611,4 +1623,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/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml index 831d03d388..ebbbef834a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_pd_serverServiceTemplate.yaml @@ -74,6 +74,11 @@ topology_template: required: true entry_schema: type: string + port_pd_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pd_server_port_ip_requirements + related_networks: + get_input: port_pd_server_port_related_networks network_role_tag: get_input: port_pd_server_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link dependency_pd_server_pd_server_port: - pd_server_pd_server_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/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml index 86d5f4532a..962695b843 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/Nested_ps_serverServiceTemplate.yaml @@ -52,6 +52,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_port_ip_requirements + related_networks: + get_input: port_ps_server_port_related_networks network_role_tag: get_input: port_ps_server_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link local_storage_ps_server: - ps_server - - 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/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml index 49d43a3cfc..b7d9b88fcf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -86,6 +86,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -1997,6 +2003,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_server_port_fixed_ips: type: list required: true @@ -2460,6 +2472,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_sm_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_sm_server: capability: tosca.capabilities.Node @@ -2855,6 +2873,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -3228,4 +3252,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/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml index 9287c9a685..a332abf51e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_oam_serverServiceTemplate.yaml @@ -48,6 +48,11 @@ topology_template: vm_image_name: type: string required: true + port_oam_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_server_port_fixed_ips: type: list required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_oam_server_port_ip_requirements + related_networks: + get_input: port_oam_server_port_related_networks network_role_tag: get_input: port_oam_server_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - dependency link_oam_server_oam_server_port: - oam_server_oam_server_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/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml index 831d03d388..ebbbef834a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_pd_serverServiceTemplate.yaml @@ -74,6 +74,11 @@ topology_template: required: true entry_schema: type: string + port_pd_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pd_server_port_ip_requirements + related_networks: + get_input: port_pd_server_port_related_networks network_role_tag: get_input: port_pd_server_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link dependency_pd_server_pd_server_port: - pd_server_pd_server_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/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml index 86d5f4532a..962695b843 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_ps_serverServiceTemplate.yaml @@ -52,6 +52,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -96,6 +101,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_ps_server_port_ip_requirements + related_networks: + get_input: port_ps_server_port_related_networks network_role_tag: get_input: port_ps_server_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - link local_storage_ps_server: - ps_server - - 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/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml index 502ee9b957..061fd2e3c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameFileOneDiff/out/Nested_sm_serverServiceTemplate.yaml @@ -77,6 +77,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_sm_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: sm_server: type: org.openecomp.resource.vfc.compute.nodes.heat.sm_server @@ -111,6 +116,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_sm_server_port_ip_requirements + related_networks: + get_input: port_sm_server_port_related_networks network_role_tag: get_input: port_sm_server_port_network_role_tag network_role: @@ -304,4 +311,4 @@ topology_template: - local_storage link_sm_server_sm_server_port: - sm_server_sm_server_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/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0d456cdb90..1d03026866 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -92,6 +92,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2009,6 +2015,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_server_port_fixed_ips: type: list required: true @@ -2472,6 +2484,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_sm_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_sm_server_port_security_groups: type: list required: true @@ -2879,6 +2897,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -3252,4 +3276,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/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml index b47f6e936e..fad2bc269f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_oam_serverServiceTemplate.yaml @@ -53,6 +53,11 @@ topology_template: vm_image_name: type: string required: true + port_oam_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_server_port_fixed_ips: type: list required: true @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_oam_server_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam_server_port_related_networks ip_requirements: get_input: port_oam_server_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - dependency link_oam_server_oam_server_port: - oam_server_oam_server_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/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml index 3130f3cf53..b38ff0b993 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_pd_serverServiceTemplate.yaml @@ -79,6 +79,11 @@ topology_template: required: true entry_schema: type: string + port_pd_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pd_server_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_pd_server_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_pd_server_port_related_networks ip_requirements: get_input: port_pd_server_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - link dependency_pd_server_pd_server_port: - pd_server_pd_server_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/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml index a8789f3705..ebdd539d2c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_ps_serverServiceTemplate.yaml @@ -57,6 +57,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_ps_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -103,6 +108,8 @@ topology_template: vlan_requirements: get_input: port_ps_server_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_ps_server_port_related_networks ip_requirements: get_input: port_ps_server_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - link local_storage_ps_server: - ps_server - - 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/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml index 22ec89c3c2..e342b871f1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedTwoSameOneDiffWithConnectivity/out/Nested_sm_serverServiceTemplate.yaml @@ -77,6 +77,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_sm_server_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_sm_server_port_security_groups: type: list required: true @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_sm_server_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_sm_server_port_related_networks ip_requirements: get_input: port_sm_server_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - local_storage link_sm_server_sm_server_port: - sm_server_sm_server_port - - link + - link
\ No newline at end of file |