diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java')
| -rw-r--r-- | openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java | 93 |
1 files changed, 14 insertions, 79 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java index a4ec764e14..6dada6ab84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/globaltypes/GlobalTypesGenerator.java @@ -22,13 +22,14 @@ package org.openecomp.sdc.translator.services.heattotosca.globaltypes; import org.openecomp.sdc.tosca.datatypes.model.Import; import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaNativeTypesServiceTemplate; -import org.openecomp.sdc.tosca.services.ToscaUtil; -import org.openecomp.sdc.translator.services.heattotosca.Constants; +import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; + public class GlobalTypesGenerator { private GlobalTypesGenerator() { @@ -40,51 +41,7 @@ public class GlobalTypesGenerator { * @return the global types service template */ public static Map<String, ServiceTemplate> getGlobalTypesServiceTemplate() { - Map<String, ServiceTemplate> serviceTemplates = new HashMap<>(); - - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - CommonGlobalTypes.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - NovaServerGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - CinderVolumeGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailVirtualNetworkGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailV2VirtualNetworkGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailV2VirtualMachineInterfaceGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - NeutronNetGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - NeutronPortGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailNetworkRuleGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailV2NetworkRuleGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - NeutronSecurityRulesGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - AbstractSubstituteGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ToscaNativeTypesServiceTemplate.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailComputeGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailPortGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailV2NetworkRuleGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailV2VirtualNetworkGlobalType.createServiceTemplate()); - ToscaUtil.addServiceTemplateToMapWithKeyFileName(serviceTemplates, - ContrailAbstractSubstituteGlobalType.createServiceTemplate()); - return serviceTemplates; - } - - private static void addGlobalServiceTemplate(Map<String, ServiceTemplate> serviceTemplates, - ServiceTemplate commonServiceTemplate) { - serviceTemplates - .put(ToscaUtil.getServiceTemplateFileName(commonServiceTemplate), commonServiceTemplate); + return GlobalTypesServiceTemplates.getGlobalTypesServiceTemplates(); } /** @@ -92,37 +49,15 @@ public class GlobalTypesGenerator { * * @return the global types import list */ - public static Map<String, Import> getGlobalTypesImportList() { + public static List<Map<String, Import>> getGlobalTypesImportList() { + List<Map<String, Import>> globalImports = new ArrayList<>(); Map<String, Import> globalImportMap = new HashMap<>(); - globalImportMap.put(Constants.COMMON_GLOBAL_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.COMMON_GLOBAL_TEMPLATE_NAME)); - globalImportMap.put(Constants.NOVA_SERVER_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.NOVA_SERVER_TEMPLATE_NAME)); - globalImportMap.put(Constants.NEUTRON_PORT_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.NEUTRON_PORT_TEMPLATE_NAME)); - globalImportMap.put(Constants.NEUTRON_SECURITY_RULES_TEMPLATE_NAME, GlobalTypesUtil - .createServiceTemplateImport(Constants.NEUTRON_SECURITY_RULES_TEMPLATE_NAME)); - globalImportMap.put(Constants.NEUTRON_NET_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.NEUTRON_NET_TEMPLATE_NAME)); - globalImportMap.put(Constants.CINDER_VOLUME_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.CINDER_VOLUME_TEMPLATE_NAME)); - globalImportMap.put(Constants.CONTRAIL_VIRTUAL_NETWORK_TEMPLATE_NAME, GlobalTypesUtil - .createServiceTemplateImport(Constants.CONTRAIL_VIRTUAL_NETWORK_TEMPLATE_NAME)); - globalImportMap.put(Constants.CONTRAIL_NETWORK_RULE_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.CONTRAIL_NETWORK_RULE_TEMPLATE_NAME)); - globalImportMap.put(Constants.ABSTRACT_SUBSTITUTE_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.ABSTRACT_SUBSTITUTE_TEMPLATE_NAME)); - globalImportMap.put(Constants.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport( - Constants.CONTRAILV2_VIRTUAL_MACHINE_INTERFACE_TEMPLATE_NAME)); - globalImportMap.put(Constants.CONTRAIL_COMPUTE_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.CONTRAIL_COMPUTE_TEMPLATE_NAME)); - globalImportMap.put(Constants.CONTRAIL_PORT_TEMPLATE_NAME, - GlobalTypesUtil.createServiceTemplateImport(Constants.CONTRAIL_PORT_TEMPLATE_NAME)); - globalImportMap.put(Constants.CONTRAIL_ABSTRACT_SUBSTITUTE_TEMPLATE_NAME, GlobalTypesUtil - .createServiceTemplateImport(Constants.CONTRAIL_ABSTRACT_SUBSTITUTE_TEMPLATE_NAME)); - return globalImportMap; + Map<String, ServiceTemplate> globalTypesServiceTemplate = + GlobalTypesGenerator.getGlobalTypesServiceTemplate(); + globalImportMap.put("openecomp_heat_index", + HeatToToscaUtil.createServiceTemplateImport(globalTypesServiceTemplate.get + ("openecomp-heat/_index.yml"))); + globalImports.add(globalImportMap); + return globalImports; } - - } |