From f73830acbbd5760dbea2acb43da357b2e8e6e2ab Mon Sep 17 00:00:00 2001 From: nvazquez Date: Mon, 14 Sep 2020 12:12:35 -0300 Subject: [PATCH] Refactor deploy as is constants --- .../java/com/cloud/deployasis/DeployAsIsConstants.java | 10 +++++----- .../dao/TemplateDeployAsIsDetailsDaoImpl.java | 4 ++-- .../storage/image/deployasis/DeployAsIsHelperImpl.java | 10 +++++----- .../com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/com/cloud/deployasis/DeployAsIsConstants.java b/api/src/main/java/com/cloud/deployasis/DeployAsIsConstants.java index 8c50a3ff401..3dc961b9de8 100644 --- a/api/src/main/java/com/cloud/deployasis/DeployAsIsConstants.java +++ b/api/src/main/java/com/cloud/deployasis/DeployAsIsConstants.java @@ -18,10 +18,10 @@ package com.cloud.deployasis; public interface DeployAsIsConstants { - String ACS_PROPERTY_PREFIX = "ACS-property-"; - String REQUIRED_NETWORK_PREFIX = "ACS-network-"; - String OVF_HARDWARE_CONFIGURATION_PREFIX = "ACS-configuration-"; - String OVF_HARDWARE_ITEM_PREFIX = "ACS-hardware-item-"; - String OVF_EULA_SECTION_PREFIX = "ACS-eula-"; + String PROPERTY_PREFIX = "property-"; + String NETWORK_PREFIX = "network-"; + String CONFIGURATION_PREFIX = "configuration-"; + String HARDWARE_ITEM_PREFIX = "hardware-item-"; + String EULA_PREFIX = "eula-"; } diff --git a/engine/schema/src/main/java/com/cloud/deployasis/dao/TemplateDeployAsIsDetailsDaoImpl.java b/engine/schema/src/main/java/com/cloud/deployasis/dao/TemplateDeployAsIsDetailsDaoImpl.java index df21d4b4872..1ffcb13b01d 100644 --- a/engine/schema/src/main/java/com/cloud/deployasis/dao/TemplateDeployAsIsDetailsDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/deployasis/dao/TemplateDeployAsIsDetailsDaoImpl.java @@ -46,7 +46,7 @@ public class TemplateDeployAsIsDetailsDaoImpl extends ResourceDetailsDaoBase sc = createSearchCriteria(); sc.addAnd("templateId", SearchCriteria.Op.EQ, templateId); - sc.addAnd("name", SearchCriteria.Op.EQ, key.startsWith(DeployAsIsConstants.ACS_PROPERTY_PREFIX) ? key : DeployAsIsConstants.ACS_PROPERTY_PREFIX + key); + sc.addAnd("name", SearchCriteria.Op.EQ, key.startsWith(DeployAsIsConstants.PROPERTY_PREFIX) ? key : DeployAsIsConstants.PROPERTY_PREFIX + key); OVFPropertyTO property = null; TemplateDeployAsIsDetailVO detail = findOneBy(sc); if (detail != null) { @@ -66,7 +66,7 @@ public class TemplateDeployAsIsDetailsDaoImpl extends ResourceDetailsDaoBase listNetworkRequirementsByTemplateId(long templateId) { - List networkDetails = listDetailsByTemplateIdMatchingPrefix(templateId, DeployAsIsConstants.REQUIRED_NETWORK_PREFIX); + List networkDetails = listDetailsByTemplateIdMatchingPrefix(templateId, DeployAsIsConstants.NETWORK_PREFIX); List networkPrereqs = new ArrayList<>(); for (TemplateDeployAsIsDetailVO property : networkDetails) { OVFNetworkTO ovfPropertyTO = gson.fromJson(property.getValue(), OVFNetworkTO.class); diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java index 69982cd798d..fa3f0cbebc4 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java @@ -176,18 +176,18 @@ public class DeployAsIsHelperImpl implements DeployAsIsHelper { private String getKeyFromInformationTO(TemplateDeployAsIsInformationTO informationTO) { if (informationTO instanceof OVFPropertyTO) { - return DeployAsIsConstants.ACS_PROPERTY_PREFIX + ((OVFPropertyTO) informationTO).getKey(); + return DeployAsIsConstants.PROPERTY_PREFIX + ((OVFPropertyTO) informationTO).getKey(); } else if (informationTO instanceof OVFNetworkTO) { - return DeployAsIsConstants.REQUIRED_NETWORK_PREFIX + ((OVFNetworkTO) informationTO).getName(); + return DeployAsIsConstants.NETWORK_PREFIX + ((OVFNetworkTO) informationTO).getName(); } else if (informationTO instanceof OVFConfigurationTO) { - return DeployAsIsConstants.OVF_HARDWARE_CONFIGURATION_PREFIX + + return DeployAsIsConstants.CONFIGURATION_PREFIX + ((OVFConfigurationTO) informationTO).getIndex() + "-" + ((OVFConfigurationTO) informationTO).getId(); } else if (informationTO instanceof OVFVirtualHardwareItemTO) { String key = ((OVFVirtualHardwareItemTO) informationTO).getResourceType().getName().trim().replaceAll("\\s","") + "-" + ((OVFVirtualHardwareItemTO) informationTO).getInstanceId(); - return DeployAsIsConstants.OVF_HARDWARE_ITEM_PREFIX + key; + return DeployAsIsConstants.HARDWARE_ITEM_PREFIX + key; } else if (informationTO instanceof OVFEulaSectionTO) { - return DeployAsIsConstants.OVF_EULA_SECTION_PREFIX + ((OVFEulaSectionTO) informationTO).getIndex() + + return DeployAsIsConstants.EULA_PREFIX + ((OVFEulaSectionTO) informationTO).getIndex() + "-" + ((OVFEulaSectionTO) informationTO).getInfo(); } return null; diff --git a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java index 9cfe710fd71..b96b42d1339 100644 --- a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java @@ -283,7 +283,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation deployAsIsDetails = templateDeployAsIsDetailsDao.listDetails(template.getId()); for (TemplateDeployAsIsDetailVO deployAsIsDetailVO : deployAsIsDetails) { - if (deployAsIsDetailVO.getName().startsWith(DeployAsIsConstants.OVF_HARDWARE_ITEM_PREFIX)) { + if (deployAsIsDetailVO.getName().startsWith(DeployAsIsConstants.HARDWARE_ITEM_PREFIX)) { //Do not list hardware items continue; }