diff options
| author |   eleonorali <eleonoral@amdocs.com> | 2018-03-12 11:54:42 +0200 |
|---|---|---|
| committer |   Avi Gaffa <avi.gaffa@amdocs.com> | 2018-03-12 13:51:38 +0000 |
| commit | c1b666ef958fed2ab60df66d71f5f9cfed244a34 (patch) | |
| tree | b1cef6d53d4983e58e6c77db10b87bc99ce8ef3b /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection | |
| parent | 24c63214edc0a69530a53b2f0386c8d354de80c7 (diff) | |
Support Dual stuck - for difference version (2)
E2E Defect 430981 - ip_requirments for multiple ports with difference version wasn't supported
Change-Id: If3e93f099900bc078de6da9092b9d1460609e232
Issue-ID: SDC-1096
Signed-off-by: eleonorali <eleonoral@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection')
12 files changed, 108 insertions, 3 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index 6afdedbb92..926d2d366f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml @@ -74,6 +74,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -103,6 +108,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -346,4 +356,4 @@ topology_template: - link link_cmaui_port_1: - cmaui_port_1 - - 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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index ec777b1687..0393ba0549 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -66,6 +66,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -951,4 +956,4 @@ topology_template: - link_cmaui_port_42_test_nested4Level_test_nested3Level link_cmaui_port_33_test_nested3Level_test_nested2Level: - test_nested2Level - - link_cmaui_port_33_test_nested3Level + - link_cmaui_port_33_test_nested3Level
\ 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/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index 17ada7bd4c..4938a3a47a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -66,6 +66,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -106,6 +111,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index a7237a75d4..6cb63bd3f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -120,6 +125,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index e83f84a38d..ce9ea1f51a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -65,6 +65,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -92,6 +97,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index 4b336ed76d..3d849cf2f1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -86,6 +86,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -113,6 +118,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -166,6 +176,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml index 4d6da778c1..77aac1da5d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -75,6 +75,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml index 85ae4ce91f..e4ea791be9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml @@ -160,6 +160,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index 8f88be74b4..b855753ac9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -90,6 +90,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -951,4 +956,4 @@ topology_template: - link_cmaui_port_42_test_nested4Level_test_nested3Level link_cmaui_port_33_test_nested3Level_test_nested2Level: - test_nested2Level - - link_cmaui_port_33_test_nested3Level + - link_cmaui_port_33_test_nested3Level
\ 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/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index c278666d03..4ffea52b64 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -66,6 +66,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -106,6 +111,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 81f5a1a7ca..faed8fff96 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -120,6 +125,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index 596cdf338d..2b8da8f642 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -65,6 +65,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -92,6 +97,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false security_groups: - get_input: security_group_name fixed_ips: |