apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix camel case (#5898)

Browse Source 
Co-authored-by: GutoVeronezi <daniel@scclouds.com.br>
This commit is contained in:
Daniel Augusto Veronezi Salvador 2022-01-26 19:20:18 -03:00 committed by GitHub
parent 982eef202f
commit d26ce157db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/cloud/storage/Snapshot.java
View File

@ -92,7 +92,7 @@ public interface Snapshot extends ControlledEntity, Identity, InternalIdentity,
boolean isRecursive(); boolean isRecursive();
short getsnapshotType(); short getSnapshotType();
LocationType getLocationType(); // This type is in reference to the location where the snapshot resides (ex. primary storage, archive on secondary storage, etc.) LocationType getLocationType(); // This type is in reference to the location where the snapshot resides (ex. primary storage, archive on secondary storage, etc.)
} }

2
engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java
View File

@ -830,7 +830,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
@Override @Override
public void loadHostTags(HostVO host) { public void loadHostTags(HostVO host) {
List<String> hostTags = _hostTagsDao.gethostTags(host.getId()); List<String> hostTags = _hostTagsDao.getHostTags(host.getId());
host.setHostTags(hostTags); host.setHostTags(hostTags);
} }

2
engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java
View File

@ -25,7 +25,7 @@ public interface HostTagsDao extends GenericDao<HostTagVO, Long> {
void persist(long hostId, List<String> hostTags); void persist(long hostId, List<String> hostTags);
List<String> gethostTags(long hostId); List<String> getHostTags(long hostId);
List<String> getDistinctImplicitHostTags(List<Long> hostIds, String[] implicitHostTags); List<String> getDistinctImplicitHostTags(List<Long> hostIds, String[] implicitHostTags);

2
engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java
View File

@ -48,7 +48,7 @@ public class HostTagsDaoImpl extends GenericDaoBase<HostTagVO, Long> implements
} }
@Override @Override
public List<String> gethostTags(long hostId) { public List<String> getHostTags(long hostId) {
SearchCriteria<HostTagVO> sc = HostSearch.create(); SearchCriteria<HostTagVO> sc = HostSearch.create();
sc.setParameters("hostId", hostId); sc.setParameters("hostId", hostId);

2
engine/schema/src/main/java/com/cloud/storage/SnapshotVO.java
View File

@ -168,7 +168,7 @@ public class SnapshotVO implements Snapshot {
} }
@Override @Override
public short getsnapshotType() { public short getSnapshotType() {
return snapshotType; return snapshotType;
} }

4
engine/schema/src/main/java/com/cloud/storage/dao/SnapshotDaoImpl.java
View File

@ -130,12 +130,12 @@ public class SnapshotDaoImpl extends GenericDaoBase<SnapshotVO, Long> implements
VolumeIdTypeSearch = createSearchBuilder(); VolumeIdTypeSearch = createSearchBuilder();
VolumeIdTypeSearch.and("volumeId", VolumeIdTypeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ); VolumeIdTypeSearch.and("volumeId", VolumeIdTypeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
VolumeIdTypeSearch.and("type", VolumeIdTypeSearch.entity().getsnapshotType(), SearchCriteria.Op.EQ); VolumeIdTypeSearch.and("type", VolumeIdTypeSearch.entity().getSnapshotType(), SearchCriteria.Op.EQ);
VolumeIdTypeSearch.done(); VolumeIdTypeSearch.done();
VolumeIdTypeNotDestroyedSearch = createSearchBuilder(); VolumeIdTypeNotDestroyedSearch = createSearchBuilder();
VolumeIdTypeNotDestroyedSearch.and("volumeId", VolumeIdTypeNotDestroyedSearch.entity().getVolumeId(), SearchCriteria.Op.EQ); VolumeIdTypeNotDestroyedSearch.and("volumeId", VolumeIdTypeNotDestroyedSearch.entity().getVolumeId(), SearchCriteria.Op.EQ);
VolumeIdTypeNotDestroyedSearch.and("type", VolumeIdTypeNotDestroyedSearch.entity().getsnapshotType(), SearchCriteria.Op.EQ); VolumeIdTypeNotDestroyedSearch.and("type", VolumeIdTypeNotDestroyedSearch.entity().getSnapshotType(), SearchCriteria.Op.EQ);
VolumeIdTypeNotDestroyedSearch.and("status", VolumeIdTypeNotDestroyedSearch.entity().getState(), SearchCriteria.Op.NEQ); VolumeIdTypeNotDestroyedSearch.and("status", VolumeIdTypeNotDestroyedSearch.entity().getState(), SearchCriteria.Op.NEQ);
VolumeIdTypeNotDestroyedSearch.done(); VolumeIdTypeNotDestroyedSearch.done();

4
engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
View File

@ -298,8 +298,8 @@ public class SnapshotObject implements SnapshotInfo {
} }
@Override @Override
public short getsnapshotType() { public short getSnapshotType() {
return snapshot.getsnapshotType(); return snapshot.getSnapshotType();
} }
@Override @Override

2
engine/storage/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotEntityImpl.java
View File

@ -119,7 +119,7 @@ public class SnapshotEntityImpl implements SnapshotEntity {
} }
@Override @Override
public short getsnapshotType() { public short getSnapshotType() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return 0; return 0;
} }

