diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out')
5 files changed, 21 insertions, 17 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index a689fa4403..7c80b6149d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -3458,4 +3458,4 @@ topology_template: value: vson_dbs_volume_1 vson_mon_server_group_id: description: ID of the Server Group intended for vSON MON instances. - value: UNSUPPORTED_RESOURCE_vson_mon_server_group
\ No newline at end of file + value: UNSUPPORTED_RESOURCE_vson_mon_server_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml index 0286b378ce..8e29ff83a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml @@ -226,6 +226,10 @@ topology_template: vson_server_oam_net_port_20: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_vson_server_oam_net_port_20_subnetpoolid + network: + get_input: oam_net_id ip_requirements: get_input: port_vson_server_oam_net_port_20_ip_requirements security_groups: @@ -237,10 +241,9 @@ topology_template: get_input: - oam_net_ips - get_input: instance_index - subnetpoolid: - get_input: port_vson_server_oam_net_port_20_subnetpoolid mac_requirements: get_input: port_vson_server_oam_net_port_20_mac_requirements + subinterface_indicator: false name: str_replace: template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 @@ -259,8 +262,6 @@ topology_template: get_input: port_vson_server_oam_net_port_20_vlan_requirements network_role_tag: get_input: port_vson_server_oam_net_port_20_network_role_tag - network: - get_input: oam_net_id order: get_input: port_vson_server_oam_net_port_20_order requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml index b53841145b..2814364cfb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml @@ -213,6 +213,10 @@ topology_template: vson_server_oam_net_port_10: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_vson_server_oam_net_port_10_subnetpoolid + network: + get_input: oam_net_id ip_requirements: get_input: port_vson_server_oam_net_port_10_ip_requirements security_groups: @@ -224,10 +228,9 @@ topology_template: get_input: - oam_net_ips - get_input: instance_index - subnetpoolid: - get_input: port_vson_server_oam_net_port_10_subnetpoolid mac_requirements: get_input: port_vson_server_oam_net_port_10_mac_requirements + subinterface_indicator: false name: str_replace: template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 @@ -246,8 +249,6 @@ topology_template: get_input: port_vson_server_oam_net_port_10_vlan_requirements network_role_tag: get_input: port_vson_server_oam_net_port_10_network_role_tag - network: - get_input: oam_net_id order: get_input: port_vson_server_oam_net_port_10_order requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml index 5f7bbc52f4..0ab6d2e292 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml @@ -228,6 +228,10 @@ topology_template: vson_server_oam_net_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_vson_server_oam_net_port_00_subnetpoolid + network: + get_input: oam_net_id ip_requirements: get_input: port_vson_server_oam_net_port_00_ip_requirements security_groups: @@ -239,10 +243,9 @@ topology_template: get_input: - oam_net_ips - get_input: instance_index - subnetpoolid: - get_input: port_vson_server_oam_net_port_00_subnetpoolid mac_requirements: get_input: port_vson_server_oam_net_port_00_mac_requirements + subinterface_indicator: false name: str_replace: template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 @@ -261,8 +264,6 @@ topology_template: get_input: port_vson_server_oam_net_port_00_vlan_requirements network_role_tag: get_input: port_vson_server_oam_net_port_00_network_role_tag - network: - get_input: oam_net_id order: get_input: port_vson_server_oam_net_port_00_order requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml index cffb1be0a7..4f102dd2d7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml @@ -248,6 +248,10 @@ topology_template: vson_server_oam_net_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_vson_server_oam_net_port_0_subnetpoolid + network: + get_input: oam_net_id ip_requirements: get_input: port_vson_server_oam_net_port_0_ip_requirements security_groups: @@ -263,10 +267,9 @@ topology_template: get_input: - oam_net_v6_ips - get_input: instance_index - subnetpoolid: - get_input: port_vson_server_oam_net_port_0_subnetpoolid mac_requirements: get_input: port_vson_server_oam_net_port_0_mac_requirements + subinterface_indicator: false name: str_replace: template: VNF_NAME_VNF_ID_SERVER_NAME_oam_net_port_0 @@ -285,8 +288,6 @@ topology_template: get_input: port_vson_server_oam_net_port_0_vlan_requirements network_role_tag: get_input: port_vson_server_oam_net_port_0_network_role_tag - network: - get_input: oam_net_id order: get_input: port_vson_server_oam_net_port_0_order requirements: |