etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bean creation errors on VsphereStoragePolicyDaoImpl

This commit is contained in:
Harikrishna Patnala 2020-06-02 21:14:27 +05:30
parent b8b4f0f9ad
commit 037fcfd032
4 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/dao/VsphereStoragePolicyDaoImpl.java
View File

@ -18,6 +18,28 @@ package com.cloud.hypervisor.vmware.dao;
import com.cloud.hypervisor.vmware.VsphereStoragePolicyVO;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
@Component
public class VsphereStoragePolicyDaoImpl extends GenericDaoBase<VsphereStoragePolicyVO, Long> implements VsphereStoragePolicyDao {
protected static final Logger LOGGER = Logger.getLogger(VsphereStoragePolicyDaoImpl.class);
private final SearchBuilder<VsphereStoragePolicyVO> zoneSearch;
private final SearchBuilder<VsphereStoragePolicyVO> policySearch;
public VsphereStoragePolicyDaoImpl() {
super();
zoneSearch = createSearchBuilder();
zoneSearch.and("zoneId", zoneSearch.entity().getZoneId(), SearchCriteria.Op.EQ);
zoneSearch.done();
policySearch = createSearchBuilder();
policySearch.and("policyId", policySearch.entity().getPolicyId(), SearchCriteria.Op.EQ);
policySearch.done();
}
}

3
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -1054,6 +1054,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
cmdList.add(UpdateVmwareDcCmd.class);
cmdList.add(RemoveVmwareDcCmd.class);
cmdList.add(ListVmwareDcsCmd.class);
cmdList.add(ImportVsphereStoragePoliciesCmd.class);
return cmdList;
}
@ -1422,7 +1423,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
PbmProfileManagerMO profileManagerMO = new PbmProfileManagerMO(context);
storageProfiles = profileManagerMO.getStorageProfiles();
} catch (Exception e) {
String msg = String.format("Unable to list storage profiles from DC %s due to : %s", vmwareDcName, VmwareHelper.getExceptionMessage(e);
String msg = String.format("Unable to list storage profiles from DC %s due to : %s", vmwareDcName, VmwareHelper.getExceptionMessage(e));
s_logger.error(msg);
throw new CloudRuntimeException(msg);
}

1
plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java
View File

@ -35,7 +35,6 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ImportVsphereStoragePoliciesResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.RoleResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.context.CallContext;
import org.apache.log4j.Logger;

2
plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/core/spring-vmware-core-context.xml
View File

@ -36,7 +36,7 @@
<bean id="VmwareDatacenterZoneMapDaoImpl"
class="com.cloud.hypervisor.vmware.dao.VmwareDatacenterZoneMapDaoImpl" />
<bean id="LegacyZoneDaoImpl" class="com.cloud.hypervisor.vmware.dao.LegacyZoneDaoImpl" />
<bean id="VsphereStoragePolicyDaoImpl" class="com.cloud.hypervisor.vmware.dao.VsphereStoragePolicyDaoImpl" />
<bean id="ciscoNexusVSMDeviceDaoImpl" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" />