From c1b666ef958fed2ab60df66d71f5f9cfed244a34 Mon Sep 17 00:00:00 2001 From: eleonorali Date: Mon, 12 Mar 2018 11:54:42 +0200 Subject: 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 --- .../ResourceTranslationNeutronPortHelper.java | 196 +++--- ...UnifiedCompositionScalingInstancesFullTest.java | 2 +- .../ResourceTranslationNeutronPortImplTest.java | 11 + .../nested-pcm_v0.1ServiceTemplate.yaml | 12 +- .../nested-pcm_v0.1_2ServiceTemplate.yaml | 12 +- .../mvs.nested.heatServiceTemplate.yaml | 7 +- .../nested2levelServiceTemplate.yaml | 12 +- .../expectedoutputfiles/nestedServiceTemplate.yaml | 12 +- .../nested2levelServiceTemplate.yaml | 12 +- .../nested3levelServiceTemplate.yaml | 10 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 12 +- .../nested-pcm_v0.1ServiceTemplate.yaml | 12 +- .../nested-pcm_v0.1_2ServiceTemplate.yaml | 12 +- .../mvs.nested.heatServiceTemplate.yaml | 7 +- .../dns_nested_01ServiceTemplate.yaml | 12 +- .../mvs.nested.heatServiceTemplate.yaml | 7 +- .../mvs.nested.heatServiceTemplate.yaml | 7 +- .../nested-pcm_v0.1ServiceTemplate.yaml | 12 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 7 +- .../nested-pcm_v0.1ServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 32 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../nested-pcm_v0.1ServiceTemplate.yaml | 10 + .../nested-pcm_v0.2ServiceTemplate.yaml | 10 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 130 ++++ .../expectedoutputfiles/MainServiceTemplate.yaml | 30 + .../expectedoutputfiles/MainServiceTemplate.yaml | 15 + .../expectedOutput/MainServiceTemplate.yaml | 535 +++++++++++++++++ .../expectedOutput/MainServiceTemplate.yaml | 505 ++++++++++++++++ .../expectedOutput/eca_oamServiceTemplate.yaml | 32 +- .../nested1ServiceTemplate.yaml | 5 + .../nested2ServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../nested-pcm_v0.1ServiceTemplate.yaml | 10 + .../hot_templateServiceTemplate.yaml | 7 +- .../out/MainServiceTemplate.yaml | 132 +++- .../out/MainServiceTemplate.yaml | 17 +- .../out/MainServiceTemplate.yaml | 17 +- .../out/MainServiceTemplate.yaml | 15 + .../out/MainServiceTemplate.yaml | 15 + .../out/MainServiceTemplate.yaml | 5 + .../out/MainServiceTemplate.yaml | 5 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 82 ++- .../out/nested-no_vfc_v0.1ServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 82 ++- .../out/nested-no_vfc_v0.1ServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 82 ++- .../out/nested-no_vfc_v0.1ServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 157 ++++- .../out/nested-no_vfc_v0.1ServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 32 +- .../out/nested1-no-computeServiceTemplate.yaml | 10 + .../out/nested1ServiceTemplate.yaml | 32 +- .../out/nested2ServiceTemplate.yaml | 42 +- .../out/nested1ServiceTemplate.yaml | 10 + .../out/nested2ServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 10 + .../out/nested1ServiceTemplate.yaml | 10 + .../out/nested2ServiceTemplate.yaml | 10 + .../out/nested3ServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/nested1ServiceTemplate.yaml | 10 + .../out/nested2ServiceTemplate.yaml | 10 + .../out/nested3ServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 52 +- .../out/nested-no-computeServiceTemplate.yaml | 10 + .../out/nested1ServiceTemplate.yaml | 42 +- .../out/nested1ServiceTemplate.yaml | 32 +- .../out/MainServiceTemplate.yaml | 10 + .../out/nested-no-computeServiceTemplate.yaml | 10 + .../out/nested1ServiceTemplate.yaml | 32 +- .../out/nested1ServiceTemplate.yaml | 10 + .../out/nested1ServiceTemplate.yaml | 10 + .../out/nested1ServiceTemplate.yaml | 12 +- .../out/nested1ServiceTemplate.yaml | 10 + .../out/nested-other-file-1BServiceTemplate.yaml | 10 + .../out/nested-same-file-1BServiceTemplate.yaml | 10 + .../out/nested-other-file-1BServiceTemplate.yaml | 10 + .../out/nested-same-file-1BServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 25 + .../duplicateReqs/out/MainServiceTemplate.yaml | 231 ++++++- .../out/MainServiceTemplate.yaml | 55 ++ .../out/nested1ServiceTemplate.yaml | 10 + .../out/nested2ServiceTemplate.yaml | 10 + .../out/nested3ServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 45 ++ .../out/MainServiceTemplate.yaml | 35 ++ .../out/MainServiceTemplate.yaml | 35 ++ .../out/MainServiceTemplate.yaml | 15 + .../out/MainServiceTemplate.yaml | 15 + .../out/MainServiceTemplate.yaml | 5 + .../out/nested-pcm_v0.1ServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 5 + .../out/nested-pcm_v0.1ServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 35 ++ .../out/MainServiceTemplate.yaml | 35 ++ .../out/MainServiceTemplate.yaml | 25 + .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 22 +- .../out/MainServiceTemplate.yaml | 22 +- .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 5 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 15 + .../out/MainServiceTemplate.yaml | 15 + .../out/MainServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 20 + .../out/MainServiceTemplate.yaml | 10 + .../twoSetsOfSingle/out/MainServiceTemplate.yaml | 10 + .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../out/MainServiceTemplate.yaml | 12 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 7 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 30 + ...SR_CPM_base_template_nestedServiceTemplate.yaml | 12 +- .../VSR_IOM_template_nestedServiceTemplate.yaml | 32 +- ...SR_CPM_base_template_nestedServiceTemplate.yaml | 12 +- .../VSR_IOM_template_nestedServiceTemplate.yaml | 32 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 150 +++++ .../out/nested-oam_v1.0ServiceTemplate.yaml | 10 + .../out/nested-pcm_v1.0ServiceTemplate.yaml | 12 +- .../out/nested-ppd_v1.0ServiceTemplate.yaml | 42 +- .../out/nested-pps_v1.0ServiceTemplate.yaml | 5 + .../out/nested-psm_v1.0ServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 668 +++++++++++++++++++++ .../neutron_dual_stacks/inputfiles/MANIFEST.json | 27 + .../inputfiles/Use_Case_1_base.env | 8 + .../inputfiles/Use_Case_1_base.yaml | 49 ++ .../inputfiles/Use_Case_1_module.env | 16 + .../inputfiles/Use_Case_1_module.yaml | 167 ++++++ .../expectedoutputfiles/MainServiceTemplate.yaml | 15 + .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 20 + .../expectedoutputfiles/MainServiceTemplate.yaml | 20 + .../nested1ServiceTemplate.yaml | 10 + .../nested2ServiceTemplate.yaml | 10 + .../nested3ServiceTemplate.yaml | 10 + .../nested4ServiceTemplate.yaml | 10 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 15 + .../nested1ServiceTemplate.yaml | 10 + .../nested2ServiceTemplate.yaml | 10 + .../nested3ServiceTemplate.yaml | 10 + .../nested4ServiceTemplate.yaml | 10 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 10 + .../nested1ServiceTemplate.yaml | 10 + .../nested2ServiceTemplate.yaml | 10 + .../nested3ServiceTemplate.yaml | 10 + .../nested4ServiceTemplate.yaml | 10 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 10 + .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 12 +- .../expectedoutputfiles/nestedServiceTemplate.yaml | 5 + .../nested1ServiceTemplate.yaml | 15 + .../nested2ServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 12 +- .../nested1ServiceTemplate.yaml | 7 +- .../nested2ServiceTemplate.yaml | 10 + .../nested3ServiceTemplate.yaml | 10 + .../nested4ServiceTemplate.yaml | 10 + .../nested1ServiceTemplate.yaml | 15 + .../nested2ServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + .../nested1ServiceTemplate.yaml | 7 +- .../nested2ServiceTemplate.yaml | 10 + .../nested3ServiceTemplate.yaml | 10 + .../nested4ServiceTemplate.yaml | 10 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 5 + .../nested1ServiceTemplate.yaml | 17 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 20 + .../nested1ServiceTemplate.yaml | 10 + .../nested2ServiceTemplate.yaml | 10 + .../nested3ServiceTemplate.yaml | 10 + .../nested4ServiceTemplate.yaml | 10 + ...d_On_Module_QRouterTemplateServiceTemplate.yaml | 10 + ..._On_Module_vLBAgentTemplateServiceTemplate.yaml | 15 + ...FEAdd_On_Module_vLBTemplateServiceTemplate.yaml | 15 + ...dd_On_Module_vProbeTemplateServiceTemplate.yaml | 15 + .../expectedoutputfiles/MainServiceTemplate.yaml | 20 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 17 +- .../expectedoutputfiles/nestedServiceTemplate.yaml | 12 +- .../nested1ServiceTemplate.yaml | 10 + .../nested2ServiceTemplate.yaml | 10 + .../nested3ServiceTemplate.yaml | 10 + .../nested4ServiceTemplate.yaml | 10 + .../expectedoutputfiles/nestedServiceTemplate.yaml | 12 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 7 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 7 +- .../nested4ServiceTemplate.yaml | 2 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 130 ++++ .../out/nestedServiceTemplate.yaml | 7 +- .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + .../expectedoutputfiles/MainServiceTemplate.yaml | 5 + 233 files changed, 6054 insertions(+), 165 deletions(-) create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/expectedoutputfiles/MainServiceTemplate.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/MANIFEST.json create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_base.env create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_base.yaml create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.env create mode 100644 openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/ResourceTranslationNeutronPortHelper.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/ResourceTranslationNeutronPortHelper.java index 23f8e3695d..c6d59ff1fd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/ResourceTranslationNeutronPortHelper.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/helper/ResourceTranslationNeutronPortHelper.java @@ -32,36 +32,47 @@ public class ResourceTranslationNeutronPortHelper { public static final String MAC_REQUIREMENTS = "mac_requirements"; public void setAdditionalProperties(Map properties) { - setNetworkRoleTag(properties); + properties.putAll(createDefaultRequirments()); + populateFixedIpCount(properties); + populateFloatingIpCount(properties); + populateMacCount(properties); + populateNetworkRoleTag(properties); + + } + + private Map createDefaultRequirments() { + Map properties = new HashMap(); + List> ipRequirementsList = new ArrayList<>(); + ipRequirementsList.add(createIPRequirment(4)); + ipRequirementsList.add(createIPRequirment(6)); + properties.put(IP_REQUIREMENTS, ipRequirementsList); + properties.put(MAC_REQUIREMENTS, createMacRequirment()); + return properties; + + } + + private Map createIPRequirment(Object version) { Map ipRequirements = new HashMap(); - Map macRequirements = new HashMap(); Map isRequired = new HashMap(); Map floatingIsRequired = new HashMap(); - Map macIsRequired = new HashMap(); - isRequired.put(IS_REQUIRED, Boolean.FALSE); floatingIsRequired.put(IS_REQUIRED, Boolean.FALSE); - macIsRequired.put(IS_REQUIRED, Boolean.FALSE); - ipRequirements.put(IP_COUNT_REQUIRED, isRequired); ipRequirements.put(FLOATING_IP_COUNT_REQUIRED, floatingIsRequired); - ipRequirements.put(IP_VERSION, 4); - macRequirements.put(MAC_COUNT_REQUIRED, macIsRequired); - - List> ipRequirementsList = new ArrayList<>(); - ipRequirementsList.add(ipRequirements); - properties.put(IP_REQUIREMENTS , ipRequirementsList); - - properties.put(MAC_REQUIREMENTS , macRequirements); - - setIpVersion(properties); - setFloatingIpVersion(properties); + ipRequirements.put(IP_VERSION, version); + return ipRequirements; + } - setMacCount(properties); + private Map createMacRequirment() { + Map macRequirements = new HashMap(); + Map macIsRequired = new HashMap(); + macIsRequired.put(IS_REQUIRED, Boolean.FALSE); + macRequirements.put(MAC_COUNT_REQUIRED, macIsRequired); + return macRequirements; } - private void setMacCount(Map properties) { - if(properties.containsKey(MAC_ADDRESS)) { + private void populateMacCount(Map properties) { + if (properties.containsKey(MAC_ADDRESS)) { Map macRequirements = (Map) properties.get(MAC_REQUIREMENTS); Map macIsRequired = new HashMap(); macIsRequired.put(IS_REQUIRED, Boolean.TRUE); @@ -70,95 +81,102 @@ public class ResourceTranslationNeutronPortHelper { } } - private void setFloatingIpVersion(Map properties) { - List> ipRequirementsList = - (List>) properties.get(IP_REQUIREMENTS); - Map ipRequirements = ipRequirementsList.get(0); - Object propertyValue; - Map isRequired = new HashMap(); - isRequired.put(IS_REQUIRED, Boolean.TRUE); + private void populateFloatingIpCount(Map properties) { + populateIpCountRequired(properties, ALLOWED_ADDRESS_PAIRS, FLOATING_IP_COUNT_REQUIRED ); + } + + private void populateFixedIpCount(Map properties) { + populateIpCountRequired(properties, FIXED_IPS, IP_COUNT_REQUIRED ); + } - propertyValue = properties.get(ALLOWED_ADDRESS_PAIRS); + private void populateIpCountRequired(Map properties, String ipType, String ipCountRequired ){ + + HashMap > ipRequirmentsMap = getIPRequirments(properties); + Object propertyValue = properties.get(ipType); if (propertyValue instanceof Map && !((Map) propertyValue).isEmpty()) { - Map.Entry mapEntry = - (Map.Entry) ((Map) propertyValue).entrySet().iterator().next(); - if (getFloatingIpVersion(mapEntry.getValue()) != null) { - ipRequirements.put(IP_VERSION, getFloatingIpVersion(mapEntry.getValue())); - ipRequirements.put(FLOATING_IP_COUNT_REQUIRED, isRequired); - } + handleMapProperty(ipType, ipCountRequired, ipRequirmentsMap, (Map.Entry) ((Map) propertyValue).entrySet().iterator().next()); } else if (propertyValue instanceof List && !((List) propertyValue).isEmpty()) { - for (int i = 0; i < ((List) propertyValue).size(); i++) { - Object ipMap = ((List) propertyValue).get(i); - if(ipMap instanceof Map && !((Map) ipMap).isEmpty()) { - Object ipAddressMap = ((Map) ipMap).get(IP_ADDRESS); - if (ipAddressMap instanceof Map && !((Map) ipAddressMap).isEmpty()) { - Object ipList = ((Map) ipAddressMap).get(GET_INPUT); - if (ipList instanceof String && !((String) ipList).isEmpty()) { - if (getFloatingIpVersion(ipList) != null) { - ipRequirements.put(IP_VERSION, getFloatingIpVersion(ipList)); - ipRequirements.put(FLOATING_IP_COUNT_REQUIRED, isRequired); - } - } - } - } - } + handleListProperty(ipType, ipCountRequired, ipRequirmentsMap, (List) propertyValue); } } - private void setIpVersion(Map properties) { - List> ipRequirementsList = - (List>) properties.get(IP_REQUIREMENTS); - Map ipRequirements = ipRequirementsList.get(0); - Object propertyValue; - Map isRequired = new HashMap(); - isRequired.put(IS_REQUIRED, Boolean.TRUE); + private void handleListProperty(String ipType, String ipCountRequired, HashMap> ipRequirmentsMap, List propertyValue) { + for (int i = 0; i < propertyValue.size(); i++) { + handleIpAddress(ipType, ipCountRequired, ipRequirmentsMap, propertyValue.get(i)); + } + } - propertyValue = properties.get(FIXED_IPS); - if (propertyValue instanceof Map && !((Map) propertyValue).isEmpty()) { - Map.Entry mapEntry = - (Map.Entry) ((Map) propertyValue).entrySet().iterator().next(); - if (getIpVersion(mapEntry.getValue()) != null) { - ipRequirements.put(IP_VERSION, getIpVersion(mapEntry.getValue())); - ipRequirements.put(IP_COUNT_REQUIRED, isRequired); + private void handleMapProperty(String ipType, String ipCountRequired, HashMap> ipRequirmentsMap, Map.Entry mapEntry) { + updateIpCountRequired(ipType, ipCountRequired, ipRequirmentsMap, mapEntry.getValue()); + } + + private void handleIpAddress(String ipType, String ipCountRequired, HashMap> ipRequirmentsMap, Object ipMap) { + if(ipMap instanceof Map && !((Map) ipMap).isEmpty()) { + Object ipAddressMap = ((Map) ipMap).get(IP_ADDRESS); + if (ipAddressMap instanceof Map && !((Map) ipAddressMap).isEmpty()) { + Object ipList = ((Map) ipAddressMap).get(GET_INPUT); + handleIpCountRequired(ipType, ipCountRequired, ipRequirmentsMap, ipList); } } - else if (propertyValue instanceof List && !((List) propertyValue).isEmpty()) { - for (int i = 0; i < ((List) propertyValue).size(); i++) { - Object ipMap = ((List) propertyValue).get(i); - if(ipMap instanceof Map && !((Map) ipMap).isEmpty()) { - Object ipAddressMap = ((Map) ipMap).get(IP_ADDRESS); - if (ipAddressMap instanceof Map && !((Map) ipAddressMap).isEmpty()) { - Object ipList = ((Map) ipAddressMap).get(GET_INPUT); - if (ipList instanceof List && !((List) ipList).isEmpty()) { - if (getIpVersion(((List) ipList).get(0)) != null) { - ipRequirements.put(IP_VERSION, getIpVersion(((List) ipList).get(0))); - ipRequirements.put(IP_COUNT_REQUIRED, isRequired); - } - } - else if (ipList instanceof String && !((String) ipList).isEmpty()) { - if (getIpVersion(ipList) != null) { - ipRequirements.put(IP_VERSION, getIpVersion(ipList)); - ipRequirements.put(IP_COUNT_REQUIRED, isRequired); - } - } - } - } + } + + private void handleIpCountRequired(String ipType, String ipCountRequired, HashMap> ipRequirmentsMap, Object ipList) { + if (ipList instanceof List && !((List) ipList).isEmpty()) { + updateIpCountRequired(ipType, ipCountRequired, ipRequirmentsMap, ((List) ipList).get(0)); + } + else if (ipList instanceof String && !((String) ipList).isEmpty()) { + updateIpCountRequired(ipType, ipCountRequired, ipRequirmentsMap, ipList); + } + } + + private void updateIpCountRequired(String ipType, String ipCountRequired, HashMap> ipRequirmentsMap, Object ipList) { + Object ipVersion = getVersion(ipList, ipType); + updateIpCountRequiredForVersion(ipCountRequired, ipRequirmentsMap, ipVersion); + } + + private void updateIpCountRequiredForVersion(String ipCountRequired, HashMap> ipRequirmentsMap, Object ipVersion) { + Map ipRequirement; + if (ipVersion != null) { + ipRequirement = ipRequirmentsMap.get(ipVersion); + if (ipRequirement != null) { + Map isIPCountRequired = (Map)ipRequirement.get(ipCountRequired); + isIPCountRequired.put(IS_REQUIRED, Boolean.TRUE); } } } - private void setNetworkRoleTag(Map properties) { + private HashMap > getIPRequirments (Map properties) { + + HashMap> ipRequirmentsMap = new HashMap(); + List> ipRequirmentsList = ((List>) properties.get(IP_REQUIREMENTS)); + ipRequirmentsList.stream().forEach(e->ipRequirmentsMap.put(e.get(IP_VERSION),e)); + return ipRequirmentsMap; + } + + private void populateNetworkRoleTag(Map properties) { Object propertyValue = properties.get(NETWORK); if (propertyValue instanceof Map && !((Map) propertyValue).isEmpty()) { Map.Entry mapEntry = - (Map.Entry) ((Map) propertyValue).entrySet().iterator().next(); + (Map.Entry) ((Map) propertyValue).entrySet().iterator().next(); if (mapEntry.getValue() instanceof String && getNetworkRole(mapEntry.getValue())!=null) { properties.put(NETWORK_ROLE_TAG, getNetworkRole(mapEntry.getValue())); } } } + private Object getVersion(Object value, String type) { + + Object version = null; + if(type.equals(FIXED_IPS)){ + version = getIpVersion(value); + } + else if(type.equals(ALLOWED_ADDRESS_PAIRS)){ + version = getFloatingIpVersion(value); + } + return version; + } + private Object getFloatingIpVersion(Object value) { Object ipVersion = null; if(value instanceof String) { @@ -188,13 +206,13 @@ public class ResourceTranslationNeutronPortHelper { private Object getNetworkRole(String value) { Object networkRole = null; if(value.endsWith(NET_NAME)) { - networkRole = (Object) value.substring(0, value.length() - NET_NAME.length()); + networkRole = value.substring(0, value.length() - NET_NAME.length()); } else if(value.endsWith(NET_ID)) { - networkRole = (Object) value.substring(0, value.length() - NET_ID.length()); + networkRole = value.substring(0, value.length() - NET_ID.length()); } else if(value.endsWith(NET_FQDN)) { - networkRole = (Object) value.substring(0, value.length() - NET_FQDN.length()); + networkRole = value.substring(0, value.length() - NET_FQDN.length()); } return networkRole; } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionScalingInstancesFullTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionScalingInstancesFullTest.java index 74eacd9481..2935dadc38 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionScalingInstancesFullTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/fulltest/UnifiedCompositionScalingInstancesFullTest.java @@ -55,7 +55,7 @@ public class UnifiedCompositionScalingInstancesFullTest extends BaseFullTranslat b. Property with getAttr from Compute2 c. Property with getAttr from port */ - testTranslationWithInit(BASE_DIRECTORY + "oneComputeTypeOnePortGetAttrIn"); + testTranslationWithInit(BASE_DIRECTORY + "oneComputeTypeOnePortGetAttrIn"); } @Test diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronPortImplTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronPortImplTest.java index 97a59c3934..96e7af7414 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronPortImplTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationNeutronPortImplTest.java @@ -57,4 +57,15 @@ public class ResourceTranslationNeutronPortImplTest extends BaseResourceTranslat validatePortTemplateConsolidationData(ConsolidationDataValidationType .VALIDATE_CONNECTIVITY, TEST_CONNECTIVITY_POSITIVE); } + + @Test + public void testTranslateDualStacks() throws Exception { + inputFilesPath = "/mock/services/heattotosca/neutron_dual_stacks/inputfiles"; + outputFilesPath = + "/mock/services/heattotosca/neutron_dual_stacks/expectedoutputfiles"; + initTranslatorAndTranslate(); + testTranslation(); + validatePortTemplateConsolidationData(ConsolidationDataValidationType + .VALIDATE_CONNECTIVITY, TEST_CONNECTIVITY_POSITIVE); + } } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 4fec5b52c3..ef3d1f6c60 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -99,6 +99,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: @@ -124,6 +129,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: @@ -383,4 +393,4 @@ topology_template: - link local_storage_server_pcm_1: - server_pcm_1 - - 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/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index c8f63361d5..9e8bb123dd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multi/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -85,6 +85,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: @@ -123,6 +128,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: @@ -369,4 +379,4 @@ topology_template: - dependency local_storage_server_pcm_2: - server_pcm_2 - - 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/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index ea7b1c9be0..74283924ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/multiple_resource_groups/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -219,6 +219,11 @@ topology_template: is_required: false 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: sec_groups fixed_ips: @@ -462,4 +467,4 @@ topology_template: - link dependency_boot_volume: - boot_volume - - 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/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index f360724a3b..4e745408ea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -78,6 +78,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: shared_security_group_id1 - get_input: p2 @@ -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: shared_security_group_id1 fixed_ips: @@ -349,4 +359,4 @@ topology_template: - local_storage dependency_server_cmaui_2: - server_cmaui_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/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml index aa8cf3245c..27a8e225d1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested2levels/expectedoutputfiles/nestedServiceTemplate.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: shared_security_group_id1 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: shared_security_group_id1 - get_input: p2 @@ -590,4 +600,4 @@ topology_template: - dependency dependency_cmaui_port_2: - cmaui_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/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml index 6eaa43fa49..aaa758090d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested2levelServiceTemplate.yaml @@ -89,6 +89,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: shared_security_group_id1 - get_input: p2 @@ -117,6 +122,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: shared_security_group_id1 fixed_ips: @@ -580,4 +590,4 @@ topology_template: - dependency_cmaui_port_322 dependency_server_cmaui_2: - server_cmaui_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/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml index 59344ca13c..81ba3f4d07 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nested3levelServiceTemplate.yaml @@ -78,6 +78,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: shared_security_group_id1 - get_input: p2 @@ -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: shared_security_group_id1 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml index dccdb95085..a09fbad5fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/nested3levels/expectedoutputfiles/nestedServiceTemplate.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: shared_security_group_id1 fixed_ips: @@ -116,6 +121,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: shared_security_group_id1 - get_input: p2 @@ -799,4 +809,4 @@ topology_template: - dependency link_cmaui_port_211_test_nested2: - test_nested2 - - link_cmaui_port_211 + - link_cmaui_port_211 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index bc34c490e9..69d7786fbd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -111,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: @@ -177,6 +182,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: @@ -674,4 +684,4 @@ topology_template: - dependency link_pcm_port_01_server_pcm_005: - server_pcm_005 - - link_pcm_port_01 + - link_pcm_port_01 \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml index ca72528fd8..6325a90bc9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/recursive/expectedoutputfiles/nested-pcm_v0.1_2ServiceTemplate.yaml @@ -85,6 +85,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: @@ -128,6 +133,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: @@ -390,4 +400,4 @@ topology_template: - dependency dependency_network_2: - network_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/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 521c13eab2..e803f80172 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupIndexVar/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -156,6 +156,11 @@ topology_template: is_required: false 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: sec_groups fixed_ips: @@ -384,4 +389,4 @@ topology_template: - local_storage link_mgmt_port: - mgmt_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/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml index 020c022d37..eb13585bbc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resourceGroupMDNS/expectedoutputfiles/dns_nested_01ServiceTemplate.yaml @@ -114,6 +114,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 fixed_ips: @@ -147,6 +152,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 fixed_ips: @@ -425,4 +435,4 @@ topology_template: - link dependency_dns_int_bearer_0_port: - dns_int_bearer_0_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/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index 521c13eab2..e803f80172 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -156,6 +156,11 @@ topology_template: is_required: false 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: sec_groups fixed_ips: @@ -384,4 +389,4 @@ topology_template: - local_storage link_mgmt_port: - mgmt_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/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml index ea7b1c9be0..74283924ae 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/resource_group_with_dynamic_count/expectedoutputfiles/mvs.nested.heatServiceTemplate.yaml @@ -219,6 +219,11 @@ topology_template: is_required: false 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: sec_groups fixed_ips: @@ -462,4 +467,4 @@ topology_template: - link dependency_boot_volume: - boot_volume - - 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/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 6283861921..aa195d50e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/reusenestedfrommultibase/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -99,6 +99,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: @@ -137,6 +142,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: @@ -383,4 +393,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_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/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml index 973d8c0409..e4d0747ac2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/MainServiceTemplate.yaml @@ -303,6 +303,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -359,4 +364,4 @@ topology_template: value: get_attribute: - server_pcm_001 - - pcm_vol + - pcm_vol \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 6283861921..8be5a4fa56 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/nested/single/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -99,6 +99,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: @@ -137,6 +142,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/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml index ac73bf2b00..1bfe72d554 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/allHeatsAreBase/expectedoutputfiles/MainServiceTemplate.yaml @@ -929,6 +929,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -949,6 +954,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -969,6 +979,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1003,6 +1018,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1051,6 +1071,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1071,6 +1096,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1109,4 +1139,4 @@ topology_template: members: - pd03_port_0 - server_pd_02 - - pd04_port_0 \ No newline at end of file + - pd04_port_0 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml index 632cd40e0c..c28ffa1a53 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/MainServiceTemplate.yaml @@ -261,6 +261,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -306,6 +311,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index 1582a7e4b7..fdb9c308e0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -107,6 +107,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: @@ -145,6 +150,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/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml index 8bdff8f08b..c1a99f3c45 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/multipleHeatWithNested/expectedoutputfiles/nested-pcm_v0.2ServiceTemplate.yaml @@ -99,6 +99,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: @@ -124,6 +129,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/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml index ae852574f3..c84dac25ad 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/parameters/nestedWithAssociatedHeat/expectedoutputfiles/nestedServiceTemplate.yaml @@ -152,6 +152,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/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml index 27582261d8..d8fda4f6fc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Contrail_VirtualNetwork/expectedoutputfiles/MainServiceTemplate.yaml @@ -1452,6 +1452,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 fixed_ips: - ip_address: get_input: vlc2-oam-ip @@ -1493,6 +1498,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1517,6 +1527,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1541,6 +1556,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1565,6 +1585,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1589,6 +1614,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 fixed_ips: - ip_address: get_input: vlc2-gtp-ip @@ -1649,6 +1679,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 fixed_ips: - ip_address: get_input: fsb1-oam-ip @@ -1713,6 +1748,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1737,6 +1777,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1772,6 +1817,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1796,6 +1846,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1859,6 +1914,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1901,6 +1961,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1925,6 +1990,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 fixed_ips: - ip_address: get_input: vlc1-sctp-b-ip @@ -1950,6 +2020,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 fixed_ips: - ip_address: get_input: vlc2-sctp-b-ip @@ -1975,6 +2050,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 fixed_ips: - ip_address: get_input: vlc1-sctp-a-ip @@ -2000,6 +2080,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 fixed_ips: - ip_address: get_input: vlc2-sctp-a-ip @@ -2036,6 +2121,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2071,6 +2161,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2095,6 +2190,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2119,6 +2219,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2143,6 +2248,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 fixed_ips: - ip_address: get_input: vlc1-oam-ip @@ -2206,6 +2316,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 fixed_ips: - ip_address: get_input: vlc1-gtp-ip @@ -2231,6 +2346,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 fixed_ips: - ip_address: get_input: fsb2-oam-ip @@ -2254,6 +2374,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2278,6 +2403,11 @@ 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 mac_requirements: mac_count_required: is_required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml index bc90c39153..88c07a0490 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/OS_Nova_Server/expectedoutputfiles/MainServiceTemplate.yaml @@ -708,6 +708,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: @@ -738,6 +743,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -767,6 +777,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -791,6 +806,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 fixed_ips: - ip_address: get_input: fsb1-oam-ip @@ -814,6 +834,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: pcrf_security_group_name fixed_ips: @@ -839,6 +864,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/heat/resources/Port/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/expectedoutputfiles/MainServiceTemplate.yaml index 48d0f4f4ef..817536dac2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/heat/resources/Port/expectedoutputfiles/MainServiceTemplate.yaml @@ -28,6 +28,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: @@ -51,6 +56,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: @@ -83,6 +93,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/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml index 863200c011..816106ec02 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml @@ -2468,6 +2468,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: @@ -2496,6 +2501,11 @@ topology_template: 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_name fixed_ips: @@ -2527,6 +2537,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: @@ -2557,6 +2572,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: @@ -2603,6 +2623,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: @@ -2633,6 +2658,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: @@ -2663,6 +2693,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: @@ -2693,6 +2728,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: @@ -2721,6 +2761,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: @@ -2749,6 +2794,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: @@ -2779,6 +2829,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: @@ -2809,6 +2864,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: @@ -2884,6 +2944,11 @@ topology_template: 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_name fixed_ips: @@ -2915,6 +2980,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: @@ -2943,6 +3013,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: @@ -2987,6 +3062,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: @@ -3043,6 +3123,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: @@ -3071,6 +3156,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: @@ -3101,6 +3191,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: @@ -3129,6 +3224,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: @@ -3157,6 +3257,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: @@ -3185,6 +3290,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: @@ -3213,6 +3323,11 @@ topology_template: 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_name fixed_ips: @@ -3265,6 +3380,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: @@ -3293,6 +3413,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: @@ -3323,6 +3448,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: @@ -3359,6 +3489,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: @@ -3387,6 +3522,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: @@ -3415,6 +3555,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: @@ -3443,6 +3588,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: @@ -3471,6 +3621,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: @@ -3499,6 +3654,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: @@ -3527,6 +3687,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: @@ -3557,6 +3722,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: @@ -3587,6 +3757,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: @@ -3617,6 +3792,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: @@ -3645,6 +3825,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: @@ -3675,6 +3860,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: @@ -3703,6 +3893,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: @@ -3737,6 +3932,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: @@ -3767,6 +3967,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: @@ -3817,6 +4022,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: @@ -3845,6 +4055,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: @@ -3879,6 +4094,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: @@ -3907,6 +4127,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: @@ -3935,6 +4160,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: @@ -4007,6 +4237,11 @@ topology_template: - ip_version: 4 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: @@ -4066,6 +4301,11 @@ topology_template: 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_name fixed_ips: @@ -4095,6 +4335,11 @@ topology_template: - ip_version: 4 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: @@ -4154,6 +4399,11 @@ topology_template: 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_name fixed_ips: @@ -4201,6 +4451,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: @@ -4311,6 +4566,11 @@ topology_template: - ip_version: 4 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: @@ -4370,6 +4630,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: @@ -4398,6 +4663,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: @@ -4428,6 +4698,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: @@ -4456,6 +4731,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: @@ -4484,6 +4764,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: @@ -4512,6 +4797,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: @@ -4540,6 +4830,11 @@ topology_template: 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_name fixed_ips: @@ -4587,6 +4882,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: @@ -4617,6 +4917,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: @@ -4647,6 +4952,11 @@ topology_template: 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_name fixed_ips: @@ -4678,6 +4988,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: @@ -4706,6 +5021,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: @@ -4734,6 +5054,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: @@ -4800,6 +5125,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: @@ -4826,6 +5156,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: @@ -4876,6 +5211,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: @@ -4904,6 +5244,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: @@ -4932,6 +5277,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: @@ -4982,6 +5332,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: @@ -5010,6 +5365,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: @@ -5040,6 +5400,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: @@ -5086,6 +5451,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: @@ -5164,6 +5534,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: @@ -5192,6 +5567,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: @@ -5220,6 +5600,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: @@ -5248,6 +5633,11 @@ topology_template: - ip_version: 4 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: @@ -5307,6 +5697,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: @@ -5335,6 +5730,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: @@ -5365,6 +5765,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: @@ -5393,6 +5798,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: @@ -5423,6 +5833,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: @@ -5453,6 +5868,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: @@ -5481,6 +5901,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: @@ -5525,6 +5950,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: @@ -5553,6 +5983,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: @@ -5613,6 +6048,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: @@ -5679,6 +6119,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: @@ -5773,6 +6218,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: @@ -5801,6 +6251,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: @@ -5829,6 +6284,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: @@ -5857,6 +6317,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: @@ -5887,6 +6352,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: @@ -5915,6 +6385,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: @@ -5943,6 +6418,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: @@ -5973,6 +6453,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: @@ -6003,6 +6488,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: @@ -6079,6 +6569,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: @@ -6107,6 +6602,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: @@ -6135,6 +6635,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: @@ -6165,6 +6670,11 @@ topology_template: 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_name fixed_ips: @@ -6196,6 +6706,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: @@ -6242,6 +6757,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: @@ -6270,6 +6790,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: @@ -6319,6 +6844,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: @@ -6347,6 +6877,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/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml index 9fcd17b5a0..ccaa73eb34 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml @@ -2194,6 +2194,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: @@ -2222,6 +2227,11 @@ topology_template: 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_name fixed_ips: @@ -2253,6 +2263,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: @@ -2283,6 +2298,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: @@ -2329,6 +2349,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: @@ -2359,6 +2384,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: @@ -2389,6 +2419,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: @@ -2419,6 +2454,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: @@ -2447,6 +2487,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: @@ -2475,6 +2520,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: @@ -2505,6 +2555,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: @@ -2535,6 +2590,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: @@ -2610,6 +2670,11 @@ topology_template: 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_name fixed_ips: @@ -2641,6 +2706,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: @@ -2685,6 +2755,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: @@ -2741,6 +2816,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: @@ -2769,6 +2849,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: @@ -2799,6 +2884,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: @@ -2827,6 +2917,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: @@ -2855,6 +2950,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: @@ -2883,6 +2983,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: @@ -2911,6 +3016,11 @@ topology_template: 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_name fixed_ips: @@ -2942,6 +3052,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: @@ -2970,6 +3085,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: @@ -3000,6 +3120,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: @@ -3030,6 +3155,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: @@ -3058,6 +3188,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: @@ -3086,6 +3221,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: @@ -3114,6 +3254,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: @@ -3142,6 +3287,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: @@ -3170,6 +3320,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: @@ -3198,6 +3353,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: @@ -3228,6 +3388,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: @@ -3258,6 +3423,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: @@ -3288,6 +3458,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: @@ -3316,6 +3491,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: @@ -3346,6 +3526,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: @@ -3380,6 +3565,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: @@ -3462,6 +3652,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: @@ -3490,6 +3685,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: @@ -3524,6 +3724,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: @@ -3552,6 +3757,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: @@ -3580,6 +3790,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: @@ -3652,6 +3867,11 @@ topology_template: - ip_version: 4 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: @@ -3711,6 +3931,11 @@ topology_template: 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_name fixed_ips: @@ -3740,6 +3965,11 @@ topology_template: - ip_version: 4 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: @@ -3799,6 +4029,11 @@ topology_template: 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_name fixed_ips: @@ -3846,6 +4081,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: @@ -3944,6 +4184,11 @@ topology_template: - ip_version: 4 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: @@ -4003,6 +4248,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: @@ -4031,6 +4281,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: @@ -4061,6 +4316,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: @@ -4089,6 +4349,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: @@ -4117,6 +4382,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: @@ -4145,6 +4415,11 @@ topology_template: 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_name fixed_ips: @@ -4192,6 +4467,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: @@ -4222,6 +4502,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: @@ -4252,6 +4537,11 @@ topology_template: 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_name fixed_ips: @@ -4283,6 +4573,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: @@ -4311,6 +4606,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: @@ -4377,6 +4677,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: @@ -4403,6 +4708,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: @@ -4453,6 +4763,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: @@ -4481,6 +4796,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: @@ -4509,6 +4829,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: @@ -4559,6 +4884,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: @@ -4587,6 +4917,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: @@ -4617,6 +4952,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: @@ -4663,6 +5003,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: @@ -4741,6 +5086,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: @@ -4769,6 +5119,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: @@ -4797,6 +5152,11 @@ topology_template: - ip_version: 4 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: @@ -4856,6 +5216,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: @@ -4884,6 +5249,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: @@ -4914,6 +5284,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: @@ -4942,6 +5317,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: @@ -4972,6 +5352,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: @@ -5002,6 +5387,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: @@ -5030,6 +5420,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: @@ -5074,6 +5469,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: @@ -5097,6 +5497,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: @@ -5157,6 +5562,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: @@ -5223,6 +5633,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: @@ -5317,6 +5732,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: @@ -5345,6 +5765,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: @@ -5373,6 +5798,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: @@ -5401,6 +5831,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: @@ -5431,6 +5866,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: @@ -5459,6 +5899,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: @@ -5487,6 +5932,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: @@ -5517,6 +5967,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: @@ -5547,6 +6002,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: @@ -5623,6 +6083,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: @@ -5651,6 +6116,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: @@ -5679,6 +6149,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: @@ -5709,6 +6184,11 @@ topology_template: 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_name fixed_ips: @@ -5740,6 +6220,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: @@ -5786,6 +6271,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: @@ -5814,6 +6304,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: @@ -5842,6 +6337,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: @@ -5870,6 +6370,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/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml index 9b69834f06..b837fb195f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml @@ -226,6 +226,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: @@ -254,6 +259,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: @@ -342,6 +352,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: @@ -370,6 +385,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: @@ -398,6 +418,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: @@ -426,6 +451,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: @@ -1169,4 +1199,4 @@ topology_template: - local_storage dependency_arb_int_port: - arb_int_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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index 696a130ed4..b8581fef09 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -177,6 +177,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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/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/VMInterfaceToNettworkConnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/VMInterfaceToNettworkConnection/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/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml index 2ffe57da05..df2b8d324b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/baseResourceTranslation/expectedoutputfiles/MainServiceTemplate.yaml @@ -271,6 +271,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/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml index 05c19de84c..9d41ce4974 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/multiplecompute/expectedoutputfiles/MainServiceTemplate.yaml @@ -335,6 +335,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -358,6 +363,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml index 1410f714de..4092daeb17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/noDependency/expectedoutputfiles/MainServiceTemplate.yaml @@ -310,6 +310,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -329,6 +334,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml index 6e00f44eea..05d7a0f574 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedIn/expectedoutputfiles/MainServiceTemplate.yaml @@ -119,6 +119,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -149,6 +154,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml index 32d1f50c82..7942b2b261 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedInOut/expectedoutputfiles/MainServiceTemplate.yaml @@ -320,6 +320,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -339,6 +344,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml index 7b75e051f7..c2933f3d32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/nodesConnectedOut/expectedoutputfiles/MainServiceTemplate.yaml @@ -319,6 +319,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -338,6 +343,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml index 4e45d6ca2c..1dbd9fe30e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/removeInvalidDependencyFromTosca/expectedoutputfiles/MainServiceTemplate.yaml @@ -116,6 +116,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -131,6 +136,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml index 7e0ac24cc7..035764be51 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/dependsonresource/translationorderinvariance/expectedoutputfiles/MainServiceTemplate.yaml @@ -319,6 +319,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -338,6 +343,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml index a31add8507..aa195d50e5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/buildconsolidationdata/getattribute/noneToPortOrCompute/expectedoutputfiles/nested-pcm_v0.1ServiceTemplate.yaml @@ -99,6 +99,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: @@ -137,6 +142,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/contrailv2Vlan/oneInterface/expectedoutputfiles/hot_templateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/oneInterface/expectedoutputfiles/hot_templateServiceTemplate.yaml index f06468c7e1..9c92c8d3bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/oneInterface/expectedoutputfiles/hot_templateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/contrailv2Vlan/oneInterface/expectedoutputfiles/hot_templateServiceTemplate.yaml @@ -218,6 +218,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: @@ -514,4 +519,4 @@ topology_template: - binding binding_template_VMInt_OAM_lb_3: - template_VMInt_OAM_lb_3 - - binding \ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml index ef413aaa1c..3557f27f17 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -767,6 +767,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: data_security_groups fixed_ips: @@ -794,6 +799,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: data_security_groups fixed_ips: @@ -831,6 +841,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: oam_security_groups fixed_ips: @@ -904,6 +919,11 @@ topology_template: - substitutable properties: port_iox_data_0_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -932,6 +952,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: iox_image_name port_iox_oam_0_port_name: @@ -1020,6 +1045,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 port_iox_data_0_port_network_role_tag: data service_template_filter: substitute_service_template: Nested_ioxServiceTemplate.yaml @@ -1050,6 +1080,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1091,6 +1126,11 @@ 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 port_app_internal_0_port_allowed_address_pairs: - ip_address: get_input: internal_subnet_cidr @@ -1106,6 +1146,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 port_app_internal_0_port_network: - internal_net_0 port_app_data_0_port_security_groups: @@ -1163,6 +1208,11 @@ topology_template: is_required: false 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: plt_security_groups mac_requirements: @@ -1189,6 +1239,11 @@ topology_template: - substitutable properties: port_iox_data_0_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -1217,6 +1272,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false vm_image_name: get_input: iox_image_name port_iox_oam_0_port_name: @@ -1300,6 +1360,11 @@ 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 port_iox_data_0_port_network_role_tag: data service_template_filter: substitute_service_template: Nested_ioxServiceTemplate.yaml @@ -1330,6 +1395,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1371,6 +1441,11 @@ topology_template: vf_module_name: get_input: vf_module_name port_app_data_0_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -1391,6 +1466,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 port_app_internal_0_port_network: - internal_net_0 port_app_data_0_port_security_groups: @@ -1454,6 +1534,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1495,6 +1580,11 @@ topology_template: vf_module_name: get_input: vf_module_name port_app_data_0_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -1515,6 +1605,11 @@ 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 port_app_internal_0_port_network: - internal_net_0 port_app_data_0_port_security_groups: @@ -1616,6 +1711,11 @@ 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 port_plt_data_0_port_mac_requirements: mac_count_required: is_required: false @@ -1627,6 +1727,11 @@ topology_template: - 0 - ip_address port_plt_data_0_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -1656,6 +1761,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_plt_oam_0_port_network_role_tag: oam port_plt_internal_0_port_name: - str_replace: @@ -1747,6 +1857,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 port_plt_data_0_port_mac_requirements: mac_count_required: is_required: false @@ -1758,6 +1873,11 @@ topology_template: - 0 - ip_address port_plt_data_0_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -1787,6 +1907,11 @@ topology_template: is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false port_plt_oam_0_port_fixed_ips: - ip_address: get_input: @@ -1856,6 +1981,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: oam_security_groups fixed_ips: @@ -1944,4 +2074,4 @@ topology_template: get_input: vnf_name container_type: host targets: - - app_server_group_group + - app_server_group_group \ 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/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml index 616ac37069..4ac6d1cefc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml @@ -160,6 +160,11 @@ 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 port_pd01_port_network: - packet_internal_network compute_pd_server_user_data_format: @@ -201,6 +206,11 @@ 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 port_pd01_port_network: - packet_internal_network compute_pd_server_user_data_format: @@ -242,6 +252,11 @@ 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 port_pd01_port_network: - packet_internal_network compute_pd_server_user_data_format: @@ -269,4 +284,4 @@ topology_template: - packet_internal_network - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_2 \ 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/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml index 28836651f6..f4da23c7be 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -346,6 +346,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -390,6 +395,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -429,6 +439,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -452,4 +467,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2 + - abstract_pd_server_2 \ 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/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml index 3ae6fa0b26..163815ac07 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml @@ -151,6 +151,11 @@ 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 port_pd01_port_network: - packet_external_network compute_pd_server_user_data_format: @@ -197,6 +202,11 @@ 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 port_pd01_port_network: - packet_internal_network compute_pd_server_user_data_format: @@ -238,6 +248,11 @@ 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 port_pd01_port_network: - packet_internal_network compute_pd_server_user_data_format: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml index 172582fd24..cbffa79eb2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml @@ -140,6 +140,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -182,6 +187,11 @@ 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 port_pd01_port_network: - packet_internal_network compute_pd_server_user_data_format: @@ -227,6 +237,11 @@ 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 port_pd01_port_network: - packet_internal_network compute_pd_server_user_data_format: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml index 97fcee7365..7e9e3ffb2b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNestedToNested/out/MainServiceTemplate.yaml @@ -589,6 +589,11 @@ topology_template: 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 compute_sbg_sc_metadata: - vf_module_id: get_input: vf_module_id diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml index 0741732d8b..495bfae010 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromNovaToNestedPort/out/MainServiceTemplate.yaml @@ -326,6 +326,11 @@ topology_template: 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 compute_sbg_sc_metadata: - vf_module_id: get_input: vf_module_id diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml index 82cb2a4fa6..c4d6a232e3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromPortToNested/out/MainServiceTemplate.yaml @@ -567,6 +567,11 @@ topology_template: 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 port_sbg_sc_management_1_port_mac_address: get_input: - sbg_management_mac_addresses @@ -595,6 +600,11 @@ topology_template: 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 compute_sbg_sc_metadata: - vf_module_id: get_input: vf_module_id diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml index d070beaf9e..3898eb4260 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dependsOnFromVfcToNested/out/MainServiceTemplate.yaml @@ -567,6 +567,11 @@ topology_template: 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 port_sbg_sc_management_1_port_mac_address: get_input: - sbg_management_mac_addresses @@ -595,6 +600,11 @@ topology_template: 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 compute_sbg_sc_metadata: - vf_module_id: get_input: vf_module_id @@ -641,12 +651,22 @@ topology_template: 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 port_sbg_sc_management_1_port_01_ip_requirements: - ip_version: 4 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 nested_sbg_AVPN_vlan_tag_list: get_input: sbg_AVPN_vlan_tag_list port_sbg_sc_internal_0_port_01_mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml index 1802188f23..fdd682a34a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/dynamicPorts/dynamicPortsWithDependsOn/out/MainServiceTemplate.yaml @@ -977,6 +977,11 @@ topology_template: 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 port_sbg_sc_management_1_port_mac_address: get_input: - sbg_management_mac_addresses @@ -1005,6 +1010,11 @@ topology_template: 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 compute_sbg_sc_metadata: - vf_module_id: get_input: vf_module_id @@ -1043,6 +1053,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1061,6 +1076,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 fixed_ips: - ip_address: get_input: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml index ed685d7194..7bd4091fee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml @@ -224,6 +224,11 @@ 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 vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -241,6 +246,11 @@ 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 compute_b_single_1b_metadata: - connectivityTo4PNested: get_attribute: @@ -305,11 +315,21 @@ 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 - - ip_version: 4 ip_count_required: 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 vm_image_name: get_input: pd_image_name compute_1c1_scalling_instance_name: @@ -352,11 +372,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_1c1_t1_port_mac_requirements: mac_count_required: is_required: false @@ -431,6 +461,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 server_group: BE_Affinity_group connectivityChk: connectivityTo1C2_1: @@ -476,6 +511,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 port_pcm_port_00_network_role_tag: cps pcm_flavor_name: get_input: pcm_flavor_name @@ -512,6 +552,11 @@ 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 port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -564,6 +609,11 @@ 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 compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -596,6 +646,11 @@ 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 port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -621,6 +676,11 @@ 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 compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -807,6 +867,11 @@ 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 port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -825,6 +890,11 @@ 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 compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -1024,6 +1094,11 @@ 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 vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -1041,6 +1116,11 @@ 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 port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a @@ -1180,4 +1260,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 8c6d8cd84c..bbb3a4b6a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -133,6 +133,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 port_pcm_port_1_security_groups: - - get_input: security_group_name compute_pcma_server_config_drive: @@ -158,6 +163,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 service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -193,6 +203,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 port_pcm_port_2_mac_requirements: mac_count_required: is_required: false @@ -212,6 +227,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 port_pcm_port_2_network_role_tag: cps port_pcm_port_3_network: - get_input: oam_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml index 040bf1940a..ee110eb739 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/MainServiceTemplate.yaml @@ -256,6 +256,11 @@ 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 vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: @@ -264,6 +269,11 @@ 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 vm_image_name: get_input: pd_image_name port_1b_t1_port_mac_requirements: @@ -307,11 +317,21 @@ 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 - - ip_version: 4 ip_count_required: 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 vm_image_name: get_input: pd_image_name compute_1c1_scalling_instance_name: @@ -354,11 +374,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_1c1_t1_port_mac_requirements: mac_count_required: is_required: false @@ -414,6 +444,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 pcm_image_name: get_input: pcm_image_name security_group_name: jsa_security_group @@ -430,6 +465,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -461,6 +501,11 @@ 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 port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -484,6 +529,11 @@ 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 compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -516,6 +566,11 @@ 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 port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -541,6 +596,11 @@ 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 compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -704,6 +764,11 @@ 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 port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -722,6 +787,11 @@ 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 compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -862,6 +932,11 @@ 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 vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -879,6 +954,11 @@ 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 port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: @@ -1021,4 +1101,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 96bccb85ef..0c6ec3a2fd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -131,6 +131,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 compute_pcma_server_config_drive: - true compute_pcma_server_user_data_format: @@ -151,6 +156,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 port_pcm_port_0_mac_requirements: mac_count_required: is_required: false @@ -189,6 +199,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 port_pcm_port_2_mac_requirements: mac_count_required: is_required: false @@ -208,6 +223,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 port_pcm_port_2_network_role_tag: cps port_pcm_port_3_network: - get_input: oam_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml index 85fb0d54bf..f4cf709b24 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml @@ -229,6 +229,11 @@ 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 vm_flavor_name: get_input: pd_flavor_name port_1b_t1_port_ip_requirements: @@ -237,6 +242,11 @@ 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 vm_image_name: get_input: pd_image_name port_1b_t1_port_mac_requirements: @@ -280,11 +290,21 @@ 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 - - ip_version: 4 ip_count_required: 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 vm_image_name: get_input: pd_image_name compute_1c1_scalling_instance_name: @@ -327,11 +347,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_1c1_t1_port_mac_requirements: mac_count_required: is_required: false @@ -376,6 +406,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 server_group: BE_Affinity_group pcm_image_name: get_input: pcm_image_name @@ -389,6 +424,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 port_pcm_port_00_network_role_tag: cps pcm_flavor_name: get_input: pcm_flavor_name @@ -425,6 +465,11 @@ 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 port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -448,6 +493,11 @@ 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 compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -480,6 +530,11 @@ 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 port_1c2_t1_port_mac_requirements: mac_count_required: is_required: false @@ -505,6 +560,11 @@ 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 compute_1c2_catalog_instance_scheduler_hints: - group: BE_Affinity_group service_template_filter: @@ -655,6 +715,11 @@ 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 port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -673,6 +738,11 @@ 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 compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -840,6 +910,11 @@ 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 vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -857,6 +932,11 @@ 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 port_1b_t1_port_network_role_tag: oam port_1b_t1_port_mac_requirements: mac_count_required: @@ -992,4 +1072,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml index b60c6d29e1..3fbee137b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -129,6 +129,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 port_pcm_port_1_security_groups: - - get_input: security_group_name compute_pcma_server_config_drive: @@ -154,6 +159,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 service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -189,6 +199,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 port_pcm_port_2_mac_requirements: mac_count_required: is_required: false @@ -208,6 +223,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 port_pcm_port_2_network_role_tag: cps port_pcm_port_3_network: - get_input: oam_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml index ffd36f1f25..f27ed2c5fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml @@ -272,6 +272,11 @@ 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 vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -289,6 +294,11 @@ 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 port_1b_t1_port_value_specs: - get_attribute: - abstract_a_single_1a @@ -335,6 +345,11 @@ 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 vm_image_name: get_input: pd_image_name port_1c201_port_network_role_tag: oam @@ -357,6 +372,11 @@ 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 port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -390,6 +410,11 @@ 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 vm_image_name: get_input: pd_image_name port_1c201_port_network_role_tag: oam @@ -412,6 +437,11 @@ 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 port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -447,6 +477,11 @@ 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 vm_image_name: get_input: pd_image_name port_1c201_port_network_role_tag: oam @@ -465,6 +500,11 @@ 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 port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -502,6 +542,11 @@ 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 vm_image_name: get_input: pd_image_name port_1c201_port_network_role_tag: oam @@ -520,6 +565,11 @@ 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 port_1c201_port_mac_requirements: mac_count_required: is_required: false @@ -682,6 +732,11 @@ 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 port_1a_t2_port_network_role_tag: ppds vm_flavor_name: get_input: pd_flavor_name @@ -700,6 +755,11 @@ 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 compute_a_single_1a_availability_zone: - get_input: availabilityzone_name compute_a_single_1a_scheduler_hints: @@ -956,11 +1016,21 @@ 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 - - ip_version: 4 ip_count_required: 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 vm_image_name: get_input: pd_image_name port_1c1_t1_port_name: @@ -1063,6 +1133,11 @@ 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 vm_image_name: get_input: pd_image_name compute_b_single_2b_scheduler_hints: @@ -1078,6 +1153,11 @@ 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 compute_b_single_2b_name: - get_input: - b_single_2b_names @@ -1150,11 +1230,21 @@ 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 - - ip_version: 4 ip_count_required: 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 vm_image_name: get_input: pd_image_name port_1c1_t1_port_name: @@ -1322,6 +1412,11 @@ 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 compute_a_single_2a_scheduler_hints: - group: BE_Affinity_group compute_a_single_2a_availability_zone: @@ -1425,6 +1520,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 fixed_ips: - ip_address: get_input: @@ -1446,6 +1546,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 fixed_ips: - ip_address: get_input: @@ -1476,6 +1581,11 @@ 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 vm_image_name: get_input: pd_image_name compute_b_single_2b_scheduler_hints: @@ -1491,6 +1601,11 @@ 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 compute_b_single_2b_name: - get_input: - b_single_2b_names @@ -1623,6 +1738,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 server_group: BE_Affinity_group connectivityChk: connectivityTo1C1_T1_02: @@ -1705,6 +1825,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 port_pcm_port_00_network_role_tag: cps pcm_flavor_name: get_input: pcm_flavor_name @@ -1733,6 +1858,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 fixed_ips: - ip_address: get_input: @@ -1756,6 +1886,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 server_group: BE_Affinity_group connectivityChk: connectivityTo4PNested_2: @@ -1838,6 +1973,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 port_pcm_port_00_network_role_tag: cps pcm_flavor_name: get_input: pcm_flavor_name @@ -1866,6 +2006,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 fixed_ips: - ip_address: get_input: @@ -1896,6 +2041,11 @@ 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 vm_image_name: get_input: pd_image_name compute_b_single_1b_user_data_format: @@ -1913,6 +2063,11 @@ 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 compute_b_single_1b_metadata: - connectivityTo4PNested_2: get_attribute: @@ -2130,4 +2285,4 @@ topology_template: name: def affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml index 8c6d8cd84c..bbb3a4b6a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/nested-no_vfc_v0.1ServiceTemplate.yaml @@ -133,6 +133,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 port_pcm_port_1_security_groups: - - get_input: security_group_name compute_pcma_server_config_drive: @@ -158,6 +163,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 service_template_filter: substitute_service_template: Nested_pcma_server_1ServiceTemplate.yaml count: 1 @@ -193,6 +203,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 port_pcm_port_2_mac_requirements: mac_count_required: is_required: false @@ -212,6 +227,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 port_pcm_port_2_network_role_tag: cps port_pcm_port_3_network: - get_input: oam_net_name 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/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/MainServiceTemplate.yaml index 610b7dd1aa..28af7b7e22 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/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/MainServiceTemplate.yaml @@ -262,6 +262,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 port_pd_server_main_1b_port_fixed_ips: - ip_address: get_input: @@ -291,6 +296,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 compute_ps_server_main_1b_availability_zone: - get_input: availability_zone_0 vm_flavor_name: @@ -368,11 +378,21 @@ 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 - - ip_version: 4 ip_count_required: 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 compute_cmaui_1c1_main_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -409,6 +429,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 port_pd_server_pattern4_port_02_mac_requirements: mac_count_required: is_required: false @@ -418,6 +443,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 test_nested1Level: type: org.openecomp.resource.abstract.nodes.heat.nested1 directives: @@ -441,4 +471,4 @@ topology_template: - test_nested_pattern_4_main_0 - abstract_pd_server_main_1b_1 - abstract_ps_server_main_1b_1 - - abstract_cmaui_1c1_main_1 \ No newline at end of file + - abstract_cmaui_1c1_main_1 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/nested1-no-computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml index 3e91130783..4cbd2d77f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1-no-computeServiceTemplate.yaml @@ -36,6 +36,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 fixed_ips: - ip_address: get_input: @@ -56,6 +61,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 fixed_ips: - ip_address: get_input: 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml index 5e484def18..b530f8572a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/nested1ServiceTemplate.yaml @@ -121,6 +121,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 port_pd_server_pattern4_port_02_mac_requirements: mac_count_required: is_required: false @@ -130,6 +135,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 abstract_ps_server_main_1b: type: org.openecomp.resource.abstract.nodes.ps_server_main_1b directives: @@ -146,6 +156,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 compute_ps_server_main_1b_availability_zone: - get_input: availability_zone_0 vm_flavor_name: @@ -205,11 +220,21 @@ 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 - - ip_version: 4 ip_count_required: 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 compute_cmaui_1c1_main_availability_zone: - get_input: availability_zone_0 - get_input: availability_zone_0 @@ -256,6 +281,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 port_pd_server_main_1b_port_fixed_ips: - ip_address: get_input: @@ -2373,4 +2403,4 @@ topology_template: - dependency_test_nested_pattern_4_nested2 dependency_test_nested3Level_test_nested2Level: - test_nested2Level - - dependency_test_nested3Level \ No newline at end of file + - dependency_test_nested3Level 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/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/nested2ServiceTemplate.yaml index f2d584a68e..64c8db033f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/allPatternsDependsOnConnectivity/out/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/nested2ServiceTemplate.yaml @@ -134,6 +134,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 port_pd_server_nested2_1b_port_network: - get_input: jsa_name service_template_filter: @@ -162,6 +167,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 port_pd_server_pattern4_port_02_mac_requirements: mac_count_required: is_required: false @@ -171,6 +181,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 test_nested3Level: type: org.openecomp.resource.abstract.nodes.heat.nested3 directives: @@ -195,6 +210,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 port_pd_server_pattern4_port_2_mac_requirements: mac_count_required: is_required: false @@ -207,6 +227,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 abstract_ps_server_nested2_1b: type: org.openecomp.resource.abstract.nodes.ps_server_nested2_1b directives: @@ -218,6 +243,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 compute_ps_server_nested2_1b_name: - get_input: - ps_server_nested2_1b_names @@ -298,11 +328,21 @@ 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 - - ip_version: 4 ip_count_required: 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 compute_cmaui_1c1_nested2_name: - get_input: - cmaui_1c1_nested2_names @@ -1509,4 +1549,4 @@ topology_template: - local_storage_cmaui_1c1_nested2 dependency_test_nested_pattern_4_nested2: - test_nested_pattern_4_nested2 - - dependency \ No newline at end of file + - dependency 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml index 824b645089..a91f75a13c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested1ServiceTemplate.yaml @@ -99,6 +99,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 port_pd_server_port_security_groups: - - get_input: p1 - get_input: p2 @@ -160,6 +165,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 port_ps_server_port_mac_requirements: mac_count_required: is_required: false 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/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml index c8e50a5f3d..50bf03440a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/portSecurityGroupNetPattern1B/out/nested2ServiceTemplate.yaml @@ -111,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 indx: get_property: - SELF @@ -122,6 +127,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 abstract_sm_server: type: org.openecomp.resource.abstract.nodes.sm_server directives: @@ -141,6 +151,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 vm_image_name: get_input: sm_server_image compute_sm_server_availability_zone: @@ -201,6 +216,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 service_template_filter: substitute_service_template: Nested_oam_serverServiceTemplate.yaml count: 1 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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml index 8fdf0c1e04..66010f08b0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/MainServiceTemplate.yaml @@ -153,6 +153,11 @@ 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 port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -189,6 +194,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml index aa2ed981f2..c157b3e4d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/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 port_cmaui02_port_replacement_policy: - AUTO port_cmaui02_port_security_groups: @@ -136,6 +141,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 service_template_filter: substitute_service_template: Nested_cmaui_1ServiceTemplate.yaml count: 1 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/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml index 07c709079f..95f54953da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -71,6 +71,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 port_oam01_port_security_groups: - - get_input: p2 - get_input: p1 @@ -114,6 +119,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 port_oam02_port_fixed_ips: - ip_address: get_input: 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/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml index 1a19d76b8c..581fda52b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsDiffVmTypePattern1B/out/nested3ServiceTemplate.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 port_pd02_port_network: - get_input: net service_template_filter: @@ -130,6 +135,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 port_pd01_port_network: - get_input: net compute_ps_name: 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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml index 9914f9b938..34a7a39a4a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/MainServiceTemplate.yaml @@ -153,6 +153,11 @@ 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 port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -189,6 +194,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml index c51dcc3d09..a1fe8309fe 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested1ServiceTemplate.yaml @@ -81,6 +81,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -105,6 +110,11 @@ 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: 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/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml index 64678af2fe..3c455bbc79 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested2ServiceTemplate.yaml @@ -91,6 +91,11 @@ 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 port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: @@ -127,6 +132,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam 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/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml index 6a84a53e6e..f841dbd9f5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/threeNestedLevelsSameVmTypePattern1B/out/nested3ServiceTemplate.yaml @@ -81,6 +81,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -119,6 +124,11 @@ 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 port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: 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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml index 9c4dff9ecf..30b94e7b0a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/MainServiceTemplate.yaml @@ -338,6 +338,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 vm_image_name: get_input: rd_server_1b_image port_ps_server_1b_port_replacement_policy: @@ -389,6 +394,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 vm_image_name: get_input: rd_server_1b_image port_rd_server_1b_port_mac_requirements: @@ -430,6 +440,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 port_pd_server_port_2_mac_requirements: mac_count_required: is_required: false @@ -439,6 +454,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 port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false @@ -468,6 +488,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 port_pd_server_port_2_mac_requirements: mac_count_required: is_required: false @@ -477,6 +502,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 port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false @@ -501,6 +531,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 port_osm_port_fixed_ips: - ip_address: get_input: @@ -547,6 +582,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 port_osm_port_fixed_ips: - ip_address: get_input: @@ -630,11 +670,21 @@ 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 - - ip_version: 4 ip_count_required: 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 vm_image_name: get_input: BE_1c1_image compute_BE_1c1_name: @@ -707,4 +757,4 @@ topology_template: value: get_attribute: - abstract_osm_server_1c2_1 - - osm_server_1c2_accessIPv4 \ No newline at end of file + - osm_server_1c2_accessIPv4 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-no-computeServiceTemplate.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-no-computeServiceTemplate.yaml index cb521520a9..c1dc9a62f5 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-no-computeServiceTemplate.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-no-computeServiceTemplate.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 fixed_ips: - ip_address: get_input: @@ -99,6 +104,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 fixed_ips: - ip_address: get_input: 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml index 6a5d7e013c..a78063d0b8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/multiLevel/twoNestedLevelsWithAllPatternsAndConnectivities/out/nested1ServiceTemplate.yaml @@ -157,6 +157,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 service_template_filter: substitute_service_template: Nested_pd_server_1b_1ServiceTemplate.yaml count: 1 @@ -201,11 +206,21 @@ 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 - - ip_version: 4 ip_count_required: 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 compute_cmaui_1c1_name: - get_input: - cmaui_1c1_names @@ -241,6 +256,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 port_pd_server_port_2_mac_requirements: mac_count_required: is_required: false @@ -250,6 +270,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 port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false @@ -280,6 +305,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 vm_image_name: get_input: pd_server_1b_image port_ps_server_1b_port_replacement_policy: @@ -347,6 +377,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 port_oam_port_replacement_policy: - AUTO service_template_filter: @@ -393,6 +428,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 port_oam_port_replacement_policy: - AUTO service_template_filter: @@ -1701,4 +1741,4 @@ topology_template: - dependency dependency_server_1b_pd_2: - abstract_pd_server_1b - - dependency_pd_server_1b \ No newline at end of file + - dependency_pd_server_1b 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml index 419801e99a..b3f2be5806 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllNonNestedPatterns/out/nested1ServiceTemplate.yaml @@ -160,11 +160,21 @@ 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 - - ip_version: 4 ip_count_required: 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 compute_cmaui_1c1_name: - get_input: - cmaui_1c1_names @@ -218,6 +228,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 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -249,6 +264,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 vm_image_name: get_input: ps_server_1b_image port_ps_server_1b_port_replacement_policy: @@ -308,6 +328,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 port_oam_port_replacement_policy: - AUTO service_template_filter: @@ -354,6 +379,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 port_oam_port_replacement_policy: - AUTO service_template_filter: @@ -1430,4 +1460,4 @@ topology_template: - dependency_cmaui_1c1_cmaui_port dependency_packet_external_network: - packet_external_network - - dependency \ No newline at end of file + - dependency 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/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml index edb739aa61..7794975d66 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/MainServiceTemplate.yaml @@ -57,6 +57,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 port_pd_server_port_2_mac_requirements: mac_count_required: is_required: false @@ -66,6 +71,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 port_pd_server_port_1_mac_requirements: mac_count_required: is_required: false 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-no-computeServiceTemplate.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-no-computeServiceTemplate.yaml index 9a62b2021e..30db51fc7d 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-no-computeServiceTemplate.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-no-computeServiceTemplate.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 fixed_ips: - ip_address: get_input: @@ -99,6 +104,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 fixed_ips: - ip_address: get_input: 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml index 590a751b9c..3546708076 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedAllPatternsConnectivity/out/nested1ServiceTemplate.yaml @@ -160,11 +160,21 @@ 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 - - ip_version: 4 ip_count_required: 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 compute_cmaui_1c1_name: - get_input: - cmaui_1c1_names @@ -218,6 +228,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 service_template_filter: substitute_service_template: Nested_pd_server_1bServiceTemplate.yaml count: 1 @@ -249,6 +264,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 vm_image_name: get_input: ps_server_1b_image port_ps_server_1b_port_replacement_policy: @@ -308,6 +328,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 port_oam_port_replacement_policy: - AUTO service_template_filter: @@ -354,6 +379,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 port_oam_port_replacement_policy: - AUTO service_template_filter: @@ -1437,4 +1467,4 @@ topology_template: - dependency_cmaui_1c1_cmaui_port dependency_packet_external_network: - packet_external_network - - dependency \ No newline at end of file + - dependency 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml index 7e77e65af5..94011d2478 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedCatalogInstance/out/nested1ServiceTemplate.yaml @@ -103,6 +103,11 @@ 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 service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 @@ -149,6 +154,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 service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml index a6a8cf05fc..bcadf520d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedNoCompute/out/nested1ServiceTemplate.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 fixed_ips: - ip_address: get_input: @@ -109,6 +114,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 fixed_ips: - ip_address: get_input: 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml index db82f7b38e..22e2e833c7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedScalingInstance/out/nested1ServiceTemplate.yaml @@ -100,11 +100,21 @@ 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 - - ip_version: 4 ip_count_required: 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 service_template_filter: substitute_service_template: Nested_cmauiServiceTemplate.yaml count: 2 @@ -466,4 +476,4 @@ topology_template: - dependency_cmaui_cmaui_port local_storage_server_cmaui_1: - abstract_cmaui - - local_storage_cmaui \ No newline at end of file + - local_storage_cmaui 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/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml index 83240c60ca..cb894090d9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedOtherScenarios/oneLevel/nestedSingleSubstitution1B/out/nested1ServiceTemplate.yaml @@ -89,6 +89,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 compute_pd_server_availability_zone: - get_input: availability_zone_0 compute_pd_server_name: @@ -145,6 +150,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 port_ps_server_port_mac_requirements: mac_count_required: is_required: false 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-other-file-1BServiceTemplate.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-other-file-1BServiceTemplate.yaml index 3044ae9f59..2a9e6dd584 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-other-file-1BServiceTemplate.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-other-file-1BServiceTemplate.yaml @@ -89,6 +89,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 compute_pd_server_availability_zone: - get_input: availability_zone_0 compute_pd_server_name: @@ -145,6 +150,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 port_ps_server_port_mac_requirements: mac_count_required: is_required: false 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-same-file-1BServiceTemplate.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-same-file-1BServiceTemplate.yaml index 0429c660e7..c658658c95 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-same-file-1BServiceTemplate.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-same-file-1BServiceTemplate.yaml @@ -97,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 vm_image_name: get_input: sm_server_image compute_sm_server_availability_zone: @@ -152,6 +157,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 service_template_filter: substitute_service_template: Nested_oam_serverServiceTemplate.yaml count: 1 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-other-file-1BServiceTemplate.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-other-file-1BServiceTemplate.yaml index f730407335..8d91e0c1c3 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-other-file-1BServiceTemplate.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-other-file-1BServiceTemplate.yaml @@ -89,6 +89,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 port_pd_server_port_security_groups: - - get_input: p1 - get_input: p2 @@ -150,6 +155,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 port_ps_server_port_mac_requirements: mac_count_required: is_required: false 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-same-file-1BServiceTemplate.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-same-file-1BServiceTemplate.yaml index 574225ef0a..4299100dba 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-same-file-1BServiceTemplate.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-same-file-1BServiceTemplate.yaml @@ -97,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 vm_image_name: get_input: sm_server_image compute_sm_server_availability_zone: @@ -157,6 +162,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 service_template_filter: substitute_service_template: Nested_oam_serverServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml index 7c8b9dcb3b..e72c4a890c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/MainServiceTemplate.yaml @@ -141,12 +141,22 @@ 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 port_pcm_port_02_ip_requirements: - ip_version: 4 ip_count_required: 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 server_pcm_001: type: org.openecomp.resource.abstract.nodes.heat.pcm_server_1 directives: @@ -165,6 +175,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_1_mac_requirements: @@ -176,6 +191,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -193,6 +213,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index 1b4baf5024..b78169323f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -1989,6 +1989,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: - cscf_RSG fixed_ips: @@ -2051,6 +2056,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: - cscf_RSG fixed_ips: @@ -2113,9 +2123,14 @@ topology_template: port_cdi_ims_core_1_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_cdi_internal_1_port_allowed_address_pairs: - ip_address: 0.0.0.0/1 - ip_address: 128.0.0.0/1 @@ -2143,6 +2158,11 @@ topology_template: $DEL: get_input: vcscf_name_delimeter port_cdi_internal_1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -2184,6 +2204,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: - cscf_RSG fixed_ips: @@ -2256,6 +2281,11 @@ topology_template: vcscf_internal_network_mtu: get_input: vcscf_internal_network_mtu port_cscf_internal_0_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -2297,6 +2327,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: - cscf_RSG fixed_ips: @@ -2336,6 +2371,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 vcscf_gateway: get_input: oam_internal_vip_0 vnf_name: @@ -2381,6 +2421,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 vcscf_name_delimeter: get_input: vcscf_name_delimeter tdcore_internal_ips: @@ -2423,6 +2468,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: - cscf_RSG fixed_ips: @@ -2451,6 +2501,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: - cscf_RSG fixed_ips: @@ -2512,9 +2567,14 @@ topology_template: port_lbd_ims_core_1_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_lbd_dpdk_1_port_mac_requirements: mac_count_required: is_required: false @@ -2531,6 +2591,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 port_lbd_internal_1_port_security_groups: - - cscf_RSG vm_image_name: @@ -2578,6 +2643,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 compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -2628,6 +2698,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: - cscf_RSG fixed_ips: @@ -2674,6 +2749,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 vcscf_gateway: get_input: oam_internal_vip_0 vnf_name: @@ -2719,6 +2799,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 vcscf_name_delimeter: get_input: vcscf_name_delimeter tdcore_internal_ips: @@ -2772,6 +2857,11 @@ topology_template: - substitutable properties: port_cdi_internal_0_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -2801,9 +2891,14 @@ topology_template: port_cdi_ims_core_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_cdi_ims_core_0_port_network_role_tag: ims_core compute_cdi_user_data_format: - RAW @@ -2917,6 +3012,11 @@ topology_template: 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 port_oam_oam_1_port_network_role_tag: oam port_oam_oam_1_port_security_groups: - - cscf_RSG @@ -2935,6 +3035,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 port_oam_oam_1_port_network: - get_input: oam_net_id port_oam_internal_1_port_allowed_address_pairs: @@ -3063,6 +3168,11 @@ topology_template: 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 compute_oam_scheduler_hints: - group: oam_server_group_group port_oam_internal_2_port_ip_requirements: @@ -3071,6 +3181,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 compute_oam_availability_zone: - get_input: availability_zone_0 compute_oam_metadata: @@ -3114,6 +3229,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: - cscf_RSG fixed_ips: @@ -3202,6 +3322,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 port_oam_internal_0_port_network: - cscf_internal_network_0 vm_image_name: @@ -3235,6 +3360,11 @@ topology_template: 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 port_oam_internal_0_port_mac_requirements: mac_count_required: is_required: false @@ -3319,6 +3449,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 port_lbd_ims_core_0_port_network: - get_input: ims_core_net_id port_lbd_dpdk_0_port_network: @@ -3349,9 +3484,14 @@ topology_template: port_lbd_ims_core_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_lbd_internal_0_port_fixed_ips: - ip_address: get_input: lbd_internal_ip_0 @@ -3378,6 +3518,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 port_lbd_ims_core_0_port_security_groups: - - cscf_RSG port_lbd_ims_core_0_port_name: @@ -3459,6 +3604,11 @@ topology_template: vcscf_internal_network_mtu: get_input: vcscf_internal_network_mtu port_cscf_internal_0_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -3500,6 +3650,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: - cscf_RSG fixed_ips: @@ -3535,6 +3690,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: - cscf_RSG fixed_ips: @@ -3563,6 +3723,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: - cscf_RSG fixed_ips: @@ -3623,6 +3788,11 @@ topology_template: 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 port_cif_ims_li_0_port_fixed_ips: - ip_address: get_input: cif_ims_li_v6_ip_0 @@ -3633,9 +3803,14 @@ topology_template: port_cif_ims_li_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false compute_cif_metadata: - vf_module_id: get_input: vf_module_id @@ -3675,9 +3850,14 @@ topology_template: port_cif_ims_core_0_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_cif_ims_li_0_port_mac_requirements: mac_count_required: is_required: false @@ -3746,12 +3926,22 @@ topology_template: 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 port_cif_internal_0_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false service_template_filter: substitute_service_template: Nested_cifServiceTemplate.yaml count: 1 @@ -3806,6 +3996,11 @@ topology_template: 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 port_cif_internal_1_port_security_groups: - - cscf_RSG port_cif_oam_1_port_1_network: @@ -3847,6 +4042,11 @@ topology_template: 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 port_cif_ims_core_1_port_mac_requirements: mac_count_required: is_required: false @@ -3860,6 +4060,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_cif_ims_li_1_port_name: - str_replace: template: $PREFIX$DELeth4 @@ -3888,9 +4093,14 @@ topology_template: port_cif_ims_li_1_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_cif_ims_core_1_port_fixed_ips: - ip_address: get_input: cif_ims_core_v6_ip_1 @@ -3904,9 +4114,14 @@ topology_template: port_cif_ims_core_1_port_ip_requirements: - ip_version: 4 ip_count_required: - is_required: true + is_required: false floating_ip_count_required: is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false port_cif_ims_li_1_port_network: - get_input: ims_li_v6_net_id port_cif_internal_1_port_fixed_ips: 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 4c0ebb89b7..b4e9b3a37c 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 @@ -2263,6 +2263,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 oam_net_id: get_input: oam_net_id vson_vm_names: @@ -2336,6 +2341,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 vson_dbs_volume_1: type: org.openecomp.resource.vfc.nodes.heat.cinder.Volume properties: @@ -2375,6 +2385,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 vf_module_name: get_input: vf_module_name dns_servers: @@ -2493,6 +2508,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 oam_net_id: get_input: oam_net_id vson_vm_names: @@ -2615,6 +2635,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 vson_dbs_group: type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1 directives: @@ -2640,6 +2665,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 vf_module_name: get_input: vf_module_name dns_servers: @@ -2697,6 +2727,11 @@ topology_template: default_gateway: get_input: default_gateway port_vson_server_oam_net_port_0_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false - ip_version: 6 ip_count_required: is_required: true @@ -2944,6 +2979,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 vf_module_name: get_input: vf_module_name dns_servers: @@ -3012,6 +3052,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 vf_module_name: get_input: vf_module_name dns_servers: @@ -3140,6 +3185,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 vson_dcl_group: type: org.openecomp.resource.abstract.nodes.heat.vson_vm_1 directives: @@ -3165,6 +3215,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 vf_module_name: get_input: vf_module_name dns_servers: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml index e543c21f8e..874a66235e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/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 port_cmaui_port_2_security_groups: - - get_input: p2 port_cmaui_port_1_ip_requirements: @@ -94,6 +99,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 port_cmaui_port_1_replacement_policy: - AUTO port_cmaui_port_2_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml index 67af3b2fa7..a1af262451 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml @@ -116,6 +116,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 port_cmaui_port_4_replacement_policy: - AUTO port_cmaui_port_3_replacement_policy: @@ -128,6 +133,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 port_cmaui_port_3_security_groups: - - get_input: p2 - get_input: p1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml index a68045fcea..bfff4ade12 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml @@ -83,12 +83,22 @@ 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 port_cmaui_port_8_ip_requirements: - ip_version: 4 ip_count_required: 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 abstract_cmaui: type: org.openecomp.resource.abstract.nodes.cmaui directives: @@ -117,6 +127,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 port_cmaui_port_5_fixed_ips: - ip_address: get_input: @@ -128,6 +143,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 port_cmaui_port_5_network: - get_input: net port_cmaui_port_5_replacement_policy: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml index 788f1f05c3..0b57334be9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/MainServiceTemplate.yaml @@ -334,6 +334,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_1_mac_requirements: @@ -345,6 +350,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -384,6 +394,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 port_oam_port_1_mac_requirements: mac_count_required: is_required: false @@ -410,6 +425,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 oam_net_name: get_input: oam_net_name server_pcm_001: @@ -426,6 +446,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 oam_net_gw: get_input: oam_net_gw pcm_image_name: @@ -453,6 +478,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -496,6 +526,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -560,6 +595,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 port_oam_port_1_mac_requirements: mac_count_required: is_required: false @@ -574,6 +614,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 shared_security_group_id1: get_input: shared_security_group_id1 abstract_compute: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml index dfd135166c..b2c1f33d89 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/MainServiceTemplate.yaml @@ -304,6 +304,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_1_mac_requirements: @@ -315,6 +320,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -334,6 +344,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 availabilityzone_name: get_input: availabilityzone_name oam_net_gw: @@ -355,6 +370,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 oam_server_name: get_input: - oam_server_names @@ -402,6 +422,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 oam_net_gw: get_input: oam_net_gw pcm_image_name: @@ -437,6 +462,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -477,6 +507,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml index 0525feb0aa..7a484ee3ac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -306,6 +306,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_1_mac_requirements: @@ -317,6 +322,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -336,6 +346,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 availabilityzone_name: get_input: availabilityzone_name oam_net_gw: @@ -357,6 +372,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 oam_server_name: get_input: - oam_server_names @@ -400,6 +420,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 oam_net_gw: get_input: oam_net_gw pcm_image_name: @@ -427,6 +452,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -467,6 +497,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml index f26ec33021..1b3bcb7445 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/MainServiceTemplate.yaml @@ -254,6 +254,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 oam_net_gw: get_input: oam_net_gw pcm_image_name: @@ -281,6 +286,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -342,6 +352,11 @@ 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 service_template_filter: substitute_service_template: Nested_computeServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml index 91253aebb6..bef92a9520 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/MainServiceTemplate.yaml @@ -254,6 +254,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 availabilityzone_name: get_input: availabilityzone_name port_pcm_1port_0_network_role_tag: cps @@ -277,6 +282,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 pcm_flavor_name: get_input: pcm_flavor_name service_template_filter: @@ -320,6 +330,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml index f8113a6083..14962b4c1b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/MainServiceTemplate.yaml @@ -333,6 +333,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml index bb6490a5ef..aaec66c8cc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -113,6 +113,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 compute_pcm_server_user_data_format: - RAW vm_image_name: @@ -155,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 compute_pcm_server_user_data_format: - RAW vm_image_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml index d6c80b323c..5c8672377f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/MainServiceTemplate.yaml @@ -379,6 +379,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml index 8e26dac997..89833ddbb7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -131,6 +131,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 compute_pcm_server_user_data_format: - RAW vm_image_name: @@ -173,6 +178,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 vm_image_name: get_input: pd_image_name compute_pd_server_config_drive: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml index a42d0d5975..f9d3002374 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/MainServiceTemplate.yaml @@ -128,6 +128,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_01_mac_requirements: @@ -139,6 +144,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 port_pcm_port_11_mac_requirements: mac_count_required: is_required: false @@ -165,6 +175,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_1_mac_requirements: @@ -176,6 +191,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -215,12 +235,22 @@ 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 port_pcm_port_02_ip_requirements: - ip_version: 4 ip_count_required: 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 compute_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: @@ -230,6 +260,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml index 007c922276..2d9161c4c5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/MainServiceTemplate.yaml @@ -128,6 +128,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_01_mac_requirements: @@ -139,6 +144,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 port_pcm_port_11_mac_requirements: mac_count_required: is_required: false @@ -165,6 +175,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_01_mac_requirements: @@ -176,6 +191,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 port_pcm_port_11_mac_requirements: mac_count_required: is_required: false @@ -202,6 +222,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_1_mac_requirements: @@ -213,6 +238,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -230,6 +260,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml index 29a25e780c..f3dddd76f7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/MainServiceTemplate.yaml @@ -128,6 +128,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_1_mac_requirements: @@ -139,6 +144,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -165,6 +175,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 pcm_image_name: get_input: pcm_image_name port_pcm_port_1_mac_requirements: @@ -176,6 +191,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -193,6 +213,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml index 4ec6fb66a8..4bfad639fb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml @@ -104,11 +104,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-1 - Network-0 @@ -130,4 +140,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server \ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml index 601ea81752..b74492bbb5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrIn/out/MainServiceTemplate.yaml @@ -118,11 +118,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-1 - Network-0 @@ -154,4 +164,4 @@ topology_template: - network_policy_server_pd_01 - network_policy_server_pd_02 - network_policy_port0 - - abstract_pd_server \ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml index e1c71de8c2..c9507d5269 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOut/out/MainServiceTemplate.yaml @@ -121,11 +121,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-1 - Network-0 @@ -160,4 +170,4 @@ topology_template: description: heat template that creates MOG stack members: - network_policy_server - - abstract_pd_server \ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml index 1d875f2085..7619d12ebb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortGetAttrOutComputePort/out/MainServiceTemplate.yaml @@ -101,11 +101,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-1 - Network-0 @@ -124,4 +134,4 @@ topology_template: heat_file: ../Artifacts/hot-mog-0108-bs1271.yml description: heat template that creates MOG stack members: - - abstract_pd_server \ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml index c22da7165d..0a497cb72a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedIn/out/MainServiceTemplate.yaml @@ -136,11 +136,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-1 - Network-0 @@ -174,4 +184,4 @@ topology_template: members: - jsa_security_group - resource_with_dependOn - - abstract_pd_server \ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml index acdd8c1db4..b2a4098917 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortNodeConnectedOut/out/MainServiceTemplate.yaml @@ -157,11 +157,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - packet_mirror_network - packet_mirror_network @@ -213,4 +223,4 @@ topology_template: members: - packet_mirror_network - pd01_volume - - abstract_pd_server \ No newline at end of file + - abstract_pd_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml index 0ce529db5f..54a5e568e6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOneGroup/out/MainServiceTemplate.yaml @@ -107,11 +107,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-1 - Network-0 @@ -145,4 +155,4 @@ topology_template: name: Policy_BE_Affinity affinity: host targets: - - BE_Affinity_group \ No newline at end of file + - BE_Affinity_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml index af572a753e..bcee7d58cb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePortOutputParamGetAttrIn/out/MainServiceTemplate.yaml @@ -104,11 +104,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-1 - Network-0 @@ -149,4 +159,4 @@ topology_template: value: get_attribute: - abstract_pd_server - - pd_server_accessIPv6 \ No newline at end of file + - pd_server_accessIPv6 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml index f26e26a3d2..9f29064a0f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePort/out/MainServiceTemplate.yaml @@ -155,11 +155,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-PD-1 - Network-PD-0 @@ -211,11 +221,21 @@ 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 - - ip_version: 4 ip_count_required: 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 service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 2 @@ -232,4 +252,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server \ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml index 3e3f5cf6f6..d3916f9b9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/twoComputeTypesOnePortWithGetAttr/out/MainServiceTemplate.yaml @@ -155,11 +155,21 @@ 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 - - ip_version: 4 ip_count_required: 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 port_pd01_port_network: - Network-PD-1 - Network-PD-0 @@ -215,11 +225,21 @@ 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 - - ip_version: 4 ip_count_required: 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 service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml count: 2 @@ -236,4 +256,4 @@ topology_template: description: heat template that creates MOG stack members: - abstract_pd_server - - abstract_ps_server \ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml index a6d5ed65ce..ef595e2f22 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortType/out/MainServiceTemplate.yaml @@ -855,6 +855,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -863,6 +868,11 @@ 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 port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml index ce7a4c9e1d..3ff238743d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeAndServerGroup/out/MainServiceTemplate.yaml @@ -130,6 +130,11 @@ 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 vm_image_name: get_input: image_smp_name compute_smp_metadata: @@ -160,6 +165,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 424fcd66ab..cc1fb78d3c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -178,6 +178,11 @@ 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 compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: @@ -193,6 +198,11 @@ 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 port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 0ad20baa65..440984c419 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -187,6 +187,11 @@ 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 compute_pd_server_user_data_format: - RAW port_pd02_port_mac_requirements: @@ -200,6 +205,11 @@ 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 port_pd02_port_network: - packet_mirror_network service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml index 3529fedc3a..e87be546a3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedIn/out/MainServiceTemplate.yaml @@ -163,6 +163,11 @@ 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 port_pd01_port_1_security_groups: - - jsa_security_group compute_pd_server_availability_zone: @@ -189,6 +194,11 @@ 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 port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml index 3f3e490da9..2166dafe83 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml @@ -194,6 +194,11 @@ 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -216,6 +221,11 @@ 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 port_pd01_port_1_mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml index e7fa960d3b..0feb3e397d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwodiffporttypesandnested/out/MainServiceTemplate.yaml @@ -843,6 +843,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_group_name: get_input: security_group_name port_pcm_port_1_mac_requirements: @@ -854,6 +859,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 port_pcm_port_0_network_role_tag: cps port_pcm_port_0_mac_requirements: mac_count_required: @@ -886,6 +896,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -894,6 +909,11 @@ 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 port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml index cdc3fd47ee..8ccf970879 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -843,6 +843,11 @@ 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 port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 @@ -850,6 +855,11 @@ 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml index bb44eba9d8..d30f10451e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes2/out/MainServiceTemplate.yaml @@ -852,12 +852,22 @@ 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 port_pd_2_port_1_ip_requirements: - ip_version: 4 ip_count_required: 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 compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml index 4f4840d9ba..2dd1307517 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes3/out/MainServiceTemplate.yaml @@ -839,12 +839,22 @@ 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 port_pd_oam1_port_0_ip_requirements: - ip_version: 4 ip_count_required: 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml index e85c75edf4..bcd3451776 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computewithtwosameporttypes4/out/MainServiceTemplate.yaml @@ -846,6 +846,11 @@ 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: @@ -860,6 +865,11 @@ 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 port_pd01_port2_network_role_tag: oam port_pd01_port2_mac_requirements: mac_count_required: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index 4054d32d29..ec2230fbe4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/diffPortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -855,6 +855,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -863,6 +868,11 @@ 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 port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml index 4712348457..0f12e75b18 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/inputOutputParamType/out/MainServiceTemplate.yaml @@ -477,6 +477,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 port_pd01_port_qos_policy: - PORT_PD_QOS_POLICY compute_pd_server_config_drive: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml index e9d7a14899..39d09e007e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttIn/out/MainServiceTemplate.yaml @@ -855,6 +855,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd02_port_ip_requirements: @@ -863,6 +868,11 @@ 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 port_pd01_port_network_role_tag: oam port_pd02_port_network: - get_input: oam_net_name diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 0feb8ef859..5436475c7c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeDiffPortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -857,6 +857,11 @@ 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 port_pd01_port_network: - get_attribute: - network_policy_server @@ -867,6 +872,11 @@ 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 port_pd02_port_network: - get_input: oam_net_name compute_pd_server_user_data_format: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml index 83a2eaf23a..039c1240e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml @@ -106,12 +106,22 @@ 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 port_pd01_port_1_ip_requirements: - ip_version: 4 ip_count_required: 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml index 41f9b91758..4927c75677 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortsAndGetAttrIn/out/MainServiceTemplate.yaml @@ -843,6 +843,11 @@ 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 port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 @@ -850,6 +855,11 @@ 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml index d35d65a2d4..a636a190ca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/samePortTypeAndOutParamGetAttrIn/out/MainServiceTemplate.yaml @@ -843,6 +843,11 @@ 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 port_pd01_port_0_network_role_tag: oam port_pd01_port_1_ip_requirements: - ip_version: 4 @@ -850,6 +855,11 @@ 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 compute_pd_server_availability_zone: - get_input: availabilityzone_name compute_pd_server_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml index 8002f73309..a8802c5e13 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithAllConnectivities/out/MainServiceTemplate.yaml @@ -411,6 +411,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -461,6 +466,11 @@ 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 port_pd01_port_network: - get_attribute: - network_policy_server @@ -502,6 +512,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name compute_oam_server_user_data_format: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml index 0bb61d1682..4d291ebe96 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeDiffComputesWithPorts/out/MainServiceTemplate.yaml @@ -348,6 +348,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -389,6 +394,11 @@ 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 port_pd01_port_network: - get_attribute: - network_policy_server @@ -423,6 +433,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name compute_oam_server_user_data_format: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml index 7863e55a5b..693505e75b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeNovaSameTypeWithGetAttrFromPort/out/MainServiceTemplate.yaml @@ -331,6 +331,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -361,6 +366,11 @@ 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 compute_pd_server_user_data_format: - RAW service_template_filter: @@ -395,6 +405,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -437,6 +452,11 @@ 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 compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml index 344d34ea74..6fe4e09880 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/threeSameComputesNoConsolidation/out/MainServiceTemplate.yaml @@ -348,6 +348,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -383,6 +388,11 @@ 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 port_pd01_port_3_mac_requirements: mac_count_required: is_required: false @@ -404,6 +414,11 @@ 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 service_template_filter: substitute_service_template: Nested_pd_server_2ServiceTemplate.yaml count: 1 @@ -443,6 +458,11 @@ 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 port_pd01_port_network: - get_attribute: - network_policy_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml index 4d445e467c..821efd557b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoComputesWithGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -704,6 +704,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -747,6 +752,11 @@ 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 port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml index 3fe02b86e4..f752a148f3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/twoSetsOfSingle/out/MainServiceTemplate.yaml @@ -702,6 +702,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -743,6 +748,11 @@ 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 port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml index 306d40903f..5f16f354ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/diffComputeSubInterface/out/MainServiceTemplate.yaml @@ -729,6 +729,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name subinterface_nested_net1: @@ -781,6 +786,11 @@ 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 port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml @@ -805,4 +815,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server \ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml index 2d7f3e295f..ae959341d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/onePortIsConnectedWithSubInf/out/MainServiceTemplate.yaml @@ -727,6 +727,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -766,6 +771,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name subinterface_nested_net1: @@ -796,4 +806,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1 \ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml index 306d40903f..5f16f354ab 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/regularNestedSubInterface/out/MainServiceTemplate.yaml @@ -729,6 +729,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name subinterface_nested_net1: @@ -781,6 +786,11 @@ 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 port_ps01_port_network_role_tag: oam service_template_filter: substitute_service_template: Nested_ps_serverServiceTemplate.yaml @@ -805,4 +815,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_ps_server \ No newline at end of file + - abstract_ps_server diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml index 4f5cc61afc..9b07ca8be9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeDiffPortSubInterface/out/MainServiceTemplate.yaml @@ -733,6 +733,11 @@ 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 port_ps01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -775,6 +780,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name subinterface_nested_net1: @@ -805,4 +815,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1 \ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml index 2d7f3e295f..ae959341d5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1b/sameComputeSamePortDiffSubInterfaceFile/out/MainServiceTemplate.yaml @@ -727,6 +727,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name port_pd01_port_network_role_tag: oam @@ -766,6 +771,11 @@ 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 port_pd01_port_network: - get_input: oam_net_name subinterface_nested_net1: @@ -796,4 +806,4 @@ topology_template: - test_net2 - test_net1 - abstract_pd_server - - abstract_pd_server_1 \ No newline at end of file + - abstract_pd_server_1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml index 239c7fba28..d0394d204b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrOnlyResourceName/expectedoutputfiles/MainServiceTemplate.yaml @@ -704,6 +704,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -747,4 +752,4 @@ topology_template: Version 2.0 02-09-2016 (Authors: Paul Phillips, pp2854 PROD) members: - VMI1 - - FSB1 \ No newline at end of file + - FSB1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml index 18e0c63df6..4cbb8de53e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/getAttr/getAttrUnsupportedAttr/expectedoutputfiles/MainServiceTemplate.yaml @@ -706,6 +706,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: @@ -736,6 +741,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -765,6 +775,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -789,6 +804,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 fixed_ips: - ip_address: get_input: fsb1-oam-ip @@ -812,6 +832,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: pcrf_security_group_name fixed_ips: @@ -837,6 +862,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/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 f400f5025c..3673d8213b 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 @@ -134,6 +134,11 @@ topology_template: 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 fixed_ips: @@ -164,6 +169,11 @@ 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: @@ -410,4 +420,4 @@ topology_template: - link link_cpm_ctrl_fabric_0_port: - cpm_ctrl_fabric_0_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/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 b384057c2a..a45aed6f28 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,6 +136,11 @@ 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: @@ -164,6 +169,11 @@ 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: @@ -210,6 +220,11 @@ 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: @@ -238,6 +253,11 @@ 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: @@ -268,6 +288,11 @@ 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: @@ -296,6 +321,11 @@ 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: @@ -709,4 +739,4 @@ topology_template: - link local_storage_IOM: - IOM - - 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/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 f400f5025c..3673d8213b 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 @@ -134,6 +134,11 @@ topology_template: 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 fixed_ips: @@ -164,6 +169,11 @@ 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: @@ -410,4 +420,4 @@ topology_template: - link link_cpm_ctrl_fabric_0_port: - cpm_ctrl_fabric_0_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/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 aefe6d5b4a..8c8a25a369 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,6 +139,11 @@ 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: @@ -167,6 +172,11 @@ 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: @@ -214,6 +224,11 @@ 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: @@ -242,6 +257,11 @@ 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: @@ -272,6 +292,11 @@ 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: @@ -300,6 +325,11 @@ 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: @@ -713,4 +743,4 @@ topology_template: - link local_storage_IOM: - IOM - - 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/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml index 5e329f9448..c88a6e9a55 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-mog-0108-bs1271/expectedoutputfiles/MainServiceTemplate.yaml @@ -920,6 +920,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: - mog_security_group fixed_ips: @@ -947,6 +952,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: - mog_security_group fixed_ips: @@ -976,6 +986,11 @@ 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: - mog_security_group mac_requirements: @@ -1032,6 +1047,11 @@ 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: - mog_security_group mac_requirements: @@ -1056,6 +1076,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: - mog_security_group fixed_ips: @@ -1094,6 +1119,11 @@ 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: - mog_security_group mac_requirements: @@ -1118,6 +1148,11 @@ 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: - mog_security_group mac_requirements: @@ -1176,6 +1211,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: - mog_security_group fixed_ips: @@ -1198,6 +1238,11 @@ topology_template: 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: - mog_security_group fixed_ips: @@ -1228,6 +1273,11 @@ 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: - mog_security_group mac_requirements: @@ -1252,6 +1302,11 @@ topology_template: 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: - mog_security_group fixed_ips: @@ -1282,6 +1337,11 @@ topology_template: 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: - mog_security_group fixed_ips: @@ -1312,6 +1372,11 @@ topology_template: 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: - mog_security_group fixed_ips: @@ -1358,6 +1423,11 @@ 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: - mog_security_group mac_requirements: @@ -1382,6 +1452,11 @@ 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: - mog_security_group mac_requirements: @@ -1406,6 +1481,11 @@ 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: - mog_security_group mac_requirements: @@ -1430,6 +1510,11 @@ 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: - mog_security_group mac_requirements: @@ -1746,6 +1831,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: - mog_security_group fixed_ips: @@ -1773,6 +1863,11 @@ topology_template: 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: - mog_security_group fixed_ips: @@ -1803,6 +1898,11 @@ 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: - mog_security_group mac_requirements: @@ -1827,6 +1927,11 @@ 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: - mog_security_group mac_requirements: @@ -1851,6 +1956,11 @@ topology_template: 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: - mog_security_group fixed_ips: @@ -1881,6 +1991,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: - mog_security_group fixed_ips: @@ -1908,6 +2023,11 @@ 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: - mog_security_group mac_requirements: @@ -1932,6 +2052,11 @@ 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: - mog_security_group mac_requirements: @@ -1956,6 +2081,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: - mog_security_group fixed_ips: @@ -1983,6 +2113,11 @@ 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: - mog_security_group mac_requirements: @@ -2007,6 +2142,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: - mog_security_group fixed_ips: @@ -2034,6 +2174,11 @@ 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: - mog_security_group mac_requirements: @@ -2058,6 +2203,11 @@ 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: - mog_security_group mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml index dd402da1fb..aae4de2cf0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-oam_v1.0ServiceTemplate.yaml @@ -127,6 +127,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: pcrf_security_group_name fixed_ips: @@ -152,6 +157,11 @@ topology_template: 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: pcrf_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/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml index 53e049a6f7..626a4f18cf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pcm_v1.0ServiceTemplate.yaml @@ -105,6 +105,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: pcrf_security_group_name fixed_ips: @@ -146,6 +151,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: pcrf_security_group_name fixed_ips: @@ -392,4 +402,4 @@ topology_template: - link link_pcrf_pcm_port_1: - pcrf_pcm_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/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml index a1591c5a42..349064b23a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-ppd_v1.0ServiceTemplate.yaml @@ -219,6 +219,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: pcrf_security_group_name fixed_ips: @@ -244,6 +249,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: pcrf_security_group_name fixed_ips: @@ -269,6 +279,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: pcrf_security_group_name fixed_ips: @@ -310,6 +325,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: pcrf_security_group_name fixed_ips: @@ -335,6 +355,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: pcrf_security_group_name fixed_ips: @@ -360,6 +385,11 @@ topology_template: 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: pcrf_security_group_name fixed_ips: @@ -388,6 +418,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: pcrf_security_group_name fixed_ips: @@ -413,6 +448,11 @@ topology_template: 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: pcrf_security_group_name fixed_ips: @@ -916,4 +956,4 @@ topology_template: - dependency local_storage_pcrf_server_ppd: - pcrf_server_ppd - - 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/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml index 3d7777ac8e..05138e9941 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-pps_v1.0ServiceTemplate.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: pcrf_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/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml index a4ec4f30be..7cefa32d2c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/hot-nimbus-oam-volumes_v1.0/out/nested-psm_v1.0ServiceTemplate.yaml @@ -91,6 +91,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: pcrf_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/neutron_dual_stacks/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/expectedoutputfiles/MainServiceTemplate.yaml new file mode 100644 index 0000000000..a922d0ff52 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/expectedoutputfiles/MainServiceTemplate.yaml @@ -0,0 +1,668 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +metadata: + template_name: Main +imports: +- openecomp_heat_index: + file: openecomp-heat/_index.yml +node_types: + org.openecomp.resource.vfc.nodes.heat.dns: + derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server +topology_template: + inputs: + vf_module_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: vf_module_id + type: string + description: Unique ID for this VF module instance + dns_int_bearer_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: dns_int_bearer_ips + type: list + description: DNS Bearer IP list + entry_schema: + type: string + vnf_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + - Use_Case_1_base + source_type: HEAT + param_name: vnf_name + type: string + description: Unique name for this VF instance + security_group: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: security_group + type: string + description: security group + oam_protected_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: oam_protected_net_name + type: string + description: OAM network where instaces will connect + dns_oam_protected_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: dns_oam_protected_ips + type: list + description: DNS OAM IP list + entry_schema: + type: string + int_bearer_net_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: int_bearer_net_name + type: string + description: Bearer network where instaces will connect + dns_oam_protected_v6_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: dns_oam_protected_v6_ips + type: list + description: DNS OAM IP list + entry_schema: + type: string + dns_names: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: dns_names + type: list + description: server name + entry_schema: + type: string + vnf_id: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: vnf_id + type: string + description: Unique ID for this VF instance + dns_int_bearer_v6_ips: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: dns_int_bearer_v6_ips + type: list + description: fixed IPv6 assignment for VM's on the Bearer network + entry_schema: + type: string + availability_zone_0: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: availability_zone_0 + type: string + description: availability zone ID or Name + availability_zone_1: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: availability_zone_1 + type: string + description: availability zone ID or Name + dns_image_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: dns_image_name + type: string + description: server image + default: NIMBUS_DNS_3.0.2.qcow2 + dns_flavor_name: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - Use_Case_1_module + source_type: HEAT + param_name: dns_flavor_name + type: string + description: server flavor + default: nv.c4r4d80 + node_templates: + dns_0_oam_protected_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: true + - ip_version: 6 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: true + security_groups: + - get_input: security_group + mac_requirements: + mac_count_required: + is_required: false + allowed_address_pairs: + - ip_address: + get_input: + - dns_oam_protected_ips + - 5 + - ip_address: + get_input: + - dns_oam_protected_floating_v6_ip + - 5 + - ip_address: + get_input: + - dns_oam_protected_ips + - 5 + name: + str_replace: + template: VNF_NAME_dns_0_oam_protected_port_0 + params: + VNF_NAME: + get_input: vnf_name + network_role_tag: oam_protected + network: + get_input: oam_protected_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: dns_server_0 + relationship: tosca.relationships.network.BindsTo + dns_0_oam_protected_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: false + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group + fixed_ips: + - ip_address: + get_input: + - dns_int_bearer_ips_v6_ips + - 0 + mac_requirements: + mac_count_required: + is_required: false + name: + str_replace: + template: VNF_NAME_dns_0_oam_protected_port_1 + params: + VNF_NAME: + get_input: vnf_name + network_role_tag: oam_protected + network: + get_input: oam_protected_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: dns_server_0 + relationship: tosca.relationships.network.BindsTo + dns_1_int_bearer_port: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true + security_groups: + - get_input: security_group + fixed_ips: + - ip_address: + get_input: + - dns_int_bearer_ips + - 0 + - ip_address: + get_input: + - dns_int_bearer_v6_ips + - 0 + mac_requirements: + mac_count_required: + is_required: false + allowed_address_pairs: + - ip_address: + get_input: + - dns_int_bearer_floating_v6_ip + - 0 + - ip_address: + get_input: + - dns_int_bearer_floating_v6_ip + - 0 + name: + str_replace: + template: VNF_NAME_dns_bearer_port + params: + VNF_NAME: + get_input: vnf_name + network_role_tag: int_bearer + network: + get_input: int_bearer_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: dns_server_1 + relationship: tosca.relationships.network.BindsTo + DNS_SECURITY_GROUP: + type: org.openecomp.resource.vfc.rules.nodes.heat.network.neutron.SecurityRules + properties: + name: + str_replace: + template: VF_NAME_sec_grp_DNS + params: + VF_NAME: + get_input: vnf_name + description: security group + rules: + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: egress + - protocol: tcp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv4 + port_range_max: 65535 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv4 + remote_ip_prefix: 0.0.0.0/0 + direction: ingress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: egress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: egress + - protocol: tcp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: udp + ethertype: IPv6 + port_range_max: 65535 + remote_ip_prefix: ::/0 + direction: ingress + port_range_min: 1 + - protocol: icmp + ethertype: IPv6 + remote_ip_prefix: ::/0 + direction: ingress + dns_server_1: + type: org.openecomp.resource.vfc.nodes.heat.dns + properties: + flavor: + get_input: dns_flavor_name + availability_zone: + get_input: availability_zone_1 + image: + get_input: dns_image_name + metadata: + vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + name: + get_input: + - dns_names + - 1 + dns_0_int_bearer_port: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + security_groups: + - get_input: security_group + fixed_ips: + - ip_address: + get_input: + - dns_int_bearer_ips + - 0 + - ip_address: + get_input: + - dns_int_bearer_v6_ips + - 0 + mac_requirements: + mac_count_required: + is_required: false + allowed_address_pairs: + - ip_address: + get_input: + - dns_int_bearer + - 0 + - ip_address: + get_input: + - dns_int_bearer + - 0 + name: + str_replace: + template: VNF_NAME_dns_bearer_port + params: + VNF_NAME: + get_input: vnf_name + network_role_tag: int_bearer + network: + get_input: int_bearer_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: dns_server_0 + relationship: tosca.relationships.network.BindsTo + dns_server_0: + type: org.openecomp.resource.vfc.nodes.heat.dns + properties: + flavor: + get_input: dns_flavor_name + availability_zone: + get_input: availability_zone_0 + image: + get_input: dns_image_name + metadata: + vf_module_id: + get_input: vf_module_id + vnf_id: + get_input: vnf_id + vnf_name: + get_input: vnf_name + name: + get_input: + - dns_names + - 0 + dns_1_oam_protected_port_0: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + 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: true + security_groups: + - get_input: security_group + fixed_ips: + - ip_address: + get_input: + - dns_oam_protected_ips + - 6 + - ip_address: + get_input: + - dns_oam_protected_ips + - 7 + - ip_address: + get_input: + - dns_oam_protected_ips + - 5 + mac_requirements: + mac_count_required: + is_required: false + allowed_address_pairs: + - ip_address: + get_input: + - dns_oam_protected_ips + - 5 + - ip_address: + get_input: + - dns_oam_protected_floating_v6_ip + - 5 + - ip_address: + get_input: + - dns_oam_protected_ips + - 5 + name: + str_replace: + template: VNF_NAME_dns_1_oam_protected_port_0 + params: + VNF_NAME: + get_input: vnf_name + network_role_tag: oam_protected + network: + get_input: oam_protected_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: dns_server_1 + relationship: tosca.relationships.network.BindsTo + dns_1_oam_protected_port_1: + type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port + properties: + ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: true + security_groups: + - get_input: security_group + fixed_ips: + - ip_address: + get_input: + - dns_oam_protected_v6_ips + - 6 + - ip_address: + get_input: + - dns_oam_protected_ips + - 7 + - ip_address: + get_input: + - dns_oam_protected_ips + - 5 + mac_requirements: + mac_count_required: + is_required: false + allowed_address_pairs: + - ip_address: + get_input: + - dns_oam_protected_floating_v6_ip + - 4 + - ip_address: + get_input: + - dns_oam_protected_ips + - 5 + - ip_address: + get_input: + - dns_oam_protected_floating_v6_ip + - 5 + name: + str_replace: + template: VNF_NAME_dns_1_oam_protected_port_1 + params: + VNF_NAME: + get_input: vnf_name + network_role_tag: oam_protected + network: + get_input: oam_protected_net_name + requirements: + - binding: + capability: tosca.capabilities.network.Bindable + node: dns_server_1 + relationship: tosca.relationships.network.BindsTo + groups: + Use_Case_1_base_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/Use_Case_1_base.yaml + description: | + Base HOT template to create The Security Group for the the DNS VNF + members: + - DNS_SECURITY_GROUP + Use_Case_1_module_group: + type: org.openecomp.groups.heat.HeatStack + properties: + heat_file: ../Artifacts/Use_Case_1_module.yaml + description: | + nested DNS template for a single VM + all parameters are passed from calling heat template of resourcegroup + members: + - dns_0_oam_protected_port_0 + - dns_0_oam_protected_port_1 + - dns_1_int_bearer_port + - dns_server_1 + - dns_0_int_bearer_port + - dns_server_0 + - dns_1_oam_protected_port_0 + - dns_1_oam_protected_port_1 + outputs: + security_group: + description: UUID of DNS Resource SecurityGroup + value: DNS_SECURITY_GROUP \ 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/neutron_dual_stacks/inputfiles/MANIFEST.json b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/MANIFEST.json new file mode 100644 index 0000000000..670b5fbfaf --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/MANIFEST.json @@ -0,0 +1,27 @@ +{ + "name": "multiple_not_nested", + "description": "multiple heat files in zip, no nesting", + "version": "2013-05-23", + "data": [ + { + "file": "Use_Case_1_base.yaml", + "type": "HEAT", + "data": [ + { + "file": "Use_Case_1_base.env", + "type": "HEAT_ENV" + } + ] + }, + { + "file": "Use_Case_1_module.yaml", + "type": "HEAT", + "data": [ + { + "file": "Use_Case_1_module.env", + "type": "HEAT_ENV" + } + ] + } + ] +} \ 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/neutron_dual_stacks/inputfiles/Use_Case_1_base.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_base.env new file mode 100644 index 0000000000..46862c461e --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_base.env @@ -0,0 +1,8 @@ +##NIMBUS - DNS Base Template ENV File +#AUTHORS: + +##################### +parameters: +##################### + + vnf_name: 'MyDNS01' \ 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/neutron_dual_stacks/inputfiles/Use_Case_1_base.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_base.yaml new file mode 100644 index 0000000000..75eaf41108 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_base.yaml @@ -0,0 +1,49 @@ +heat_template_version: 2015-04-30 +#Nimbus DNS Base Template +#AUTHORS: +description: > + Base HOT template to create The Security Group for the the DNS VNF + +##################### +parameters: +##################### + +## GLOBAL//Basic Parameters + vnf_name: + type: string + description: Unique name for this VF instance +# For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC + +##################### +resources: +##################### + + DNS_SECURITY_GROUP: + type: OS::Neutron::SecurityGroup + properties: + description: security group + name: + str_replace: + template: VF_NAME_sec_grp_DNS + params: + VF_NAME: {get_param: vnf_name} + rules: [{"direction": egress, "ethertype": IPv4, "port_range_min": 1, "port_range_max": 65535, "protocol": tcp, "remote_ip_prefix": 0.0.0.0/0}, + {"direction": egress, "ethertype": IPv4, "port_range_min": 1, "port_range_max": 65535, "protocol": udp, "remote_ip_prefix": 0.0.0.0/0}, + {"direction": egress, "ethertype": IPv4, "protocol": icmp, "remote_ip_prefix": 0.0.0.0/0}, + {"direction": ingress, "ethertype": IPv4, "port_range_min": 1, "port_range_max": 65535, "protocol": tcp, "remote_ip_prefix": 0.0.0.0/0}, + {"direction": ingress, "ethertype": IPv4, "port_range_min": 1, "port_range_max": 65535, "protocol": udp, "remote_ip_prefix": 0.0.0.0/0}, + {"direction": ingress, "ethertype": IPv4, "protocol": icmp, "remote_ip_prefix": 0.0.0.0/0}, + {"direction": egress, "ethertype": IPv6, "port_range_min": 1, "port_range_max": 65535, "protocol": tcp, "remote_ip_prefix": "::/0"}, + {"direction": egress, "ethertype": IPv6, "port_range_min": 1, "port_range_max": 65535, "protocol": udp, "remote_ip_prefix": "::/0"}, + {"direction": egress, "ethertype": IPv6, "protocol": icmp, "remote_ip_prefix": "::/0"}, + {"direction": ingress, "ethertype": IPv6, "port_range_min": 1, "port_range_max": 65535, "protocol": tcp, "remote_ip_prefix": "::/0"}, + {"direction": ingress, "ethertype": IPv6, "port_range_min": 1, "port_range_max": 65535, "protocol": udp, "remote_ip_prefix": "::/0"}, + {"direction": ingress, "ethertype": IPv6, "protocol": icmp, "remote_ip_prefix": "::/0"} + ] + + +outputs: + security_group: + description: UUID of DNS Resource SecurityGroup + value: { get_resource: DNS_SECURITY_GROUP } + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.env new file mode 100644 index 0000000000..f2c270f0c0 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.env @@ -0,0 +1,16 @@ +parameters: + dns_image_name: NIMBUS_DNS_3.0.2.qcow2 + dns_flavor_name: nv.c4r4d80 +# oam_protected_net_name: +# int_bearer_net_name: +# dns_oam_protected_ips: +# dns_int_bearer_ips: +# dns_int_bearer_v6_ips: +# dns_names: +# security_group: +# availability_zone_0: rdm3-kvm-az01 +# availability_zone_1: rdm3-kvm-az02 +# vnf_name: 'zrdm3mdns01' +# vnf_id: 'dummy' +# vf_module_id: 'dummy' + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml new file mode 100644 index 0000000000..b787785643 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml @@ -0,0 +1,167 @@ +heat_template_version: 2014-10-16 + +description: | + nested DNS template for a single VM + all parameters are passed from calling heat template of resourcegroup + +parameters: + dns_image_name: + type: string + description: server image + dns_flavor_name: + type: string + description: server flavor + oam_protected_net_name: + type: string + description: OAM network where instaces will connect + int_bearer_net_name: + type: string + description: Bearer network where instaces will connect + dns_oam_protected_ips: + type: comma_delimited_list + description: DNS OAM IP list + dns_oam_protected_v6_ips: + type: comma_delimited_list + description: DNS OAM IP list + dns_int_bearer_ips: + type: comma_delimited_list + description: DNS Bearer IP list + dns_int_bearer_v6_ips: + type: comma_delimited_list + description: fixed IPv6 assignment for VM's on the Bearer network + dns_names: + type: comma_delimited_list + description: server name + security_group: + type: string + description: security group + availability_zone_0: + type: string + description: availability zone ID or Name + availability_zone_1: + type: string + description: availability zone ID or Name + vnf_name: + type: string + description: Unique name for this VF instance +# For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC + vnf_id: + type: string + description: Unique ID for this VF instance +# For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC + vf_module_id: + type: string + description: Unique ID for this VF module instance +# For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC + +resources: + + dns_0_oam_protected_port_0: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_dns_0_oam_protected_port_0 + params: + VNF_NAME: {get_param: vnf_name} + network: { get_param: oam_protected_net_name } + allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}] + security_groups: [{ get_param: security_group }] + + dns_0_oam_protected_port_1: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_dns_0_oam_protected_port_1 + params: + VNF_NAME: {get_param: vnf_name} + network: { get_param: oam_protected_net_name } + fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips_v6_ips, 0 ]}}] + security_groups: [{ get_param: security_group }] + + dns_0_int_bearer_port: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_dns_bearer_port + params: + VNF_NAME: {get_param: vnf_name} + network: { get_param: int_bearer_net_name } + fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_v6_ips, 0 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: [ dns_int_bearer, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer, 0 ]}}] + security_groups: [{ get_param: security_group }] + + dns_server_0: + type: OS::Nova::Server + properties: + name: { get_param: [ dns_names, 0 ] } + image: { get_param: dns_image_name } + flavor: { get_param: dns_flavor_name } + availability_zone: { get_param: availability_zone_0 } + networks: + - port: { get_resource: dns_0_oam_protected_port_0 } + - port: { get_resource: dns_0_oam_protected_port_1 } + - port: { get_resource: dns_0_int_bearer_port } + metadata: + vnf_id: { get_param: vnf_id } + vf_module_id: { get_param: vf_module_id } + vnf_name: {get_param: vnf_name } + + dns_1_oam_protected_port_0: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_dns_1_oam_protected_port_0 + params: + VNF_NAME: {get_param: vnf_name} + network: { get_param: oam_protected_net_name } + fixed_ips: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 6 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 7 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}] + security_groups: [{ get_param: security_group }] + + dns_1_oam_protected_port_1: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_dns_1_oam_protected_port_1 + params: + VNF_NAME: {get_param: vnf_name} + network: { get_param: oam_protected_net_name } + fixed_ips: [{ "ip_address": { get_param: [ dns_oam_protected_v6_ips, 6 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 7 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 4 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}] + security_groups: [{ get_param: security_group }] + + dns_1_int_bearer_port: + type: OS::Neutron::Port + properties: + name: + str_replace: + template: VNF_NAME_dns_bearer_port + params: + VNF_NAME: {get_param: vnf_name} + network: { get_param: int_bearer_net_name } + fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_v6_ips, 0 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: [ dns_int_bearer_floating_v6_ip, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_floating_v6_ip, 0 ]}}] + security_groups: [{ get_param: security_group }] + + dns_server_1: + type: OS::Nova::Server + properties: + name: { get_param: [ dns_names, 1 ] } + image: { get_param: dns_image_name } + flavor: { get_param: dns_flavor_name } + availability_zone: { get_param: availability_zone_1 } + networks: + - port: { get_resource: dns_1_oam_protected_port_0 } + - port: { get_resource: dns_1_oam_protected_port_1 } + - port: { get_resource: dns_1_int_bearer_port } + metadata: + vnf_id: { get_param: vnf_id } + vf_module_id: { get_param: vf_module_id } + vnf_name: {get_param: vnf_name } + + diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml index 01b68db587..fa3ca43cdf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_port_translation/expectedoutputfiles/MainServiceTemplate.yaml @@ -28,6 +28,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: @@ -51,6 +56,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: @@ -83,6 +93,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/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml index 05e87e198b..b0db5e87dc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_security_group_translation/expectedoutputfiles/MainServiceTemplate.yaml @@ -160,6 +160,11 @@ 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: - jsa_security_group mac_requirements: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml index d9f5e93cc5..7d0f579fe5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/dynamicPolicy/expectedoutputfiles/MainServiceTemplate.yaml @@ -1099,6 +1099,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1119,6 +1124,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1139,6 +1149,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1179,6 +1194,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml index 8d28831726..527394b915 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novaservergroups/staticPolicy/expectedoutputfiles/MainServiceTemplate.yaml @@ -1066,6 +1066,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1086,6 +1091,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1106,6 +1116,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1146,6 +1161,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml index a815a7d021..2c6a58bfd5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -71,6 +71,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: @@ -135,6 +140,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/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml index 44ebbfff92..308fa0a099 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/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: @@ -119,6 +124,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/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml index 738262e312..7f4264f286 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -106,6 +106,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: @@ -133,6 +138,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/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml index c7e191959f..23baa6d5b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innerHeatVolNestedMultiLevel/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/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml index 9d41cfd560..0eea9c67d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/innernestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml @@ -136,6 +136,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: @@ -198,6 +203,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/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml index fe9c34a568..3c8903478b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/multinotconnected/expectedoutputfiles/MainServiceTemplate.yaml @@ -313,6 +313,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: @@ -341,6 +346,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: @@ -442,6 +452,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/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index a815a7d021..2c6a58bfd5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -71,6 +71,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: @@ -135,6 +140,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/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index 44ebbfff92..308fa0a099 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/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: @@ -119,6 +124,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/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 738262e312..7f4264f286 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -106,6 +106,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: @@ -133,6 +138,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/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index c7e191959f..23baa6d5b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/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/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml index 70f0e2ebbc..2f147f29b2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml @@ -79,6 +79,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/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml index 3ae12abd30..a95fb99cd9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml @@ -164,6 +164,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/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml index 70f0e2ebbc..2f147f29b2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/nestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml @@ -79,6 +79,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/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml index a82686f24b..d353757112 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml @@ -272,6 +272,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: @@ -360,6 +365,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/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index a815a7d021..2c6a58bfd5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -71,6 +71,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: @@ -135,6 +140,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/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index 44ebbfff92..308fa0a099 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/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: @@ -119,6 +124,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/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 738262e312..7f4264f286 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -106,6 +106,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: @@ -133,6 +138,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/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index c7e191959f..23baa6d5b1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml index 23f6189612..cb2b77ef32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml @@ -71,6 +71,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: @@ -124,6 +129,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/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml index eaed82b0ea..4d2d07966a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/MainServiceTemplate.yaml @@ -198,6 +198,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/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml index 23f6189612..12a361740b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/novatovolumeconnection/sharednestednotconnected/expectedoutputfiles/nestedServiceTemplate.yaml @@ -71,6 +71,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: @@ -124,6 +129,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: @@ -497,4 +507,4 @@ topology_template: - dependency local_storage_server_cmaui1: - server_cmaui1 - - 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/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml index 4f0f43aafc..60e8339d2d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/nested/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml index c765547771..317b4bfbea 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/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/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml index 2a6f61ed22..76a1936769 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/shared/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -62,6 +62,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/porttocontrailv2virtualnetworkconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/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/porttocontrailv2virtualnetworkconnection/sharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttocontrailv2virtualnetworkconnection/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/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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/nestedServiceTemplate.yaml index 39b990c6c5..a55ef38750 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttonetresourcegroupconnection/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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml index 2256009421..10a111529b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/porttosharednetresourcegrouplinking/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: @@ -139,6 +144,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: @@ -582,4 +597,4 @@ topology_template: - dependency local_storage_server_abc: - server_abc - - 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/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml index cdaddc019d..9745a51ee1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityGroupToNovaAddOn/expectedoutputfiles/MainServiceTemplate.yaml @@ -1153,6 +1153,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1173,6 +1178,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1193,6 +1203,11 @@ 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 mac_requirements: mac_count_required: is_required: false @@ -1213,6 +1228,11 @@ 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 mac_requirements: mac_count_required: is_required: false diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index f544e9313e..97acd224a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -70,6 +70,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: p2 fixed_ips: @@ -121,6 +126,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: p1 - get_input: p2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index 26dc2647ae..ce69e3b71d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -70,6 +70,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: p2 - get_input: p1 @@ -111,6 +116,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: p1 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 878aa80f9c..75d7b8a705 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -97,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: p1 fixed_ips: @@ -124,6 +129,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: p2 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index 27ccfc5867..424193becc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.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: p1 fixed_ips: @@ -109,6 +114,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: p2 - get_input: p2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml index 82b8920144..ac2f91a714 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_QRouterTemplateServiceTemplate.yaml @@ -143,6 +143,11 @@ 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: @@ -284,6 +289,11 @@ 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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml index 13f06302f7..5dfba9d054 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBAgentTemplateServiceTemplate.yaml @@ -163,6 +163,11 @@ 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: @@ -340,6 +345,11 @@ 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: @@ -370,6 +380,11 @@ 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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml index af4eef130d..3dd1ec41cd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vLBTemplateServiceTemplate.yaml @@ -155,6 +155,11 @@ 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: @@ -176,6 +181,11 @@ 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: @@ -198,6 +208,11 @@ 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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml index 2aaf8e5688..75e45b9909 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortGetResource/out/FEAdd_On_Module_vProbeTemplateServiceTemplate.yaml @@ -331,6 +331,11 @@ 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: @@ -353,6 +358,11 @@ 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: @@ -374,6 +384,11 @@ 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: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml index b1b1213804..9d661a4eb0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityRulesToPortSharedAddOn/expectedoutputfiles/MainServiceTemplate.yaml @@ -180,6 +180,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_id1 @@ -207,6 +212,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_id - get_input: security_group_id3 @@ -399,6 +409,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_id1 - get_input: security_group_id2 @@ -427,6 +442,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_id1 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml index 95d9ed636b..49ad66d1aa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityrulestoportnestedconnection/expectedoutputfiles/nestedServiceTemplate.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: - p1 @@ -107,6 +112,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: p1 fixed_ips: @@ -134,6 +144,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: p1 - get_input: p2 @@ -421,4 +436,4 @@ topology_template: - dependency link_cmaui_port_3: - cmaui_port_3 - - link + - link \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/nestedServiceTemplate.yaml index 737ac588f5..676521d53e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/securityruletosharedportlinking/expectedoutputfiles/nestedServiceTemplate.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: shared_security_group_id1 fixed_ips: @@ -105,6 +110,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: shared_security_group_id1 - get_input: p2 @@ -349,4 +359,4 @@ topology_template: - link dependency_cmaui_port_2: - cmaui_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/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml index f544e9313e..97acd224a0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested1ServiceTemplate.yaml @@ -70,6 +70,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: p2 fixed_ips: @@ -121,6 +126,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: p1 - get_input: p2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml index 26dc2647ae..ce69e3b71d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested2ServiceTemplate.yaml @@ -70,6 +70,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: p2 - get_input: p1 @@ -111,6 +116,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: p1 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml index 878aa80f9c..75d7b8a705 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested3ServiceTemplate.yaml @@ -97,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: p1 fixed_ips: @@ -124,6 +129,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: p2 fixed_ips: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index 27ccfc5867..424193becc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityrulestoportconnection/sharedNestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.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: p1 fixed_ips: @@ -109,6 +114,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: p2 - get_input: p2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml index 0181ef5e73..6c8e9e9a85 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/securityruletosharedportresourcegrouplinking/expectedoutputfiles/nestedServiceTemplate.yaml @@ -64,6 +64,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: p1 fixed_ips: @@ -104,6 +109,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: p1 - get_input: p2 @@ -348,4 +358,4 @@ topology_template: - link dependency_cmaui_port_2: - cmaui_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/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml index b99f0a0a76..8a91a43dca 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nested/expectedoutputfiles/MainServiceTemplate.yaml @@ -214,6 +214,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: @@ -428,4 +433,4 @@ topology_template: - test_Vlan2 - test_Vlan1 - server_cmaui_nova - - test_nested \ No newline at end of file + - test_nested diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml index d56b564910..652a5464a7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/MainServiceTemplate.yaml @@ -178,6 +178,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: @@ -385,4 +390,4 @@ topology_template: - test_resourceGroup - test_net1 - test_nestedInvalidConnection - - server_cmaui_nova \ No newline at end of file + - server_cmaui_nova diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml index 2169ff802d..bd6e1a1f24 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/subInterfaceToInterfaceConnection/nestedMultiLevels/expectedoutputfiles/nested4ServiceTemplate.yaml @@ -218,4 +218,4 @@ topology_template: - binding binding_template_Vlan_7: - template_Vlan_7 - - binding \ No newline at end of file + - binding diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml index 7ca5c8d941..3a995ced3b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vmme_small/expectedoutputfiles/MainServiceTemplate.yaml @@ -1438,6 +1438,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 fixed_ips: - ip_address: get_input: vlc2-oam-ip @@ -1479,6 +1484,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1503,6 +1513,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1527,6 +1542,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1551,6 +1571,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1575,6 +1600,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 fixed_ips: - ip_address: get_input: vlc2-gtp-ip @@ -1610,6 +1640,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 fixed_ips: - ip_address: get_input: fsb1-oam-ip @@ -1664,6 +1699,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1688,6 +1728,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1712,6 +1757,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1736,6 +1786,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1799,6 +1854,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1841,6 +1901,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -1865,6 +1930,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 fixed_ips: - ip_address: get_input: vlc1-sctp-b-ip @@ -1890,6 +1960,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 fixed_ips: - ip_address: get_input: vlc2-sctp-b-ip @@ -1915,6 +1990,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 fixed_ips: - ip_address: get_input: vlc1-sctp-a-ip @@ -1940,6 +2020,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 fixed_ips: - ip_address: get_input: vlc2-sctp-a-ip @@ -1976,6 +2061,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2011,6 +2101,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2035,6 +2130,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2059,6 +2159,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2083,6 +2188,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 fixed_ips: - ip_address: get_input: vlc1-oam-ip @@ -2146,6 +2256,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 fixed_ips: - ip_address: get_input: vlc1-gtp-ip @@ -2171,6 +2286,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 fixed_ips: - ip_address: get_input: fsb2-oam-ip @@ -2194,6 +2314,11 @@ 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 mac_requirements: mac_count_required: is_required: true @@ -2218,6 +2343,11 @@ 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 mac_requirements: mac_count_required: is_required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml index ae852574f3..9f58387e4b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/nested_with_inner_vol/out/nestedServiceTemplate.yaml @@ -152,6 +152,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: @@ -378,4 +383,4 @@ topology_template: - dependency dependency_cmaui_volume: - cmaui_volume - - 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/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml index acd332331a..1ee4e28abd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_and_attach_one_file/expectedoutputfiles/MainServiceTemplate.yaml @@ -272,6 +272,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/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml index 57a526f5bc..4e1a8fb538 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_nested_in_main_file_in_manifest/expectedoutputfiles/MainServiceTemplate.yaml @@ -274,6 +274,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/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml index 070dda7a32..7547be20b0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/vol_attach/volume_file_parallel_to_main_file/expectedoutputfiles/MainServiceTemplate.yaml @@ -269,6 +269,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: -- cgit 1.2.3-korg