2
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -3750,7 +3750,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (CollectionUtils.isNotEmpty(hosts)) { if (CollectionUtils.isNotEmpty(hosts)) {
List<String> listOfHostTags = Arrays.asList(hostTags.split(",")); List<String> listOfHostTags = Arrays.asList(hostTags.split(","));
for (HostVO host : hosts) { for (HostVO host : hosts) {
List<String> tagsOnHost = hostTagDao.gethostTags(host.getId()); List<String> tagsOnHost = hostTagDao.getHostTags(host.getId());
if (CollectionUtils.isEmpty(tagsOnHost) || !tagsOnHost.containsAll(listOfHostTags)) { if (CollectionUtils.isEmpty(tagsOnHost) || !tagsOnHost.containsAll(listOfHostTags)) {
throw new InvalidParameterValueException(String.format("There are active VMs using offering [%s], and the hosts [%s] don't have the new tags", offering.getId(), hosts)); throw new InvalidParameterValueException(String.format("There are active VMs using offering [%s], and the hosts [%s] don't have the new tags", offering.getId(), hosts));
} }

4
server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View File

@ -2160,7 +2160,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
final List<String> implicitHostTags = ssCmd.getHostTags(); final List<String> implicitHostTags = ssCmd.getHostTags();
if (!implicitHostTags.isEmpty()) { if (!implicitHostTags.isEmpty()) {
if (hostTags == null) { if (hostTags == null) {
hostTags = _hostTagsDao.gethostTags(host.getId()); hostTags = _hostTagsDao.getHostTags(host.getId());
} }
if (hostTags != null) { if (hostTags != null) {
implicitHostTags.removeAll(hostTags); implicitHostTags.removeAll(hostTags);
@ -3172,7 +3172,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
@Override @Override
public String getHostTags(final long hostId) { public String getHostTags(final long hostId) {
final List<String> hostTags = _hostTagsDao.gethostTags(hostId); final List<String> hostTags = _hostTagsDao.getHostTags(hostId);
if (hostTags == null) { if (hostTags == null) {
return null; return null;
} else { } else {

4
server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
View File

@ -612,14 +612,14 @@ public class RollingMaintenanceManagerImpl extends ManagerBase implements Rollin
if (CollectionUtils.isEmpty(vmsRunning)) { if (CollectionUtils.isEmpty(vmsRunning)) {
return new Pair<>(true, "OK"); return new Pair<>(true, "OK");
} }
List<String> hostTags = hostTagsDao.gethostTags(host.getId()); List<String> hostTags = hostTagsDao.getHostTags(host.getId());
int sucessfullyCheckedVmMigrations = 0; int sucessfullyCheckedVmMigrations = 0;
for (VMInstanceVO runningVM : vmsRunning) { for (VMInstanceVO runningVM : vmsRunning) {
boolean canMigrateVm = false; boolean canMigrateVm = false;
ServiceOfferingVO serviceOffering = serviceOfferingDao.findById(runningVM.getServiceOfferingId()); ServiceOfferingVO serviceOffering = serviceOfferingDao.findById(runningVM.getServiceOfferingId());
for (Host hostInCluster : hostsInCluster) { for (Host hostInCluster : hostsInCluster) {
if (!checkHostTags(hostTags, hostTagsDao.gethostTags(hostInCluster.getId()), serviceOffering.getHostTag())) { if (!checkHostTags(hostTags, hostTagsDao.getHostTags(hostInCluster.getId()), serviceOffering.getHostTag())) {
s_logger.debug(String.format("Host tags mismatch between %s and %s Skipping it from the capacity check", host, hostInCluster)); s_logger.debug(String.format("Host tags mismatch between %s and %s Skipping it from the capacity check", host, hostInCluster));
continue; continue;
} }

4
server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View File

@ -672,8 +672,8 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE); sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE);
sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ);
sb.and("idIN", sb.entity().getId(), SearchCriteria.Op.IN); sb.and("idIN", sb.entity().getId(), SearchCriteria.Op.IN);
sb.and("snapshotTypeEQ", sb.entity().getsnapshotType(), SearchCriteria.Op.IN); sb.and("snapshotTypeEQ", sb.entity().getSnapshotType(), SearchCriteria.Op.IN);
sb.and("snapshotTypeNEQ", sb.entity().getsnapshotType(), SearchCriteria.Op.NEQ); sb.and("snapshotTypeNEQ", sb.entity().getSnapshotType(), SearchCriteria.Op.NEQ);
sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ);
if (tags != null && !tags.isEmpty()) { if (tags != null && !tags.isEmpty()) {