diff options
author | eleonorali <eleonoral@amdocs.com> | 2018-04-10 15:19:51 +0300 |
---|---|---|
committer | Avi Gaffa <avi.gaffa@amdocs.com> | 2018-04-10 14:32:37 +0000 |
commit | 7a9073719da3db83024e66a1da9ba14546cfd175 (patch) | |
tree | 3d2b8e442fe7837c4ab041ac147ffe7a192bbbb0 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters | |
parent | 14f12f45bb7a41513d82b73f4c72b14c2e5584e3 (diff) |
Defect 451622: Fix for defect 430981 not correct
Only one default ipVersion - version4 should be created
Change-Id: I27aad6acdacf66cf48f71f0a17cdd414aa510f93
Issue-ID: SDC-1203
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/heatPseudoParameters')
4 files changed, 2 insertions, 82 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml index 3673d8213b..613c3f8749 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml @@ -133,11 +133,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: security_group @@ -169,11 +164,6 @@ topology_template: is_required: false 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 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml index a45aed6f28..b384057c2a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromMainHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml @@ -136,11 +136,6 @@ topology_template: is_required: false 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 mac_requirements: @@ -169,11 +164,6 @@ topology_template: is_required: false 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 mac_requirements: @@ -220,11 +210,6 @@ topology_template: is_required: false 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 mac_requirements: @@ -253,11 +238,6 @@ topology_template: is_required: false 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 fixed_ips: @@ -288,11 +268,6 @@ topology_template: is_required: false 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 mac_requirements: @@ -321,11 +296,6 @@ topology_template: is_required: false 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 fixed_ips: @@ -739,4 +709,4 @@ topology_template: - link local_storage_IOM: - IOM - - local_storage
\ No newline at end of file + - local_storage diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml index 3673d8213b..613c3f8749 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_CPM_base_template_nestedServiceTemplate.yaml @@ -133,11 +133,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: security_group @@ -169,11 +164,6 @@ topology_template: is_required: false 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 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml index 8c8a25a369..aefe6d5b4a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/heatPseudoParameters/usedFromNestedHeat/expectedoutputfiles/VSR_IOM_template_nestedServiceTemplate.yaml @@ -139,11 +139,6 @@ topology_template: is_required: false 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 mac_requirements: @@ -172,11 +167,6 @@ topology_template: is_required: false 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 mac_requirements: @@ -224,11 +214,6 @@ topology_template: is_required: false 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 mac_requirements: @@ -257,11 +242,6 @@ topology_template: is_required: false 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 fixed_ips: @@ -292,11 +272,6 @@ topology_template: is_required: false 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 mac_requirements: @@ -325,11 +300,6 @@ topology_template: is_required: false 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 fixed_ips: @@ -743,4 +713,4 @@ topology_template: - link local_storage_IOM: - IOM - - local_storage
\ No newline at end of file + - local_storage |