mirror of https://github.com/apache/cloudstack.git
Merge branch '4.20' into '4.22'
This commit is contained in:
Daan Hoogland
commit
11df71e55c
|
|
@ -34,9 +34,9 @@ public class RestoreBackupCommand extends Command {
|
|||
private List<String> backupVolumesUUIDs;
|
||||
private List<PrimaryDataStoreTO> restoreVolumePools;
|
||||
private List<String> restoreVolumePaths;
|
||||
private List<String> backupFiles;
|
||||
private String diskType;
|
||||
private Boolean vmExists;
|
||||
private String restoreVolumeUUID;
|
||||
private VirtualMachine.State vmState;
|
||||
private Integer mountTimeout;
|
||||
|
||||
|
|
@ -92,6 +92,14 @@ public class RestoreBackupCommand extends Command {
|
|||
this.restoreVolumePaths = restoreVolumePaths;
|
||||
}
|
||||
|
||||
public List<String> getBackupFiles() {
|
||||
return backupFiles;
|
||||
}
|
||||
|
||||
public void setBackupFiles(List<String> backupFiles) {
|
||||
this.backupFiles = backupFiles;
|
||||
}
|
||||
|
||||
public Boolean isVmExists() {
|
||||
return vmExists;
|
||||
}
|
||||
|
|
@ -116,14 +124,6 @@ public class RestoreBackupCommand extends Command {
|
|||
this.mountOptions = mountOptions;
|
||||
}
|
||||
|
||||
public String getRestoreVolumeUUID() {
|
||||
return restoreVolumeUUID;
|
||||
}
|
||||
|
||||
public void setRestoreVolumeUUID(String restoreVolumeUUID) {
|
||||
this.restoreVolumeUUID = restoreVolumeUUID;
|
||||
}
|
||||
|
||||
public VirtualMachine.State getVmState() {
|
||||
return vmState;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -167,6 +167,8 @@ public interface ResourceManager extends ResourceService, Configurable {
|
|||
|
||||
public HostVO findHostByGuid(String guid);
|
||||
|
||||
HostVO findHostByGuidPrefix(String guid);
|
||||
|
||||
public HostVO findHostByName(String name);
|
||||
|
||||
HostStats getHostStatistics(Host host);
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ public class ClusterDetailsDaoImpl extends ResourceDetailsDaoBase<ClusterDetails
|
|||
@Override
|
||||
public String getConfigValue(long id, String key) {
|
||||
ClusterDetailsVO vo = findDetail(id, key);
|
||||
return vo == null ? null : vo.getValue();
|
||||
return vo == null ? null : getActualValue(vo);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ public class DataCenterDetailsDaoImpl extends ResourceDetailsDaoBase<DataCenterD
|
|||
@Override
|
||||
public String getConfigValue(long id, String key) {
|
||||
ResourceDetail vo = findDetail(id, key);
|
||||
return vo == null ? null : vo.getValue();
|
||||
return vo == null ? null : getActualValue(vo);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1412,7 +1412,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
|
|||
SearchCriteria<HostVO> sc = TypeStatusStateSearch.create();
|
||||
sc.setParameters("type", Host.Type.Routing);
|
||||
sc.setParameters("cluster", clusterId);
|
||||
List<HostVO> list = listBy(sc, new Filter(1));
|
||||
List<HostVO> list = listBy(sc, new Filter(1, true));
|
||||
return list.isEmpty() ? null : list.get(0);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -202,7 +202,7 @@ public class ImageStoreDaoImpl extends GenericDaoBase<ImageStoreVO, Long> implem
|
|||
sc.setParameters("dataCenterId", dataCenterId);
|
||||
sc.setParameters("protocol", protocol);
|
||||
sc.setParameters("role", DataStoreRole.Image);
|
||||
Filter filter = new Filter(1);
|
||||
Filter filter = new Filter(1, true);
|
||||
List<ImageStoreVO> results = listBy(sc, filter);
|
||||
return results.size() == 0 ? null : results.get(0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,7 +57,18 @@ public class Filter {
|
|||
}
|
||||
|
||||
public Filter(long limit) {
|
||||
_orderBy = " ORDER BY RAND()";
|
||||
this(limit, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor for creating a filter with random ordering
|
||||
* @param limit the maximum number of results to return
|
||||
* @param randomize if true, orders results randomly
|
||||
*/
|
||||
public Filter(long limit, boolean randomize) {
|
||||
if (randomize) {
|
||||
_orderBy = " ORDER BY RAND()" ;
|
||||
}
|
||||
_limit = limit;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -347,7 +347,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
|
|||
@Override
|
||||
@DB()
|
||||
public T lockOneRandomRow(final SearchCriteria<T> sc, final boolean exclusive) {
|
||||
final Filter filter = new Filter(1);
|
||||
final Filter filter = new Filter(1, true);
|
||||
final List<T> beans = search(sc, filter, exclusive, true);
|
||||
return beans.isEmpty() ? null : beans.get(0);
|
||||
}
|
||||
|
|
@ -927,7 +927,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
|
|||
|
||||
@DB()
|
||||
protected T findOneIncludingRemovedBy(final SearchCriteria<T> sc) {
|
||||
Filter filter = new Filter(1);
|
||||
Filter filter = new Filter(1, true);
|
||||
List<T> results = searchIncludingRemoved(sc, filter, null, false);
|
||||
assert results.size() <= 1 : "Didn't the limiting worked?";
|
||||
return results.size() == 0 ? null : results.get(0);
|
||||
|
|
@ -1335,7 +1335,7 @@ public abstract class GenericDaoBase<T, ID extends Serializable> extends Compone
|
|||
Filter filter = null;
|
||||
final long batchSizeFinal = ObjectUtils.defaultIfNull(batchSize, 0L);
|
||||
if (batchSizeFinal > 0) {
|
||||
filter = new Filter(null, batchSizeFinal);
|
||||
filter = new Filter(batchSizeFinal);
|
||||
}
|
||||
int expunged = 0;
|
||||
int currentExpunged = 0;
|
||||
|
|
|
|||
|
|
@ -41,4 +41,62 @@ public class FilterTest {
|
|||
Assert.assertTrue(filter.getOrderBy().split(",").length == 3);
|
||||
Assert.assertTrue(filter.getOrderBy().split(",")[2].trim().toLowerCase().equals("test.fld_int asc"));
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testFilterWithLimitOnly() {
|
||||
Filter filter = new Filter(5);
|
||||
|
||||
Assert.assertEquals(Long.valueOf(5), filter.getLimit());
|
||||
Assert.assertNull(filter.getOrderBy());
|
||||
Assert.assertNull(filter.getOffset());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFilterWithLimitAndRandomizeFalse() {
|
||||
Filter filter = new Filter(10, false);
|
||||
|
||||
Assert.assertEquals(Long.valueOf(10), filter.getLimit());
|
||||
Assert.assertNull(filter.getOrderBy());
|
||||
Assert.assertNull(filter.getOffset());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFilterWithLimitAndRandomizeTrue() {
|
||||
Filter filter = new Filter(3, true);
|
||||
|
||||
Assert.assertNull(filter.getLimit());
|
||||
Assert.assertNotNull(filter.getOrderBy());
|
||||
Assert.assertTrue(filter.getOrderBy().contains("ORDER BY RAND()"));
|
||||
Assert.assertTrue(filter.getOrderBy().contains("LIMIT 3"));
|
||||
Assert.assertEquals(" ORDER BY RAND() LIMIT 3", filter.getOrderBy());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFilterRandomizeWithDifferentLimits() {
|
||||
Filter filter1 = new Filter(1, true);
|
||||
Filter filter10 = new Filter(10, true);
|
||||
Filter filter100 = new Filter(100, true);
|
||||
|
||||
Assert.assertEquals(" ORDER BY RAND() LIMIT 1", filter1.getOrderBy());
|
||||
Assert.assertEquals(" ORDER BY RAND() LIMIT 10", filter10.getOrderBy());
|
||||
Assert.assertEquals(" ORDER BY RAND() LIMIT 100", filter100.getOrderBy());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFilterConstructorBackwardsCompatibility() {
|
||||
// Test that Filter(long) behaves differently now (no ORDER BY RAND())
|
||||
// compared to Filter(long, true) which preserves old behavior
|
||||
Filter simpleLimitFilter = new Filter(1);
|
||||
Filter randomFilter = new Filter(1, true);
|
||||
|
||||
// Simple limit filter should just set limit
|
||||
Assert.assertEquals(Long.valueOf(1), simpleLimitFilter.getLimit());
|
||||
Assert.assertNull(simpleLimitFilter.getOrderBy());
|
||||
|
||||
// Random filter should set orderBy with RAND()
|
||||
Assert.assertNull(randomFilter.getLimit());
|
||||
Assert.assertNotNull(randomFilter.getOrderBy());
|
||||
Assert.assertTrue(randomFilter.getOrderBy().contains("RAND()"));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ import java.sql.ResultSet;
|
|||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
|
|
@ -263,4 +264,71 @@ public class GenericDaoBaseTest {
|
|||
" INNER JOIN tableA tableA2Alias ON tableC.column3=tableA2Alias.column2 " +
|
||||
" INNER JOIN tableA tableA3Alias ON tableD.column4=tableA3Alias.column3 AND tableD.column5=? ", joinString.toString());
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testLockOneRandomRowUsesRandomFilter() {
|
||||
// Create a mock DAO to test lockOneRandomRow behavior
|
||||
GenericDaoBase<DbTestVO, Long> testDao = Mockito.mock(GenericDaoBase.class);
|
||||
|
||||
// Capture the filter passed to the search method
|
||||
final Filter[] capturedFilter = new Filter[1];
|
||||
|
||||
Mockito.when(testDao.lockOneRandomRow(Mockito.any(SearchCriteria.class), Mockito.anyBoolean()))
|
||||
.thenCallRealMethod();
|
||||
|
||||
Mockito.when(testDao.search(Mockito.any(SearchCriteria.class), Mockito.any(Filter.class),
|
||||
Mockito.anyBoolean(), Mockito.anyBoolean()))
|
||||
.thenAnswer(invocation -> {
|
||||
capturedFilter[0] = invocation.getArgument(1);
|
||||
return new ArrayList<DbTestVO>();
|
||||
});
|
||||
|
||||
SearchCriteria<DbTestVO> sc = Mockito.mock(SearchCriteria.class);
|
||||
testDao.lockOneRandomRow(sc, true);
|
||||
|
||||
// Verify that the filter uses random ordering
|
||||
Assert.assertNotNull(capturedFilter[0]);
|
||||
Assert.assertNotNull(capturedFilter[0].getOrderBy());
|
||||
Assert.assertTrue(capturedFilter[0].getOrderBy().contains("ORDER BY RAND()"));
|
||||
Assert.assertTrue(capturedFilter[0].getOrderBy().contains("LIMIT 1"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLockOneRandomRowReturnsNullOnEmptyResult() {
|
||||
GenericDaoBase<DbTestVO, Long> testDao = Mockito.mock(GenericDaoBase.class);
|
||||
|
||||
Mockito.when(testDao.lockOneRandomRow(Mockito.any(SearchCriteria.class), Mockito.anyBoolean()))
|
||||
.thenCallRealMethod();
|
||||
|
||||
Mockito.when(testDao.search(Mockito.any(SearchCriteria.class), Mockito.any(Filter.class),
|
||||
Mockito.anyBoolean(), Mockito.anyBoolean()))
|
||||
.thenReturn(new ArrayList<DbTestVO>());
|
||||
|
||||
SearchCriteria<DbTestVO> sc = Mockito.mock(SearchCriteria.class);
|
||||
DbTestVO result = testDao.lockOneRandomRow(sc, true);
|
||||
|
||||
Assert.assertNull(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLockOneRandomRowReturnsFirstElement() {
|
||||
GenericDaoBase<DbTestVO, Long> testDao = Mockito.mock(GenericDaoBase.class);
|
||||
DbTestVO expectedResult = new DbTestVO();
|
||||
List<DbTestVO> resultList = new ArrayList<>();
|
||||
resultList.add(expectedResult);
|
||||
|
||||
Mockito.when(testDao.lockOneRandomRow(Mockito.any(SearchCriteria.class), Mockito.anyBoolean()))
|
||||
.thenCallRealMethod();
|
||||
|
||||
Mockito.when(testDao.search(Mockito.any(SearchCriteria.class), Mockito.any(Filter.class),
|
||||
Mockito.anyBoolean(), Mockito.anyBoolean()))
|
||||
.thenReturn(resultList);
|
||||
|
||||
SearchCriteria<DbTestVO> sc = Mockito.mock(SearchCriteria.class);
|
||||
DbTestVO result = testDao.lockOneRandomRow(sc, true);
|
||||
|
||||
Assert.assertNotNull(result);
|
||||
Assert.assertEquals(expectedResult, result);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -429,7 +429,7 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
|
|||
}
|
||||
|
||||
injectPresetVariablesIntoJsInterpreter(jsInterpreter, presetVariables);
|
||||
jsInterpreter.injectVariable("lastTariffs", lastAppliedTariffsList.toString());
|
||||
jsInterpreter.injectVariable("lastTariffs", lastAppliedTariffsList);
|
||||
|
||||
String scriptResult = jsInterpreter.executeScript(activationRule).toString();
|
||||
|
||||
|
|
@ -459,12 +459,12 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
|
|||
protected void injectPresetVariablesIntoJsInterpreter(JsInterpreter jsInterpreter, PresetVariables presetVariables) {
|
||||
jsInterpreter.discardCurrentVariables();
|
||||
|
||||
jsInterpreter.injectVariable("account", presetVariables.getAccount().toString());
|
||||
jsInterpreter.injectVariable("domain", presetVariables.getDomain().toString());
|
||||
jsInterpreter.injectVariable("account", presetVariables.getAccount());
|
||||
jsInterpreter.injectVariable("domain", presetVariables.getDomain());
|
||||
|
||||
GenericPresetVariable project = presetVariables.getProject();
|
||||
if (project != null) {
|
||||
jsInterpreter.injectVariable("project", project.toString());
|
||||
jsInterpreter.injectVariable("project", project);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -474,8 +474,8 @@ public class QuotaManagerImpl extends ManagerBase implements QuotaManager {
|
|||
}
|
||||
|
||||
jsInterpreter.injectVariable("resourceType", presetVariables.getResourceType());
|
||||
jsInterpreter.injectVariable("value", presetVariables.getValue().toString());
|
||||
jsInterpreter.injectVariable("zone", presetVariables.getZone().toString());
|
||||
jsInterpreter.injectVariable("value", presetVariables.getValue());
|
||||
jsInterpreter.injectVariable("zone", presetVariables.getZone());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ public class Account extends GenericPresetVariable {
|
|||
|
||||
public void setRole(Role role) {
|
||||
this.role = role;
|
||||
fieldNamesToIncludeInToString.add("role");
|
||||
}
|
||||
|
||||
public String getCreated() {
|
||||
|
|
@ -45,6 +44,5 @@ public class Account extends GenericPresetVariable {
|
|||
|
||||
public void setCreated(Date created) {
|
||||
this.created = DateUtil.displayDateInTimezone(TimeZone.getTimeZone("GMT"), created);
|
||||
fieldNamesToIncludeInToString.add("created");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,6 +29,5 @@ public class BackupOffering extends GenericPresetVariable {
|
|||
|
||||
public void setExternalId(String externalId) {
|
||||
this.externalId = externalId;
|
||||
fieldNamesToIncludeInToString.add("externalId");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ public class ComputeOffering extends GenericPresetVariable {
|
|||
|
||||
public void setCustomized(boolean customized) {
|
||||
this.customized = customized;
|
||||
fieldNamesToIncludeInToString.add("customized");
|
||||
}
|
||||
|
||||
public boolean offerHa() {
|
||||
|
|
@ -41,7 +40,5 @@ public class ComputeOffering extends GenericPresetVariable {
|
|||
|
||||
public void setOfferHa(boolean offerHa) {
|
||||
this.offerHa = offerHa;
|
||||
fieldNamesToIncludeInToString.add("offerHa");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,5 @@ public class Configuration extends GenericPresetVariable{
|
|||
|
||||
public void setForceHa(boolean forceHa) {
|
||||
this.forceHa = forceHa;
|
||||
fieldNamesToIncludeInToString.add("forceHa");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setBytesReadRate(Long bytesReadRate) {
|
||||
this.bytesReadRate = bytesReadRate;
|
||||
fieldNamesToIncludeInToString.add("bytesReadRate");
|
||||
}
|
||||
|
||||
public Long getBytesReadBurst() {
|
||||
|
|
@ -70,7 +69,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setBytesReadBurst(Long bytesReadBurst) {
|
||||
this.bytesReadBurst = bytesReadBurst;
|
||||
fieldNamesToIncludeInToString.add("bytesReadBurst");
|
||||
}
|
||||
|
||||
public Long getBytesReadBurstLength() {
|
||||
|
|
@ -79,7 +77,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setBytesReadBurstLength(Long bytesReadBurstLength) {
|
||||
this.bytesReadBurstLength = bytesReadBurstLength;
|
||||
fieldNamesToIncludeInToString.add("bytesReadBurstLength");
|
||||
}
|
||||
|
||||
public Long getBytesWriteRate() {
|
||||
|
|
@ -88,7 +85,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setBytesWriteRate(Long bytesWriteRate) {
|
||||
this.bytesWriteRate = bytesWriteRate;
|
||||
fieldNamesToIncludeInToString.add("bytesWriteRate");
|
||||
}
|
||||
|
||||
public Long getBytesWriteBurst() {
|
||||
|
|
@ -97,7 +93,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setBytesWriteBurst(Long bytesWriteBurst) {
|
||||
this.bytesWriteBurst = bytesWriteBurst;
|
||||
fieldNamesToIncludeInToString.add("bytesWriteBurst");
|
||||
}
|
||||
|
||||
public Long getBytesWriteBurstLength() {
|
||||
|
|
@ -106,7 +101,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setBytesWriteBurstLength(Long bytesWriteBurstLength) {
|
||||
this.bytesWriteBurstLength = bytesWriteBurstLength;
|
||||
fieldNamesToIncludeInToString.add("bytesWriteBurstLength");
|
||||
}
|
||||
|
||||
public Long getIopsReadRate() {
|
||||
|
|
@ -115,7 +109,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setIopsReadRate(Long iopsReadRate) {
|
||||
this.iopsReadRate = iopsReadRate;
|
||||
fieldNamesToIncludeInToString.add("iopsReadRate");
|
||||
}
|
||||
|
||||
public Long getIopsReadBurst() {
|
||||
|
|
@ -124,7 +117,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setIopsReadBurst(Long iopsReadBurst) {
|
||||
this.iopsReadBurst = iopsReadBurst;
|
||||
fieldNamesToIncludeInToString.add("iopsReadBurst");
|
||||
}
|
||||
|
||||
public Long getIopsReadBurstLength() {
|
||||
|
|
@ -133,7 +125,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setIopsReadBurstLength(Long iopsReadBurstLength) {
|
||||
this.iopsReadBurstLength = iopsReadBurstLength;
|
||||
fieldNamesToIncludeInToString.add("iopsReadBurstLength");
|
||||
}
|
||||
|
||||
public Long getIopsWriteRate() {
|
||||
|
|
@ -142,7 +133,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setIopsWriteRate(Long iopsWriteRate) {
|
||||
this.iopsWriteRate = iopsWriteRate;
|
||||
fieldNamesToIncludeInToString.add("iopsWriteRate");
|
||||
}
|
||||
|
||||
public Long getIopsWriteBurst() {
|
||||
|
|
@ -151,7 +141,6 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setIopsWriteBurst(Long iopsWriteBurst) {
|
||||
this.iopsWriteBurst = iopsWriteBurst;
|
||||
fieldNamesToIncludeInToString.add("iopsWriteBurst");
|
||||
}
|
||||
|
||||
public Long getIopsWriteBurstLength() {
|
||||
|
|
@ -160,6 +149,5 @@ public class DiskOfferingPresetVariables extends GenericPresetVariable {
|
|||
|
||||
public void setIopsWriteBurstLength(Long iopsWriteBurstLength) {
|
||||
this.iopsWriteBurstLength = iopsWriteBurstLength;
|
||||
fieldNamesToIncludeInToString.add("iopsWriteBurstLength");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ public class Domain extends GenericPresetVariable {
|
|||
|
||||
public void setPath(String path) {
|
||||
this.path = path;
|
||||
fieldNamesToIncludeInToString.add("path");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,10 +17,8 @@
|
|||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
public class GenericPresetVariable {
|
||||
@PresetVariableDefinition(description = "ID of the resource.")
|
||||
|
|
@ -29,15 +27,12 @@ public class GenericPresetVariable {
|
|||
@PresetVariableDefinition(description = "Name of the resource.")
|
||||
private String name;
|
||||
|
||||
protected transient Set<String> fieldNamesToIncludeInToString = new HashSet<>();
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
fieldNamesToIncludeInToString.add("id");
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
|
|
@ -46,15 +41,10 @@ public class GenericPresetVariable {
|
|||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
fieldNamesToIncludeInToString.add("name");
|
||||
}
|
||||
|
||||
/***
|
||||
* Converts the preset variable into a valid JSON object that will be injected into the JS interpreter.
|
||||
* This method should not be overridden or changed.
|
||||
*/
|
||||
@Override
|
||||
public final String toString() {
|
||||
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, fieldNamesToIncludeInToString.toArray(new String[0]));
|
||||
public String toString() {
|
||||
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ public class Host extends GenericPresetVariable {
|
|||
|
||||
public void setTags(List<String> tags) {
|
||||
this.tags = tags;
|
||||
fieldNamesToIncludeInToString.add("tags");
|
||||
}
|
||||
|
||||
public Boolean getIsTagARule() {
|
||||
|
|
@ -41,6 +40,5 @@ public class Host extends GenericPresetVariable {
|
|||
|
||||
public void setIsTagARule(Boolean isTagARule) {
|
||||
this.isTagARule = isTagARule;
|
||||
fieldNamesToIncludeInToString.add("isTagARule");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ public class PresetVariableHelper {
|
|||
Role role = new Role();
|
||||
role.setId(roleVo.getUuid());
|
||||
role.setName(roleVo.getName());
|
||||
role.setType(roleVo.getRoleType());
|
||||
role.setType(roleVo.getRoleType().toString());
|
||||
|
||||
return role;
|
||||
}
|
||||
|
|
@ -538,8 +538,8 @@ public class PresetVariableHelper {
|
|||
value.setDiskOffering(getPresetVariableValueDiskOffering(volumeVo.getDiskOfferingId()));
|
||||
value.setId(volumeVo.getUuid());
|
||||
value.setName(volumeVo.getName());
|
||||
value.setProvisioningType(volumeVo.getProvisioningType());
|
||||
value.setVolumeType(volumeVo.getVolumeType());
|
||||
value.setVolumeType(volumeVo.getVolumeType().toString());
|
||||
value.setProvisioningType(volumeVo.getProvisioningType().toString());
|
||||
|
||||
Long poolId = volumeVo.getPoolId();
|
||||
if (poolId == null) {
|
||||
|
|
@ -594,7 +594,7 @@ public class PresetVariableHelper {
|
|||
storage = new Storage();
|
||||
storage.setId(storagePoolVo.getUuid());
|
||||
storage.setName(storagePoolVo.getName());
|
||||
storage.setScope(storagePoolVo.getScope());
|
||||
storage.setScope(storagePoolVo.getScope().toString());
|
||||
List<StoragePoolTagVO> storagePoolTagVOList = storagePoolTagsDao.findStoragePoolTags(storageId);
|
||||
List<String> storageTags = new ArrayList<>();
|
||||
boolean isTagARule = false;
|
||||
|
|
@ -663,7 +663,7 @@ public class PresetVariableHelper {
|
|||
value.setId(snapshotVo.getUuid());
|
||||
value.setName(snapshotVo.getName());
|
||||
value.setSize(ByteScaleUtils.bytesToMebibytes(snapshotVo.getSize()));
|
||||
value.setSnapshotType(Snapshot.Type.values()[snapshotVo.getSnapshotType()]);
|
||||
value.setSnapshotType(Snapshot.Type.values()[snapshotVo.getSnapshotType()].toString());
|
||||
value.setStorage(getPresetVariableValueStorage(getSnapshotDataStoreId(snapshotId, usageRecord.getZoneId()), usageType));
|
||||
value.setTags(getPresetVariableValueResourceTags(snapshotId, ResourceObjectType.Snapshot));
|
||||
Hypervisor.HypervisorType hypervisorType = snapshotVo.getHypervisorType();
|
||||
|
|
@ -732,7 +732,7 @@ public class PresetVariableHelper {
|
|||
value.setId(vmSnapshotVo.getUuid());
|
||||
value.setName(vmSnapshotVo.getName());
|
||||
value.setTags(getPresetVariableValueResourceTags(vmSnapshotId, ResourceObjectType.VMSnapshot));
|
||||
value.setVmSnapshotType(vmSnapshotVo.getType());
|
||||
value.setVmSnapshotType(vmSnapshotVo.getType().toString());
|
||||
|
||||
VMInstanceVO vmVo = vmInstanceDao.findByIdIncludingRemoved(vmSnapshotVo.getVmId());
|
||||
if (vmVo != null && vmVo.getHypervisorType() != null) {
|
||||
|
|
|
|||
|
|
@ -17,19 +17,16 @@
|
|||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.apache.cloudstack.acl.RoleType;
|
||||
|
||||
public class Role extends GenericPresetVariable {
|
||||
@PresetVariableDefinition(description = "Role type of the resource's owner.")
|
||||
private RoleType type;
|
||||
private String type;
|
||||
|
||||
public RoleType getType() {
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(RoleType type) {
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
fieldNamesToIncludeInToString.add("type");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ package org.apache.cloudstack.quota.activationrule.presetvariables;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
import com.cloud.storage.ScopeType;
|
||||
|
||||
public class Storage extends GenericPresetVariable {
|
||||
@PresetVariableDefinition(description = "List of string representing the tags of the storage where the volume is (i.e.: [\"a\", \"b\"]).")
|
||||
private List<String> tags;
|
||||
|
|
@ -29,7 +27,7 @@ public class Storage extends GenericPresetVariable {
|
|||
private Boolean isTagARule;
|
||||
|
||||
@PresetVariableDefinition(description = "Scope of the storage where the volume is. Values can be: ZONE, CLUSTER or HOST. Applicable only for primary storages.")
|
||||
private ScopeType scope;
|
||||
private String scope;
|
||||
|
||||
public List<String> getTags() {
|
||||
return tags;
|
||||
|
|
@ -37,7 +35,6 @@ public class Storage extends GenericPresetVariable {
|
|||
|
||||
public void setTags(List<String> tags) {
|
||||
this.tags = tags;
|
||||
fieldNamesToIncludeInToString.add("tags");
|
||||
}
|
||||
|
||||
public Boolean getIsTagARule() {
|
||||
|
|
@ -46,16 +43,14 @@ public class Storage extends GenericPresetVariable {
|
|||
|
||||
public void setIsTagARule(Boolean isTagARule) {
|
||||
this.isTagARule = isTagARule;
|
||||
fieldNamesToIncludeInToString.add("isTagARule");
|
||||
}
|
||||
|
||||
public ScopeType getScope() {
|
||||
public String getScope() {
|
||||
return scope;
|
||||
}
|
||||
|
||||
public void setScope(ScopeType scope) {
|
||||
public void setScope(String scope) {
|
||||
this.scope = scope;
|
||||
fieldNamesToIncludeInToString.add("scope");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,5 @@ public class Tariff extends GenericPresetVariable {
|
|||
|
||||
public void setValue(BigDecimal value) {
|
||||
this.value = value;
|
||||
fieldNamesToIncludeInToString.add("value");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@ package org.apache.cloudstack.quota.activationrule.presetvariables;
|
|||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.cloud.storage.Snapshot;
|
||||
import com.cloud.storage.Storage.ProvisioningType;
|
||||
import com.cloud.storage.Volume;
|
||||
import com.cloud.vm.snapshot.VMSnapshot;
|
||||
import org.apache.cloudstack.quota.constant.QuotaTypes;
|
||||
|
||||
public class Value extends GenericPresetVariable {
|
||||
|
|
@ -61,13 +57,13 @@ public class Value extends GenericPresetVariable {
|
|||
private Long virtualSize;
|
||||
|
||||
@PresetVariableDefinition(description = "Provisioning type of the resource. Values can be: thin, sparse or fat.", supportedTypes = {QuotaTypes.VOLUME})
|
||||
private ProvisioningType provisioningType;
|
||||
private String provisioningType;
|
||||
|
||||
@PresetVariableDefinition(description = "Type of the snapshot. Values can be: MANUAL, RECURRING, HOURLY, DAILY, WEEKLY and MONTHLY.", supportedTypes = {QuotaTypes.SNAPSHOT})
|
||||
private Snapshot.Type snapshotType;
|
||||
private String snapshotType;
|
||||
|
||||
@PresetVariableDefinition(description = "Type of the VM snapshot. Values can be: Disk or DiskAndMemory.", supportedTypes = {QuotaTypes.VM_SNAPSHOT})
|
||||
private VMSnapshot.Type vmSnapshotType;
|
||||
private String vmSnapshotType;
|
||||
|
||||
@PresetVariableDefinition(description = "Computing offering of the VM.", supportedTypes = {QuotaTypes.RUNNING_VM, QuotaTypes.ALLOCATED_VM})
|
||||
private ComputeOffering computeOffering;
|
||||
|
|
@ -96,7 +92,7 @@ public class Value extends GenericPresetVariable {
|
|||
private String volumeFormat;
|
||||
|
||||
@PresetVariableDefinition(description = "The volume type. Values can be: UNKNOWN, ROOT, SWAP, DATADISK and ISO.", supportedTypes = {QuotaTypes.VOLUME})
|
||||
private Volume.Type volumeType;
|
||||
private String volumeType;
|
||||
|
||||
private String state;
|
||||
|
||||
|
|
@ -106,7 +102,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setHost(Host host) {
|
||||
this.host = host;
|
||||
fieldNamesToIncludeInToString.add("host");
|
||||
}
|
||||
|
||||
public String getOsName() {
|
||||
|
|
@ -115,7 +110,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setOsName(String osName) {
|
||||
this.osName = osName;
|
||||
fieldNamesToIncludeInToString.add("osName");
|
||||
}
|
||||
|
||||
public List<Resource> getAccountResources() {
|
||||
|
|
@ -124,7 +118,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setAccountResources(List<Resource> accountResources) {
|
||||
this.accountResources = accountResources;
|
||||
fieldNamesToIncludeInToString.add("accountResources");
|
||||
}
|
||||
|
||||
public Map<String, String> getTags() {
|
||||
|
|
@ -133,7 +126,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setTags(Map<String, String> tags) {
|
||||
this.tags = tags;
|
||||
fieldNamesToIncludeInToString.add("tags");
|
||||
}
|
||||
|
||||
public String getTag() {
|
||||
|
|
@ -142,7 +134,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setTag(String tag) {
|
||||
this.tag = tag;
|
||||
fieldNamesToIncludeInToString.add("tag");
|
||||
}
|
||||
|
||||
public Long getSize() {
|
||||
|
|
@ -151,34 +142,30 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setSize(Long size) {
|
||||
this.size = size;
|
||||
fieldNamesToIncludeInToString.add("size");
|
||||
}
|
||||
|
||||
public ProvisioningType getProvisioningType() {
|
||||
public String getProvisioningType() {
|
||||
return provisioningType;
|
||||
}
|
||||
|
||||
public void setProvisioningType(ProvisioningType provisioningType) {
|
||||
public void setProvisioningType(String provisioningType) {
|
||||
this.provisioningType = provisioningType;
|
||||
fieldNamesToIncludeInToString.add("provisioningType");
|
||||
}
|
||||
|
||||
public Snapshot.Type getSnapshotType() {
|
||||
public String getSnapshotType() {
|
||||
return snapshotType;
|
||||
}
|
||||
|
||||
public void setSnapshotType(Snapshot.Type snapshotType) {
|
||||
public void setSnapshotType(String snapshotType) {
|
||||
this.snapshotType = snapshotType;
|
||||
fieldNamesToIncludeInToString.add("snapshotType");
|
||||
}
|
||||
|
||||
public VMSnapshot.Type getVmSnapshotType() {
|
||||
public String getVmSnapshotType() {
|
||||
return vmSnapshotType;
|
||||
}
|
||||
|
||||
public void setVmSnapshotType(VMSnapshot.Type vmSnapshotType) {
|
||||
public void setVmSnapshotType(String vmSnapshotType) {
|
||||
this.vmSnapshotType = vmSnapshotType;
|
||||
fieldNamesToIncludeInToString.add("vmSnapshotType");
|
||||
}
|
||||
|
||||
public ComputeOffering getComputeOffering() {
|
||||
|
|
@ -187,7 +174,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setComputeOffering(ComputeOffering computeOffering) {
|
||||
this.computeOffering = computeOffering;
|
||||
fieldNamesToIncludeInToString.add("computeOffering");
|
||||
}
|
||||
|
||||
public GenericPresetVariable getTemplate() {
|
||||
|
|
@ -196,7 +182,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setTemplate(GenericPresetVariable template) {
|
||||
this.template = template;
|
||||
fieldNamesToIncludeInToString.add("template");
|
||||
}
|
||||
|
||||
public DiskOfferingPresetVariables getDiskOffering() {
|
||||
|
|
@ -205,7 +190,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setDiskOffering(DiskOfferingPresetVariables diskOffering) {
|
||||
this.diskOffering = diskOffering;
|
||||
fieldNamesToIncludeInToString.add("diskOffering");
|
||||
}
|
||||
|
||||
public Storage getStorage() {
|
||||
|
|
@ -214,7 +198,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setStorage(Storage storage) {
|
||||
this.storage = storage;
|
||||
fieldNamesToIncludeInToString.add("storage");
|
||||
}
|
||||
|
||||
public ComputingResources getComputingResources() {
|
||||
|
|
@ -223,7 +206,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setComputingResources(ComputingResources computingResources) {
|
||||
this.computingResources = computingResources;
|
||||
fieldNamesToIncludeInToString.add("computingResources");
|
||||
}
|
||||
|
||||
public Long getVirtualSize() {
|
||||
|
|
@ -232,7 +214,6 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setVirtualSize(Long virtualSize) {
|
||||
this.virtualSize = virtualSize;
|
||||
fieldNamesToIncludeInToString.add("virtualSize");
|
||||
}
|
||||
|
||||
public BackupOffering getBackupOffering() {
|
||||
|
|
@ -241,12 +222,10 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setBackupOffering(BackupOffering backupOffering) {
|
||||
this.backupOffering = backupOffering;
|
||||
fieldNamesToIncludeInToString.add("backupOffering");
|
||||
}
|
||||
|
||||
public void setHypervisorType(String hypervisorType) {
|
||||
this.hypervisorType = hypervisorType;
|
||||
fieldNamesToIncludeInToString.add("hypervisorType");
|
||||
}
|
||||
|
||||
public String getHypervisorType() {
|
||||
|
|
@ -255,20 +234,18 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setVolumeFormat(String volumeFormat) {
|
||||
this.volumeFormat = volumeFormat;
|
||||
fieldNamesToIncludeInToString.add("volumeFormat");
|
||||
}
|
||||
|
||||
public String getVolumeFormat() {
|
||||
return volumeFormat;
|
||||
}
|
||||
|
||||
public Volume.Type getVolumeType() {
|
||||
public String getVolumeType() {
|
||||
return volumeType;
|
||||
}
|
||||
|
||||
public void setVolumeType(Volume.Type volumeType) {
|
||||
public void setVolumeType(String volumeType) {
|
||||
this.volumeType = volumeType;
|
||||
fieldNamesToIncludeInToString.add("volumeType");
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
|
|
@ -277,6 +254,5 @@ public class Value extends GenericPresetVariable {
|
|||
|
||||
public void setState(String state) {
|
||||
this.state = state;
|
||||
fieldNamesToIncludeInToString.add("state");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -267,12 +267,12 @@ public class QuotaManagerImplTest {
|
|||
|
||||
quotaManagerImplSpy.injectPresetVariablesIntoJsInterpreter(jsInterpreterMock, presetVariablesMock);
|
||||
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("account"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("domain"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock, Mockito.never()).injectVariable(Mockito.eq("project"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("resourceType"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("value"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("zone"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("account"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("domain"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock, Mockito.never()).injectVariable(Mockito.eq("project"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("resourceType"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("value"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("zone"), Mockito.any());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -288,12 +288,12 @@ public class QuotaManagerImplTest {
|
|||
|
||||
quotaManagerImplSpy.injectPresetVariablesIntoJsInterpreter(jsInterpreterMock, presetVariablesMock);
|
||||
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("account"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("domain"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("project"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("resourceType"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("value"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("zone"), Mockito.anyString());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("account"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("domain"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("project"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("resourceType"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("value"), Mockito.any());
|
||||
Mockito.verify(jsInterpreterMock).injectVariable(Mockito.eq("zone"), Mockito.any());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class AccountTest {
|
||||
|
||||
@Test
|
||||
public void setRoleTestAddFieldRoleToCollection() {
|
||||
Account variable = new Account();
|
||||
variable.setRole(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("role"));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class BackupOfferingTest {
|
||||
@Test
|
||||
public void setExternalIdTestAddFieldExternalIdToCollection() {
|
||||
BackupOffering backupOffering = new BackupOffering();
|
||||
backupOffering.setExternalId("any-external-id");
|
||||
Assert.assertTrue(backupOffering.fieldNamesToIncludeInToString.contains("externalId"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class ComputeOfferingTest {
|
||||
|
||||
@Test
|
||||
public void setCustomizedTestAddFieldCustomizedToCollection() {
|
||||
ComputeOffering variable = new ComputeOffering();
|
||||
variable.setCustomized(true);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("customized"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class ComputingResourcesTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnAJson() {
|
||||
ComputingResources variable = new ComputingResources();
|
||||
|
||||
String expected = ToStringBuilder.reflectionToString(variable, ToStringStyle.JSON_STYLE);
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class DomainTest {
|
||||
|
||||
@Test
|
||||
public void setPathTestAddFieldPathToCollection() {
|
||||
Domain variable = new Domain();
|
||||
variable.setPath("test path");
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("path"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class GenericPresetVariableTest {
|
||||
|
||||
@Test
|
||||
public void setIdTestAddFieldIdToCollection() {
|
||||
GenericPresetVariable variable = new GenericPresetVariable();
|
||||
variable.setId("test");
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("id"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setNameTestAddFieldNameToCollection() {
|
||||
GenericPresetVariable variable = new GenericPresetVariable();
|
||||
variable.setName("test");
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("name"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void toStringTestSetAllFieldsAndReturnAJson() {
|
||||
GenericPresetVariable variable = new GenericPresetVariable();
|
||||
variable.setId("test id");
|
||||
variable.setName("test name");
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "id", "name");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void toStringTestSetSomeFieldsAndReturnAJson() {
|
||||
GenericPresetVariable variable = new GenericPresetVariable();
|
||||
variable.setId("test id");
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "id");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
|
||||
variable = new GenericPresetVariable();
|
||||
variable.setName("test name");
|
||||
|
||||
expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "name");
|
||||
result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class HostTest {
|
||||
|
||||
@Test
|
||||
public void setTagsTestAddFieldTagsToCollection() {
|
||||
Host variable = new Host();
|
||||
variable.setTags(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("tags"));
|
||||
}
|
||||
}
|
||||
|
|
@ -215,14 +215,14 @@ public class PresetVariableHelperTest {
|
|||
value.setTags(Collections.singletonMap("tag1", "value1"));
|
||||
value.setTemplate(getGenericPresetVariableForTests());
|
||||
value.setDiskOffering(getDiskOfferingForTests());
|
||||
value.setProvisioningType(ProvisioningType.THIN);
|
||||
value.setProvisioningType(ProvisioningType.THIN.toString());
|
||||
value.setStorage(getStorageForTests());
|
||||
value.setSize(ByteScaleUtils.GiB);
|
||||
value.setSnapshotType(Snapshot.Type.HOURLY);
|
||||
value.setSnapshotType(Snapshot.Type.HOURLY.toString());
|
||||
value.setTag("tag_test");
|
||||
value.setVmSnapshotType(VMSnapshot.Type.Disk);
|
||||
value.setVmSnapshotType(VMSnapshot.Type.Disk.toString());
|
||||
value.setComputingResources(getComputingResourcesForTests());
|
||||
value.setVolumeType(Volume.Type.DATADISK);
|
||||
value.setVolumeType(Volume.Type.DATADISK.toString());
|
||||
return value;
|
||||
}
|
||||
|
||||
|
|
@ -272,7 +272,7 @@ public class PresetVariableHelperTest {
|
|||
storage.setId("storage_id");
|
||||
storage.setName("storage_name");
|
||||
storage.setTags(Arrays.asList("tag1", "tag2"));
|
||||
storage.setScope(ScopeType.ZONE);
|
||||
storage.setScope(ScopeType.ZONE.toString());
|
||||
return storage;
|
||||
}
|
||||
|
||||
|
|
@ -298,9 +298,9 @@ public class PresetVariableHelperTest {
|
|||
|
||||
private List<VMInstanceDetailVO> getVmDetailsForTests() {
|
||||
List<VMInstanceDetailVO> details = new LinkedList<>();
|
||||
details.add(new VMInstanceDetailVO(1l, "test_with_value", "277", false));
|
||||
details.add(new VMInstanceDetailVO(1l, "test_with_invalid_value", "invalid", false));
|
||||
details.add(new VMInstanceDetailVO(1l, "test_with_null", null, false));
|
||||
details.add(new VMInstanceDetailVO(1L, "test_with_value", "277", false));
|
||||
details.add(new VMInstanceDetailVO(1L, "test_with_invalid_value", "invalid", false));
|
||||
details.add(new VMInstanceDetailVO(1L, "test_with_null", null, false));
|
||||
return details;
|
||||
}
|
||||
|
||||
|
|
@ -309,13 +309,6 @@ public class PresetVariableHelperTest {
|
|||
Assert.assertEquals(expected.getName(), result.getName());
|
||||
}
|
||||
|
||||
private void validateFieldNamesToIncludeInToString(List<String> expected, GenericPresetVariable resultObject) {
|
||||
List<String> result = new ArrayList<>(resultObject.fieldNamesToIncludeInToString);
|
||||
Collections.sort(expected);
|
||||
Collections.sort(result);
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
private BackupOffering getBackupOfferingForTests() {
|
||||
BackupOffering backupOffering = new BackupOffering();
|
||||
backupOffering.setId("backup_offering_id");
|
||||
|
|
@ -415,7 +408,6 @@ public class PresetVariableHelperTest {
|
|||
|
||||
Assert.assertNotNull(result.getProject());
|
||||
assertPresetVariableIdAndName(account, result.getProject());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"), result.getProject());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -430,10 +422,9 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(account.getName()).when(accountVoMock).getName();
|
||||
Mockito.doReturn(account.getCreated()).when(accountVoMock).getCreated();
|
||||
|
||||
Account result = presetVariableHelperSpy.getPresetVariableAccount(1l);
|
||||
Account result = presetVariableHelperSpy.getPresetVariableAccount(1L);
|
||||
|
||||
assertPresetVariableIdAndName(account, result);
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("created", "id", "name"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -463,18 +454,16 @@ public class PresetVariableHelperTest {
|
|||
Role role = new Role();
|
||||
role.setId("test_id");
|
||||
role.setName("test_name");
|
||||
role.setType(roleType);
|
||||
role.setType(roleType.toString());
|
||||
|
||||
Mockito.doReturn(role.getId()).when(roleVoMock).getUuid();
|
||||
Mockito.doReturn(role.getName()).when(roleVoMock).getName();
|
||||
Mockito.doReturn(role.getType()).when(roleVoMock).getRoleType();
|
||||
Mockito.doReturn(RoleType.fromString(role.getType())).when(roleVoMock).getRoleType();
|
||||
|
||||
Role result = presetVariableHelperSpy.getPresetVariableRole(1l);
|
||||
Role result = presetVariableHelperSpy.getPresetVariableRole(1L);
|
||||
|
||||
assertPresetVariableIdAndName(role, result);
|
||||
Assert.assertEquals(role.getType(), result.getType());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "type"), result);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -489,12 +478,10 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(domain.getName()).when(domainVoMock).getName();
|
||||
Mockito.doReturn(domain.getPath()).when(domainVoMock).getPath();
|
||||
|
||||
Domain result = presetVariableHelperSpy.getPresetVariableDomain(1l);
|
||||
Domain result = presetVariableHelperSpy.getPresetVariableDomain(1L);
|
||||
|
||||
assertPresetVariableIdAndName(domain, result);
|
||||
Assert.assertEquals(domain.getPath(), result.getPath());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "path"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -507,10 +494,9 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getId()).when(dataCenterVoMock).getUuid();
|
||||
Mockito.doReturn(expected.getName()).when(dataCenterVoMock).getName();
|
||||
|
||||
GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableZone(1l);
|
||||
GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableZone(1L);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -531,7 +517,6 @@ public class PresetVariableHelperTest {
|
|||
Value result = presetVariableHelperSpy.getPresetVariableValue(usageVoMock);
|
||||
|
||||
Assert.assertEquals(resources, result.getAccountResources());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("accountResources"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -541,7 +526,7 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(new Date()).when(usageVoMock).getEndDate();
|
||||
Mockito.doReturn(expected).when(usageDaoMock).listAccountResourcesInThePeriod(Mockito.anyLong(), Mockito.anyInt(), Mockito.any(Date.class), Mockito.any(Date.class));
|
||||
|
||||
List<Resource> result = presetVariableHelperSpy.getPresetVariableAccountResources(usageVoMock, 1l, 0);
|
||||
List<Resource> result = presetVariableHelperSpy.getPresetVariableAccountResources(usageVoMock, 1L, 0);
|
||||
|
||||
for (int i = 0; i < expected.size(); i++) {
|
||||
Assert.assertEquals(expected.get(i).first(), result.get(i).getZoneId());
|
||||
|
|
@ -590,8 +575,6 @@ public class PresetVariableHelperTest {
|
|||
Assert.assertEquals(expected.getTags(), result.getTags());
|
||||
Assert.assertEquals(expected.getTemplate(), result.getTemplate());
|
||||
Assert.assertEquals(hypervisorType.name(), result.getHypervisorType());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "osName", "tags", "template", "hypervisorType"), result);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -614,7 +597,6 @@ public class PresetVariableHelperTest {
|
|||
public void setPresetVariableHostInValueIfUsageTypeIsRunningVmTestQuotaTypeIsRunningVmSetHost() {
|
||||
Value result = new Value();
|
||||
Host expectedHost = getHostForTests();
|
||||
List<HostTagVO> expectedHostTags = getHostTagsForTests();
|
||||
|
||||
Mockito.doReturn(expectedHost).when(presetVariableHelperSpy).getPresetVariableValueHost(Mockito.anyLong());
|
||||
presetVariableHelperSpy.setPresetVariableHostInValueIfUsageTypeIsRunningVm(result, UsageTypes.RUNNING_VM, vmInstanceVoMock);
|
||||
|
|
@ -623,7 +605,6 @@ public class PresetVariableHelperTest {
|
|||
|
||||
assertPresetVariableIdAndName(expectedHost, result.getHost());
|
||||
Assert.assertEquals(expectedHost.getTags(), result.getHost().getTags());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("host"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -638,11 +619,10 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getName()).when(hostVoMock).getName();
|
||||
Mockito.doReturn(hostTagVOListMock).when(hostTagsDaoMock).getHostTags(Mockito.anyLong());
|
||||
|
||||
Host result = presetVariableHelperSpy.getPresetVariableValueHost(1l);
|
||||
Host result = presetVariableHelperSpy.getPresetVariableValueHost(1L);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
Assert.assertEquals(expected.getTags(), result.getTags());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "isTagARule", "name", "tags"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -657,12 +637,11 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getName()).when(hostVoMock).getName();
|
||||
Mockito.doReturn(hostTagVOListMock).when(hostTagsDaoMock).getHostTags(Mockito.anyLong());
|
||||
|
||||
Host result = presetVariableHelperSpy.getPresetVariableValueHost(1l);
|
||||
Host result = presetVariableHelperSpy.getPresetVariableValueHost(1L);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
Assert.assertEquals(new ArrayList<>(), result.getTags());
|
||||
Assert.assertTrue(result.getIsTagARule());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "isTagARule", "name", "tags"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -674,7 +653,7 @@ public class PresetVariableHelperTest {
|
|||
String expected = "os_display_name";
|
||||
Mockito.doReturn(expected).when(guestOsVoMock).getDisplayName();
|
||||
|
||||
String result = presetVariableHelperSpy.getPresetVariableValueOsName(1l);
|
||||
String result = presetVariableHelperSpy.getPresetVariableValueOsName(1L);
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
|
@ -692,7 +671,6 @@ public class PresetVariableHelperTest {
|
|||
assertPresetVariableIdAndName(expected, result);
|
||||
Assert.assertEquals(expected.isCustomized(), result.isCustomized());
|
||||
Assert.assertEquals(expected.offerHa(), result.offerHa());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "customized", "offerHa"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -706,10 +684,8 @@ public class PresetVariableHelperTest {
|
|||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
Assert.assertEquals(expected.isCustomized(), result.isCustomized());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "customized"), result);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void getPresetVariableValueTemplateTestSetValuesAndReturnObject() {
|
||||
VMTemplateVO vmTemplateVoMock = Mockito.mock(VMTemplateVO.class);
|
||||
|
|
@ -720,10 +696,9 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getId()).when(vmTemplateVoMock).getUuid();
|
||||
Mockito.doReturn(expected.getName()).when(vmTemplateVoMock).getName();
|
||||
|
||||
GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableValueTemplate(1l);
|
||||
GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableValueTemplate(1L);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -735,7 +710,7 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(listExpected).when(resourceTagDaoMock).listBy(Mockito.anyLong(), Mockito.any(ResourceObjectType.class));
|
||||
|
||||
Arrays.asList(ResourceObjectType.values()).forEach(type -> {
|
||||
Map<String, String> result = presetVariableHelperSpy.getPresetVariableValueResourceTags(1l, type);
|
||||
Map<String, String> result = presetVariableHelperSpy.getPresetVariableValueResourceTags(1L, type);
|
||||
|
||||
for (ResourceTag expected: listExpected) {
|
||||
Assert.assertEquals(expected.getValue(), result.get(expected.getKey()));
|
||||
|
|
@ -760,15 +735,15 @@ public class PresetVariableHelperTest {
|
|||
|
||||
VolumeVO volumeVoMock = Mockito.mock(VolumeVO.class);
|
||||
Mockito.doReturn(volumeVoMock).when(volumeDaoMock).findByIdIncludingRemoved(Mockito.anyLong());
|
||||
Mockito.doReturn(1l).when(volumeVoMock).getPoolId();
|
||||
Mockito.doReturn(1L).when(volumeVoMock).getPoolId();
|
||||
|
||||
mockMethodValidateIfObjectIsNull();
|
||||
|
||||
Mockito.doReturn(expected.getId()).when(volumeVoMock).getUuid();
|
||||
Mockito.doReturn(expected.getName()).when(volumeVoMock).getName();
|
||||
Mockito.doReturn(expected.getDiskOffering()).when(presetVariableHelperSpy).getPresetVariableValueDiskOffering(Mockito.anyLong());
|
||||
Mockito.doReturn(expected.getProvisioningType()).when(volumeVoMock).getProvisioningType();
|
||||
Mockito.doReturn(expected.getVolumeType()).when(volumeVoMock).getVolumeType();
|
||||
Mockito.doReturn(ProvisioningType.getProvisioningType(expected.getProvisioningType())).when(volumeVoMock).getProvisioningType();
|
||||
Mockito.doReturn(Volume.Type.valueOf(expected.getVolumeType())).when(volumeVoMock).getVolumeType();
|
||||
Mockito.doReturn(expected.getStorage()).when(presetVariableHelperSpy).getPresetVariableValueStorage(Mockito.anyLong(), Mockito.anyInt());
|
||||
Mockito.doReturn(expected.getTags()).when(presetVariableHelperSpy).getPresetVariableValueResourceTags(Mockito.anyLong(), Mockito.any(ResourceObjectType.class));
|
||||
Mockito.doReturn(expected.getSize()).when(volumeVoMock).getSize();
|
||||
|
|
@ -789,8 +764,6 @@ public class PresetVariableHelperTest {
|
|||
Assert.assertEquals(expected.getTags(), result.getTags());
|
||||
Assert.assertEquals(expectedSize, result.getSize());
|
||||
Assert.assertEquals(imageFormat.name(), result.getVolumeFormat());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "diskOffering", "provisioningType", "volumeType", "storage", "tags", "size", "volumeFormat"), result);
|
||||
}
|
||||
|
||||
Mockito.verify(presetVariableHelperSpy, Mockito.times(ImageFormat.values().length)).getPresetVariableValueResourceTags(Mockito.anyLong(),
|
||||
|
|
@ -811,8 +784,8 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getId()).when(volumeVoMock).getUuid();
|
||||
Mockito.doReturn(expected.getName()).when(volumeVoMock).getName();
|
||||
Mockito.doReturn(expected.getDiskOffering()).when(presetVariableHelperSpy).getPresetVariableValueDiskOffering(Mockito.anyLong());
|
||||
Mockito.doReturn(expected.getProvisioningType()).when(volumeVoMock).getProvisioningType();
|
||||
Mockito.doReturn(expected.getVolumeType()).when(volumeVoMock).getVolumeType();
|
||||
Mockito.doReturn(Volume.Type.valueOf(expected.getVolumeType())).when(volumeVoMock).getVolumeType();
|
||||
Mockito.doReturn(ProvisioningType.getProvisioningType(expected.getProvisioningType())).when(volumeVoMock).getProvisioningType();
|
||||
Mockito.doReturn(expected.getTags()).when(presetVariableHelperSpy).getPresetVariableValueResourceTags(Mockito.anyLong(), Mockito.any(ResourceObjectType.class));
|
||||
Mockito.doReturn(expected.getSize()).when(volumeVoMock).getSize();
|
||||
Mockito.doReturn(imageFormat).when(volumeVoMock).getFormat();
|
||||
|
|
@ -832,8 +805,6 @@ public class PresetVariableHelperTest {
|
|||
Assert.assertEquals(expected.getTags(), result.getTags());
|
||||
Assert.assertEquals(expectedSize, result.getSize());
|
||||
Assert.assertEquals(imageFormat.name(), result.getVolumeFormat());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "diskOffering", "provisioningType", "volumeType", "tags", "size", "volumeFormat"), result);
|
||||
}
|
||||
|
||||
Mockito.verify(presetVariableHelperSpy, Mockito.times(ImageFormat.values().length)).getPresetVariableValueResourceTags(Mockito.anyLong(),
|
||||
|
|
@ -850,11 +821,9 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getId()).when(diskOfferingVoMock).getUuid();
|
||||
Mockito.doReturn(expected.getName()).when(diskOfferingVoMock).getName();
|
||||
|
||||
GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableValueDiskOffering(1l);
|
||||
GenericPresetVariable result = presetVariableHelperSpy.getPresetVariableValueDiskOffering(1L);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("bytesReadBurst", "bytesReadBurstLength", "bytesReadRate", "bytesWriteBurst", "bytesWriteBurstLength", "bytesWriteRate",
|
||||
"id", "iopsReadBurst", "iopsReadBurstLength", "iopsReadRate", "iopsWriteBurst", "iopsWriteBurstLength", "iopsWriteRate", "name"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -862,7 +831,7 @@ public class PresetVariableHelperTest {
|
|||
Storage expected = getStorageForTests();
|
||||
Mockito.doReturn(expected).when(presetVariableHelperSpy).getSecondaryStorageForSnapshot(Mockito.anyLong(), Mockito.anyInt());
|
||||
|
||||
Storage result = presetVariableHelperSpy.getPresetVariableValueStorage(1l, 2);
|
||||
Storage result = presetVariableHelperSpy.getPresetVariableValueStorage(1L, 2);
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
Mockito.verify(primaryStorageDaoMock, Mockito.never()).findByIdIncludingRemoved(Mockito.anyLong());
|
||||
|
|
@ -880,16 +849,14 @@ public class PresetVariableHelperTest {
|
|||
|
||||
Mockito.doReturn(expected.getId()).when(storagePoolVoMock).getUuid();
|
||||
Mockito.doReturn(expected.getName()).when(storagePoolVoMock).getName();
|
||||
Mockito.doReturn(expected.getScope()).when(storagePoolVoMock).getScope();
|
||||
Mockito.doReturn(ScopeType.validateAndGetScopeType(expected.getScope())).when(storagePoolVoMock).getScope();
|
||||
Mockito.doReturn(storageTagVOListMock).when(storagePoolTagsDaoMock).findStoragePoolTags(Mockito.anyLong());
|
||||
|
||||
Storage result = presetVariableHelperSpy.getPresetVariableValueStorage(1l, 2);
|
||||
Storage result = presetVariableHelperSpy.getPresetVariableValueStorage(1L, 2);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
Assert.assertEquals(expected.getScope(), result.getScope());
|
||||
Assert.assertEquals(expected.getTags(), result.getTags());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "isTagARule", "name", "scope", "tags"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -904,24 +871,22 @@ public class PresetVariableHelperTest {
|
|||
|
||||
Mockito.doReturn(expected.getId()).when(storagePoolVoMock).getUuid();
|
||||
Mockito.doReturn(expected.getName()).when(storagePoolVoMock).getName();
|
||||
Mockito.doReturn(expected.getScope()).when(storagePoolVoMock).getScope();
|
||||
Mockito.doReturn(ScopeType.validateAndGetScopeType(expected.getScope())).when(storagePoolVoMock).getScope();
|
||||
Mockito.doReturn(storageTagVOListMock).when(storagePoolTagsDaoMock).findStoragePoolTags(Mockito.anyLong());
|
||||
|
||||
Storage result = presetVariableHelperSpy.getPresetVariableValueStorage(1l, 2);
|
||||
Storage result = presetVariableHelperSpy.getPresetVariableValueStorage(1L, 2);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
Assert.assertEquals(expected.getScope(), result.getScope());
|
||||
Assert.assertEquals(new ArrayList<>(), result.getTags());
|
||||
Assert.assertTrue(result.getIsTagARule());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "isTagARule", "name", "scope", "tags"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSecondaryStorageForSnapshotTestAllTypesAndDoNotBackupSnapshotReturnNull() {
|
||||
presetVariableHelperSpy.backupSnapshotAfterTakingSnapshot = false;
|
||||
getQuotaTypesForTests().forEach(type -> {
|
||||
Storage result = presetVariableHelperSpy.getSecondaryStorageForSnapshot(1l, type.getKey());
|
||||
Storage result = presetVariableHelperSpy.getSecondaryStorageForSnapshot(1L, type.getKey());
|
||||
Assert.assertNull(result);
|
||||
});
|
||||
}
|
||||
|
|
@ -930,7 +895,7 @@ public class PresetVariableHelperTest {
|
|||
public void getSecondaryStorageForSnapshotTestAllTypesExceptSnapshotAndBackupSnapshotReturnNull() {
|
||||
presetVariableHelperSpy.backupSnapshotAfterTakingSnapshot = true;
|
||||
getQuotaTypesForTests(UsageTypes.SNAPSHOT).forEach(type -> {
|
||||
Storage result = presetVariableHelperSpy.getSecondaryStorageForSnapshot(1l, type.getKey());
|
||||
Storage result = presetVariableHelperSpy.getSecondaryStorageForSnapshot(1L, type.getKey());
|
||||
Assert.assertNull(result);
|
||||
});
|
||||
}
|
||||
|
|
@ -947,10 +912,9 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getName()).when(imageStoreVoMock).getName();
|
||||
presetVariableHelperSpy.backupSnapshotAfterTakingSnapshot = true;
|
||||
|
||||
Storage result = presetVariableHelperSpy.getSecondaryStorageForSnapshot(1l, UsageTypes.SNAPSHOT);
|
||||
Storage result = presetVariableHelperSpy.getSecondaryStorageForSnapshot(1L, UsageTypes.SNAPSHOT);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -991,8 +955,6 @@ public class PresetVariableHelperTest {
|
|||
Assert.assertEquals(expected.getOsName(), result.getOsName());
|
||||
Assert.assertEquals(expected.getTags(), result.getTags());
|
||||
Assert.assertEquals(expectedSize, result.getSize());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "osName", "tags", "size"), result);
|
||||
});
|
||||
|
||||
Mockito.verify(presetVariableHelperSpy).getPresetVariableValueResourceTags(Mockito.anyLong(), Mockito.eq(ResourceObjectType.Template));
|
||||
|
|
@ -1025,7 +987,7 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getName()).when(snapshotVoMock).getName();
|
||||
Mockito.doReturn(expected.getSize()).when(snapshotVoMock).getSize();
|
||||
Mockito.doReturn((short) 3).when(snapshotVoMock).getSnapshotType();
|
||||
Mockito.doReturn(1l).when(presetVariableHelperSpy).getSnapshotDataStoreId(Mockito.anyLong(), Mockito.anyLong());
|
||||
Mockito.doReturn(1L).when(presetVariableHelperSpy).getSnapshotDataStoreId(Mockito.anyLong(), Mockito.anyLong());
|
||||
Mockito.doReturn(expected.getStorage()).when(presetVariableHelperSpy).getPresetVariableValueStorage(Mockito.anyLong(), Mockito.anyInt());
|
||||
Mockito.doReturn(expected.getTags()).when(presetVariableHelperSpy).getPresetVariableValueResourceTags(Mockito.anyLong(), Mockito.any(ResourceObjectType.class));
|
||||
Mockito.doReturn(hypervisorType).when(snapshotVoMock).getHypervisorType();
|
||||
|
|
@ -1043,8 +1005,6 @@ public class PresetVariableHelperTest {
|
|||
Assert.assertEquals(expected.getTags(), result.getTags());
|
||||
Assert.assertEquals(expectedSize, result.getSize());
|
||||
Assert.assertEquals(hypervisorType.name(), result.getHypervisorType());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "snapshotType", "storage", "tags", "size", "hypervisorType"), result);
|
||||
}
|
||||
|
||||
Mockito.verify(presetVariableHelperSpy, Mockito.times(Hypervisor.HypervisorType.values().length)).getPresetVariableValueResourceTags(Mockito.anyLong(),
|
||||
|
|
@ -1056,12 +1016,12 @@ public class PresetVariableHelperTest {
|
|||
public void getSnapshotDataStoreIdTestDoNotBackupSnapshotToSecondaryRetrievePrimaryStorage() {
|
||||
SnapshotDataStoreVO snapshotDataStoreVoMock = Mockito.mock(SnapshotDataStoreVO.class);
|
||||
|
||||
Long expected = 1l;
|
||||
Long expected = 1L;
|
||||
Mockito.doReturn(snapshotDataStoreVoMock).when(snapshotDataStoreDaoMock).findOneBySnapshotAndDatastoreRole(Mockito.anyLong(), Mockito.any(DataStoreRole.class));
|
||||
Mockito.doReturn(expected).when(snapshotDataStoreVoMock).getDataStoreId();
|
||||
presetVariableHelperSpy.backupSnapshotAfterTakingSnapshot = false;
|
||||
|
||||
Long result = presetVariableHelperSpy.getSnapshotDataStoreId(1l, 1l);
|
||||
Long result = presetVariableHelperSpy.getSnapshotDataStoreId(1L, 1L);
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
|
||||
|
|
@ -1078,7 +1038,7 @@ public class PresetVariableHelperTest {
|
|||
public void getSnapshotDataStoreIdTestBackupSnapshotToSecondaryRetrieveSecondaryStorage() {
|
||||
SnapshotDataStoreVO snapshotDataStoreVoMock = Mockito.mock(SnapshotDataStoreVO.class);
|
||||
|
||||
Long expected = 2l;
|
||||
Long expected = 2L;
|
||||
ImageStoreVO imageStore = Mockito.mock(ImageStoreVO.class);
|
||||
Mockito.when(imageStoreDaoMock.findById(Mockito.anyLong())).thenReturn(imageStore);
|
||||
Mockito.when(imageStore.getDataCenterId()).thenReturn(1L);
|
||||
|
|
@ -1086,7 +1046,7 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected).when(snapshotDataStoreVoMock).getDataStoreId();
|
||||
presetVariableHelperSpy.backupSnapshotAfterTakingSnapshot = true;
|
||||
|
||||
Long result = presetVariableHelperSpy.getSnapshotDataStoreId(2l, 1L);
|
||||
Long result = presetVariableHelperSpy.getSnapshotDataStoreId(2L, 1L);
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
|
||||
|
|
@ -1129,8 +1089,6 @@ public class PresetVariableHelperTest {
|
|||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
Assert.assertEquals(expected.getTag(), result.getTag());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "tag"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -1155,7 +1113,7 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getId()).when(vmSnapshotVoMock).getUuid();
|
||||
Mockito.doReturn(expected.getName()).when(vmSnapshotVoMock).getName();
|
||||
Mockito.doReturn(expected.getTags()).when(presetVariableHelperSpy).getPresetVariableValueResourceTags(Mockito.anyLong(), Mockito.any(ResourceObjectType.class));
|
||||
Mockito.doReturn(expected.getVmSnapshotType()).when(vmSnapshotVoMock).getType();
|
||||
Mockito.doReturn(VMSnapshot.Type.valueOf(expected.getVmSnapshotType())).when(vmSnapshotVoMock).getType();
|
||||
|
||||
Mockito.doReturn(UsageTypes.VM_SNAPSHOT).when(usageVoMock).getUsageType();
|
||||
|
||||
|
|
@ -1166,8 +1124,6 @@ public class PresetVariableHelperTest {
|
|||
Assert.assertEquals(expected.getTags(), result.getTags());
|
||||
Assert.assertEquals(expected.getVmSnapshotType(), result.getVmSnapshotType());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "tags", "vmSnapshotType"), result);
|
||||
|
||||
Mockito.verify(presetVariableHelperSpy).getPresetVariableValueResourceTags(Mockito.anyLong(), Mockito.eq(ResourceObjectType.VMSnapshot));
|
||||
}
|
||||
|
||||
|
|
@ -1200,9 +1156,6 @@ public class PresetVariableHelperTest {
|
|||
|
||||
if (typeInt == UsageTypes.RUNNING_VM) {
|
||||
Assert.assertEquals(expected.getComputingResources(), result.getComputingResources());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("computeOffering", "computingResources"), result);
|
||||
} else {
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("computeOffering"), result);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -1228,7 +1181,7 @@ public class PresetVariableHelperTest {
|
|||
|
||||
@Test
|
||||
public void getDetailByNameTestReturnsValue() {
|
||||
int expected = Integer.valueOf(getVmDetailsForTests().get(0).getValue());
|
||||
int expected = Integer.parseInt(getVmDetailsForTests().get(0).getValue());
|
||||
int result = presetVariableHelperSpy.getDetailByName(getVmDetailsForTests(), "test_with_value", expected);
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
|
@ -1295,8 +1248,6 @@ public class PresetVariableHelperTest {
|
|||
Assert.assertEquals(expected.getVirtualSize(), result.getVirtualSize());
|
||||
Assert.assertEquals(expected.getBackupOffering(), result.getBackupOffering());
|
||||
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("size", "virtualSize", "backupOffering"), result);
|
||||
|
||||
Mockito.verify(presetVariableHelperSpy).getPresetVariableValueBackupOffering(Mockito.anyLong());
|
||||
}
|
||||
|
||||
|
|
@ -1311,11 +1262,10 @@ public class PresetVariableHelperTest {
|
|||
Mockito.doReturn(expected.getName()).when(backupOfferingVoMock).getName();
|
||||
Mockito.doReturn(expected.getExternalId()).when(backupOfferingVoMock).getExternalId();
|
||||
|
||||
BackupOffering result = presetVariableHelperSpy.getPresetVariableValueBackupOffering(1l);
|
||||
BackupOffering result = presetVariableHelperSpy.getPresetVariableValueBackupOffering(1L);
|
||||
|
||||
assertPresetVariableIdAndName(expected, result);
|
||||
Assert.assertEquals(expected.getExternalId(), result.getExternalId());
|
||||
validateFieldNamesToIncludeInToString(Arrays.asList("id", "name", "externalId"), result);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class ResourceTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnAJson() {
|
||||
Resource variable = new Resource();
|
||||
|
||||
String expected = ToStringBuilder.reflectionToString(variable, ToStringStyle.JSON_STYLE);
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class RoleTest {
|
||||
|
||||
@Test
|
||||
public void setTagsTestAddFieldTagsToCollection() {
|
||||
Role variable = new Role();
|
||||
variable.setType(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("type"));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class StorageTest {
|
||||
|
||||
@Test
|
||||
public void setTagsTestAddFieldTagsToCollection() {
|
||||
Storage variable = new Storage();
|
||||
variable.setTags(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("tags"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setScopeTestAddFieldScopeToCollection() {
|
||||
Storage variable = new Storage();
|
||||
variable.setScope(null);;
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("scope"));
|
||||
}
|
||||
}
|
||||
|
|
@ -1,175 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.quota.activationrule.presetvariables;
|
||||
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class ValueTest {
|
||||
|
||||
@Test
|
||||
public void setIdTestAddFieldIdToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setId(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("id"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setNameTestAddFieldNameToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setName(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("name"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setHostTestAddFieldHostToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setHost(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("host"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setOsNameTestAddFieldOsNameToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setOsName(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("osName"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setAccountResourcesTestAddFieldAccountResourcesToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setAccountResources(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("accountResources"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setTagsTestAddFieldTagsToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setTags(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("tags"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setTagTestAddFieldTagToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setTag(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("tag"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSizeTestAddFieldSizeToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setSize(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("size"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setProvisioningTypeTestAddFieldProvisioningTypeToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setProvisioningType(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("provisioningType"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setSnapshotTypeTestAddFieldSnapshotTypeToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setSnapshotType(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("snapshotType"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setVmSnapshotTypeTestAddFieldVmSnapshotTypeToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setVmSnapshotType(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("vmSnapshotType"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setComputeOfferingTestAddFieldComputeOfferingToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setComputeOffering(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("computeOffering"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setTemplateTestAddFieldTemplateToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setTemplate(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("template"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setDiskOfferingTestAddFieldDiskOfferingToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setDiskOffering(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("diskOffering"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setStorageTestAddFieldStorageToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setStorage(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("storage"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setComputingResourcesTestAddFieldComputingResourcesToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setComputingResources(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("computingResources"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setVirtualSizeTestAddFieldVirtualSizeToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setVirtualSize(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("virtualSize"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setBackupOfferingTestAddFieldBackupOfferingToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setBackupOffering(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("backupOffering"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setHypervisorTypeTestAddFieldHypervisorTypeToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setHypervisorType(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("hypervisorType"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setVolumeFormatTestAddFieldVolumeFormatToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setVolumeFormat(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("volumeFormat"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setStateTestAddFieldStateToCollection() {
|
||||
Value variable = new Value();
|
||||
variable.setState(null);
|
||||
Assert.assertTrue(variable.fieldNamesToIncludeInToString.contains("state"));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -69,7 +69,6 @@ import java.util.List;
|
|||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Optional;
|
||||
import java.util.UUID;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
|
@ -290,7 +289,8 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
|
|||
}
|
||||
|
||||
private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup) {
|
||||
List<String> backedVolumesUUIDs = backup.getBackedUpVolumes().stream()
|
||||
List<Backup.VolumeInfo> backedVolumes = backup.getBackedUpVolumes();
|
||||
List<String> backedVolumesUUIDs = backedVolumes.stream()
|
||||
.sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
|
||||
.map(Backup.VolumeInfo::getUuid)
|
||||
.collect(Collectors.toList());
|
||||
|
|
@ -313,6 +313,7 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
|
|||
Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(restoreVolumes);
|
||||
restoreCommand.setRestoreVolumePools(volumePoolsAndPaths.first());
|
||||
restoreCommand.setRestoreVolumePaths(volumePoolsAndPaths.second());
|
||||
restoreCommand.setBackupFiles(getBackupFiles(backedVolumes));
|
||||
restoreCommand.setVmExists(vm.getRemoved() == null);
|
||||
restoreCommand.setVmState(vm.getState());
|
||||
restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
|
||||
|
|
@ -328,6 +329,14 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
|
|||
return new Pair<>(answer.getResult(), answer.getDetails());
|
||||
}
|
||||
|
||||
private List<String> getBackupFiles(List<Backup.VolumeInfo> backedVolumes) {
|
||||
List<String> backupFiles = new ArrayList<>();
|
||||
for (Backup.VolumeInfo backedVolume : backedVolumes) {
|
||||
backupFiles.add(backedVolume.getPath());
|
||||
}
|
||||
return backupFiles;
|
||||
}
|
||||
|
||||
private Pair<List<PrimaryDataStoreTO>, List<String>> getVolumePoolsAndPaths(List<VolumeVO> volumes) {
|
||||
List<PrimaryDataStoreTO> volumePools = new ArrayList<>();
|
||||
List<String> volumePaths = new ArrayList<>();
|
||||
|
|
@ -366,7 +375,13 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
|
|||
final StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
|
||||
final HostVO hostVO = hostDao.findByIp(hostIp);
|
||||
|
||||
LOG.debug("Restoring vm volume {} from backup {} on the NAS Backup Provider", backupVolumeInfo, backup);
|
||||
Backup.VolumeInfo matchingVolume = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volume.getUuid());
|
||||
if (matchingVolume == null) {
|
||||
throw new CloudRuntimeException(String.format("Unable to find volume %s in the list of backed up volumes for backup %s, cannot proceed with restore", volume.getUuid(), backup));
|
||||
}
|
||||
Long backedUpVolumeSize = matchingVolume.getSize();
|
||||
|
||||
LOG.debug("Restoring vm volume {} from backup {} on the NAS Backup Provider", volume, backup);
|
||||
BackupRepository backupRepository = getBackupRepository(backup);
|
||||
|
||||
VolumeVO restoredVolume = new VolumeVO(Volume.Type.DATADISK, null, backup.getZoneId(),
|
||||
|
|
@ -384,7 +399,7 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
|
|||
restoredVolume.setPoolType(pool.getPoolType());
|
||||
restoredVolume.setPath(restoredVolume.getUuid());
|
||||
restoredVolume.setState(Volume.State.Copying);
|
||||
restoredVolume.setSize(backupVolumeInfo.getSize());
|
||||
restoredVolume.setSize(backedUpVolumeSize);
|
||||
restoredVolume.setDiskOfferingId(diskOffering.getId());
|
||||
if (pool.getPoolType() != Storage.StoragePoolType.RBD) {
|
||||
restoredVolume.setFormat(Storage.ImageFormat.QCOW2);
|
||||
|
|
@ -404,8 +419,8 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
|
|||
restoreCommand.setMountOptions(backupRepository.getMountOptions());
|
||||
restoreCommand.setVmExists(null);
|
||||
restoreCommand.setVmState(vmNameAndState.second());
|
||||
restoreCommand.setRestoreVolumeUUID(backupVolumeInfo.getUuid());
|
||||
restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
|
||||
restoreCommand.setBackupFiles(Collections.singletonList(matchingVolume.getPath()));
|
||||
|
||||
BackupAnswer answer;
|
||||
try {
|
||||
|
|
@ -435,10 +450,11 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
|
|||
return backupRepository;
|
||||
}
|
||||
|
||||
private Optional<Backup.VolumeInfo> getBackedUpVolumeInfo(List<Backup.VolumeInfo> backedUpVolumes, String volumeUuid) {
|
||||
private Backup.VolumeInfo getBackedUpVolumeInfo(List<Backup.VolumeInfo> backedUpVolumes, String volumeUuid) {
|
||||
return backedUpVolumes.stream()
|
||||
.filter(v -> v.getUuid().equals(volumeUuid))
|
||||
.findFirst();
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -72,10 +72,10 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
List<String> backedVolumeUUIDs = command.getBackupVolumesUUIDs();
|
||||
List<PrimaryDataStoreTO> restoreVolumePools = command.getRestoreVolumePools();
|
||||
List<String> restoreVolumePaths = command.getRestoreVolumePaths();
|
||||
String restoreVolumeUuid = command.getRestoreVolumeUUID();
|
||||
Integer mountTimeout = command.getMountTimeout() * 1000;
|
||||
int timeout = command.getWait();
|
||||
KVMStoragePoolManager storagePoolMgr = serverResource.getStoragePoolMgr();
|
||||
List<String> backupFiles = command.getBackupFiles();
|
||||
|
||||
String newVolumeId = null;
|
||||
try {
|
||||
|
|
@ -83,14 +83,15 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
if (Objects.isNull(vmExists)) {
|
||||
PrimaryDataStoreTO volumePool = restoreVolumePools.get(0);
|
||||
String volumePath = restoreVolumePaths.get(0);
|
||||
String backupFile = backupFiles.get(0);
|
||||
int lastIndex = volumePath.lastIndexOf("/");
|
||||
newVolumeId = volumePath.substring(lastIndex + 1);
|
||||
restoreVolume(storagePoolMgr, backupPath, volumePool, volumePath, diskType, restoreVolumeUuid,
|
||||
restoreVolume(storagePoolMgr, backupPath, volumePool, volumePath, diskType, backupFile,
|
||||
new Pair<>(vmName, command.getVmState()), mountDirectory, timeout);
|
||||
} else if (Boolean.TRUE.equals(vmExists)) {
|
||||
restoreVolumesOfExistingVM(storagePoolMgr, restoreVolumePools, restoreVolumePaths, backedVolumeUUIDs, backupPath, mountDirectory, timeout);
|
||||
restoreVolumesOfExistingVM(storagePoolMgr, restoreVolumePools, restoreVolumePaths, backedVolumeUUIDs, backupPath, backupFiles, mountDirectory, timeout);
|
||||
} else {
|
||||
restoreVolumesOfDestroyedVMs(storagePoolMgr, restoreVolumePools, restoreVolumePaths, vmName, backupPath, mountDirectory, timeout);
|
||||
restoreVolumesOfDestroyedVMs(storagePoolMgr, restoreVolumePools, restoreVolumePaths, backupPath, backupFiles, mountDirectory, timeout);
|
||||
}
|
||||
} catch (CloudRuntimeException e) {
|
||||
String errorMessage = e.getMessage() != null ? e.getMessage() : "";
|
||||
|
|
@ -109,19 +110,22 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
}
|
||||
}
|
||||
|
||||
private void restoreVolumesOfExistingVM(KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> restoreVolumePools, List<String> restoreVolumePaths, List<String> backedVolumesUUIDs,
|
||||
String backupPath, String mountDirectory, int timeout) {
|
||||
private void restoreVolumesOfExistingVM(KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> restoreVolumePools,
|
||||
List<String> restoreVolumePaths, List<String> backedVolumesUUIDs,
|
||||
String backupPath, List<String> backupFiles, String mountDirectory, int timeout) {
|
||||
String diskType = "root";
|
||||
try {
|
||||
for (int idx = 0; idx < restoreVolumePaths.size(); idx++) {
|
||||
PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
|
||||
String restoreVolumePath = restoreVolumePaths.get(idx);
|
||||
String backupFile = backupFiles.get(idx);
|
||||
String backupVolumeUuid = backedVolumesUUIDs.get(idx);
|
||||
Pair<String, String> bkpPathAndVolUuid = getBackupPath(mountDirectory, null, backupPath, diskType, backupVolumeUuid);
|
||||
String fullPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
|
||||
diskType = "datadisk";
|
||||
verifyBackupFile(bkpPathAndVolUuid.first(), bkpPathAndVolUuid.second());
|
||||
if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, restoreVolumePath, bkpPathAndVolUuid.first(), timeout)) {
|
||||
throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", bkpPathAndVolUuid.second()));
|
||||
|
||||
verifyBackupFile(fullPath, backupVolumeUuid);
|
||||
if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, restoreVolumePath, fullPath, timeout)) {
|
||||
throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", backupVolumeUuid));
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
|
|
@ -130,17 +134,20 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
}
|
||||
}
|
||||
|
||||
private void restoreVolumesOfDestroyedVMs(KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> volumePools, List<String> volumePaths, String vmName, String backupPath, String mountDirectory, int timeout) {
|
||||
private void restoreVolumesOfDestroyedVMs(KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> volumePools,
|
||||
List<String> volumePaths, String backupPath, List<String> backupFiles, String mountDirectory, int timeout) {
|
||||
String diskType = "root";
|
||||
try {
|
||||
for (int i = 0; i < volumePaths.size(); i++) {
|
||||
PrimaryDataStoreTO volumePool = volumePools.get(i);
|
||||
String volumePath = volumePaths.get(i);
|
||||
Pair<String, String> bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, backupPath, diskType, null);
|
||||
String backupFile = backupFiles.get(i);
|
||||
String bkpPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
|
||||
String volumeUuid = volumePath.substring(volumePath.lastIndexOf(File.separator) + 1);
|
||||
diskType = "datadisk";
|
||||
verifyBackupFile(bkpPathAndVolUuid.first(), bkpPathAndVolUuid.second());
|
||||
if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, bkpPathAndVolUuid.first(), timeout)) {
|
||||
throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", bkpPathAndVolUuid.second()));
|
||||
verifyBackupFile(bkpPath, volumeUuid);
|
||||
if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, bkpPath, timeout)) {
|
||||
throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", volumeUuid));
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
|
|
@ -149,14 +156,17 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
}
|
||||
}
|
||||
|
||||
private void restoreVolume(KVMStoragePoolManager storagePoolMgr, String backupPath, PrimaryDataStoreTO volumePool, String volumePath, String diskType, String volumeUUID,
|
||||
private void restoreVolume(KVMStoragePoolManager storagePoolMgr, String backupPath, PrimaryDataStoreTO volumePool, String volumePath, String diskType, String backupFile,
|
||||
Pair<String, VirtualMachine.State> vmNameAndState, String mountDirectory, int timeout) {
|
||||
Pair<String, String> bkpPathAndVolUuid;
|
||||
String bkpPath;
|
||||
String volumeUuid;
|
||||
try {
|
||||
bkpPathAndVolUuid = getBackupPath(mountDirectory, volumePath, backupPath, diskType, volumeUUID);
|
||||
verifyBackupFile(bkpPathAndVolUuid.first(), bkpPathAndVolUuid.second());
|
||||
if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, bkpPathAndVolUuid.first(), timeout, true)) {
|
||||
throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", bkpPathAndVolUuid.second()));
|
||||
bkpPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
|
||||
volumeUuid = volumePath.substring(volumePath.lastIndexOf(File.separator) + 1);
|
||||
verifyBackupFile(bkpPath, volumeUuid);
|
||||
if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, bkpPath, timeout, true)) {
|
||||
throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", volumeUuid));
|
||||
|
||||
}
|
||||
if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
|
||||
if (!attachVolumeToVm(storagePoolMgr, vmNameAndState.first(), volumePool, volumePath)) {
|
||||
|
|
@ -177,7 +187,7 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
try {
|
||||
mountDirectory = Files.createTempDirectory(mountDirectory).toString();
|
||||
} catch (IOException e) {
|
||||
logger.error(String.format("Failed to create the tmp mount directory {} for restore", mountDirectory), e);
|
||||
logger.error("Failed to create the tmp mount directory {} for restore", mountDirectory, e);
|
||||
throw new CloudRuntimeException("Failed to create the tmp mount directory for restore on the KVM host");
|
||||
}
|
||||
|
||||
|
|
@ -195,7 +205,7 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
|
||||
int exitValue = Script.runSimpleBashScriptForExitValue(mount, mountTimeout, false);
|
||||
if (exitValue != 0) {
|
||||
logger.error(String.format("Failed to mount repository {} of type {} to the directory {}", backupRepoAddress, backupRepoType, mountDirectory));
|
||||
logger.error("Failed to mount repository {} of type {} to the directory {}", backupRepoAddress, backupRepoType, mountDirectory);
|
||||
throw new CloudRuntimeException("Failed to mount the backup repository on the KVM host");
|
||||
}
|
||||
return mountDirectory;
|
||||
|
|
@ -205,7 +215,7 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
String umountCmd = String.format(UMOUNT_COMMAND, backupDirectory);
|
||||
int exitValue = Script.runSimpleBashScriptForExitValue(umountCmd);
|
||||
if (exitValue != 0) {
|
||||
logger.error(String.format("Failed to unmount backup directory {}", backupDirectory));
|
||||
logger.error("Failed to unmount backup directory {}", backupDirectory);
|
||||
throw new CloudRuntimeException("Failed to unmount the backup directory");
|
||||
}
|
||||
}
|
||||
|
|
@ -214,17 +224,16 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
|
|||
try {
|
||||
Files.deleteIfExists(Paths.get(backupDirectory));
|
||||
} catch (IOException e) {
|
||||
logger.error(String.format("Failed to delete backup directory: %s", backupDirectory), e);
|
||||
logger.error("Failed to delete backup directory: {}}", backupDirectory, e);
|
||||
throw new CloudRuntimeException("Failed to delete the backup directory");
|
||||
}
|
||||
}
|
||||
|
||||
private Pair<String, String> getBackupPath(String mountDirectory, String volumePath, String backupPath, String diskType, String volumeUuid) {
|
||||
private String getBackupPath(String mountDirectory, String backupPath, String backupFile, String diskType) {
|
||||
String bkpPath = String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath);
|
||||
String volUuid = Objects.isNull(volumeUuid) ? volumePath.substring(volumePath.lastIndexOf(File.separator) + 1) : volumeUuid;
|
||||
String backupFileName = String.format("%s.%s.qcow2", diskType.toLowerCase(Locale.ROOT), volUuid);
|
||||
String backupFileName = String.format("%s.%s.qcow2", diskType.toLowerCase(Locale.ROOT), backupFile);
|
||||
bkpPath = String.format(FILE_PATH_PLACEHOLDER, bkpPath, backupFileName);
|
||||
return new Pair<>(bkpPath, volUuid);
|
||||
return bkpPath;
|
||||
}
|
||||
|
||||
private boolean checkBackupFileImage(String backupPath) {
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
when(command.getRestoreVolumeUUID()).thenReturn("volume-123");
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getVmState()).thenReturn(VirtualMachine.State.Running);
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
|
|
@ -112,6 +112,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
when(command.getBackupVolumesUUIDs()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
try (MockedStatic<Files> filesMock = mockStatic(Files.class)) {
|
||||
|
|
@ -149,6 +150,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
try (MockedStatic<Files> filesMock = mockStatic(Files.class)) {
|
||||
|
|
@ -186,7 +188,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
when(command.getRestoreVolumeUUID()).thenReturn("volume-123");
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getVmState()).thenReturn(VirtualMachine.State.Running);
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
|
|
@ -227,7 +229,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
lenient().when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
lenient().when(command.getRestoreVolumeUUID()).thenReturn("volume-123");
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
lenient().when(command.getVmState()).thenReturn(VirtualMachine.State.Running);
|
||||
lenient().when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
|
|
@ -263,7 +265,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
when(command.getRestoreVolumeUUID()).thenReturn("volume-123");
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getVmState()).thenReturn(VirtualMachine.State.Running);
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
|
|
@ -309,7 +311,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
when(command.getRestoreVolumeUUID()).thenReturn("volume-123");
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getVmState()).thenReturn(VirtualMachine.State.Running);
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
|
|
@ -357,7 +359,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
when(command.getRestoreVolumeUUID()).thenReturn("volume-123");
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getVmState()).thenReturn(VirtualMachine.State.Running);
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
|
|
@ -407,7 +409,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
when(command.getRestoreVolumeUUID()).thenReturn("volume-123");
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
when(command.getVmState()).thenReturn(VirtualMachine.State.Running);
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
|
|
@ -461,7 +463,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
PrimaryDataStoreTO primaryDataStore = Mockito.mock(PrimaryDataStoreTO.class);
|
||||
when(command.getRestoreVolumePools()).thenReturn(Arrays.asList(primaryDataStore));
|
||||
lenient().when(command.getRestoreVolumePaths()).thenReturn(Arrays.asList("/var/lib/libvirt/images/volume-123"));
|
||||
lenient().when(command.getRestoreVolumeUUID()).thenReturn("volume-123");
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123"));
|
||||
lenient().when(command.getVmState()).thenReturn(VirtualMachine.State.Running);
|
||||
lenient().when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
|
|
@ -499,6 +501,7 @@ public class LibvirtRestoreBackupCommandWrapperTest {
|
|||
"/var/lib/libvirt/images/volume-456"
|
||||
));
|
||||
when(command.getBackupVolumesUUIDs()).thenReturn(Arrays.asList("volume-123", "volume-456"));
|
||||
when(command.getBackupFiles()).thenReturn(Arrays.asList("volume-123", "volume-456"));
|
||||
when(command.getMountTimeout()).thenReturn(30);
|
||||
|
||||
try (MockedStatic<Files> filesMock = mockStatic(Files.class)) {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@
|
|||
package org.apache.cloudstack.metrics;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.security.cert.X509Certificate;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
|
@ -26,6 +27,7 @@ import java.util.stream.Collectors;
|
|||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import org.apache.cloudstack.ca.CAManager;
|
||||
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
|
||||
import org.apache.cloudstack.storage.datastore.db.ImageStoreDao;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
|
@ -133,6 +135,8 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
|
|||
private ResourceCountDao _resourceCountDao;
|
||||
@Inject
|
||||
private HostTagsDao _hostTagsDao;
|
||||
@Inject
|
||||
private CAManager caManager;
|
||||
|
||||
public PrometheusExporterImpl() {
|
||||
super();
|
||||
|
|
@ -216,6 +220,9 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
|
|||
}
|
||||
|
||||
metricsList.add(new ItemHostVM(zoneName, zoneUuid, host.getName(), host.getUuid(), host.getPrivateIpAddress(), vmDao.listByHostId(host.getId()).size()));
|
||||
|
||||
addSSLCertificateExpirationMetrics(metricsList, zoneName, zoneUuid, host);
|
||||
|
||||
final CapacityVO coreCapacity = capacityDao.findByHostIdType(host.getId(), Capacity.CAPACITY_TYPE_CPU_CORE);
|
||||
|
||||
if (coreCapacity == null && !host.isInMaintenanceStates()){
|
||||
|
|
@ -253,6 +260,18 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
|
|||
addHostTagsMetrics(metricsList, dcId, zoneName, zoneUuid, totalHosts, upHosts, downHosts, total, up, down);
|
||||
}
|
||||
|
||||
private void addSSLCertificateExpirationMetrics(List<Item> metricsList, String zoneName, String zoneUuid, HostVO host) {
|
||||
if (caManager == null || caManager.getActiveCertificatesMap() == null) {
|
||||
return;
|
||||
}
|
||||
X509Certificate cert = caManager.getActiveCertificatesMap().getOrDefault(host.getPrivateIpAddress(), null);
|
||||
if (cert == null) {
|
||||
return;
|
||||
}
|
||||
long certExpiryEpoch = cert.getNotAfter().getTime() / 1000; // Convert to epoch seconds
|
||||
metricsList.add(new ItemHostCertExpiry(zoneName, zoneUuid, host.getName(), host.getUuid(), host.getPrivateIpAddress(), certExpiryEpoch));
|
||||
}
|
||||
|
||||
private String markTagMaps(HostVO host, Map<String, Integer> totalHosts, Map<String, Integer> upHosts, Map<String, Integer> downHosts) {
|
||||
List<HostTagVO> hostTagVOS = _hostTagsDao.getHostTags(host.getId());
|
||||
List<String> hostTags = new ArrayList<>();
|
||||
|
|
@ -1060,4 +1079,28 @@ public class PrometheusExporterImpl extends ManagerBase implements PrometheusExp
|
|||
return String.format("%s{zone=\"%s\",cpu=\"%d\",memory=\"%d\"} %d", name, zoneName, cpu, memory, total);
|
||||
}
|
||||
}
|
||||
|
||||
class ItemHostCertExpiry extends Item {
|
||||
String zoneName;
|
||||
String zoneUuid;
|
||||
String hostName;
|
||||
String hostUuid;
|
||||
String hostIp;
|
||||
long expiryTimestamp;
|
||||
|
||||
public ItemHostCertExpiry(final String zoneName, final String zoneUuid, final String hostName, final String hostUuid, final String hostIp, final long expiry) {
|
||||
super("cloudstack_host_cert_expiry_timestamp");
|
||||
this.zoneName = zoneName;
|
||||
this.zoneUuid = zoneUuid;
|
||||
this.hostName = hostName;
|
||||
this.hostUuid = hostUuid;
|
||||
this.hostIp = hostIp;
|
||||
this.expiryTimestamp = expiry;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toMetricsString() {
|
||||
return String.format("%s{zone=\"%s\",hostname=\"%s\",ip=\"%s\"} %d", name, zoneName, hostName, hostIp, expiryTimestamp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,108 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
package org.apache.cloudstack.metrics;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
public class PrometheusExporterImplTest {
|
||||
|
||||
private static final String TEST_ZONE_NAME = "zone1";
|
||||
private static final String TEST_ZONE_UUID = "zone-uuid-1";
|
||||
private static final String TEST_HOST_NAME = "host1";
|
||||
private static final String TEST_HOST_UUID = "host-uuid-1";
|
||||
private static final String TEST_HOST_IP = "192.168.1.10";
|
||||
private static final long CERT_EXPIRY_TIME = 1735689600000L; // 2025-01-01 00:00:00 UTC
|
||||
private static final long CERT_EXPIRY_EPOCH = CERT_EXPIRY_TIME / 1000;
|
||||
|
||||
@Test
|
||||
public void testItemHostCertExpiryFormat() {
|
||||
PrometheusExporterImpl exporter = new PrometheusExporterImpl();
|
||||
PrometheusExporterImpl.ItemHostCertExpiry item = exporter.new ItemHostCertExpiry(
|
||||
TEST_ZONE_NAME,
|
||||
TEST_ZONE_UUID,
|
||||
TEST_HOST_NAME,
|
||||
TEST_HOST_UUID,
|
||||
TEST_HOST_IP,
|
||||
CERT_EXPIRY_EPOCH
|
||||
);
|
||||
|
||||
String metricsString = item.toMetricsString();
|
||||
String expected = String.format(
|
||||
"cloudstack_host_cert_expiry_timestamp{zone=\"%s\",hostname=\"%s\",ip=\"%s\"} %d",
|
||||
TEST_ZONE_NAME,
|
||||
TEST_HOST_NAME,
|
||||
TEST_HOST_IP,
|
||||
CERT_EXPIRY_EPOCH
|
||||
);
|
||||
assertEquals("Certificate expiry metric format should match expected format", expected, metricsString);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testItemHostCertExpiryContainsCorrectMetricName() {
|
||||
PrometheusExporterImpl exporter = new PrometheusExporterImpl();
|
||||
PrometheusExporterImpl.ItemHostCertExpiry item = exporter.new ItemHostCertExpiry(
|
||||
TEST_ZONE_NAME,
|
||||
TEST_ZONE_UUID,
|
||||
TEST_HOST_NAME,
|
||||
TEST_HOST_UUID,
|
||||
TEST_HOST_IP,
|
||||
CERT_EXPIRY_EPOCH
|
||||
);
|
||||
|
||||
String metricsString = item.toMetricsString();
|
||||
assertTrue("Metric should contain correct metric name",
|
||||
metricsString.contains("cloudstack_host_cert_expiry_timestamp"));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testItemHostCertExpiryContainsAllLabels() {
|
||||
PrometheusExporterImpl exporter = new PrometheusExporterImpl();
|
||||
PrometheusExporterImpl.ItemHostCertExpiry item = exporter.new ItemHostCertExpiry(
|
||||
TEST_ZONE_NAME,
|
||||
TEST_ZONE_UUID,
|
||||
TEST_HOST_NAME,
|
||||
TEST_HOST_UUID,
|
||||
TEST_HOST_IP,
|
||||
CERT_EXPIRY_EPOCH
|
||||
);
|
||||
|
||||
String metricsString = item.toMetricsString();
|
||||
assertTrue("Metric should contain zone label", metricsString.contains("zone=\"" + TEST_ZONE_NAME + "\""));
|
||||
assertTrue("Metric should contain hostname label", metricsString.contains("hostname=\"" + TEST_HOST_NAME + "\""));
|
||||
assertTrue("Metric should contain ip label", metricsString.contains("ip=\"" + TEST_HOST_IP + "\""));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testItemHostCertExpiryContainsTimestampValue() {
|
||||
PrometheusExporterImpl exporter = new PrometheusExporterImpl();
|
||||
PrometheusExporterImpl.ItemHostCertExpiry item = exporter.new ItemHostCertExpiry(
|
||||
TEST_ZONE_NAME,
|
||||
TEST_ZONE_UUID,
|
||||
TEST_HOST_NAME,
|
||||
TEST_HOST_UUID,
|
||||
TEST_HOST_IP,
|
||||
CERT_EXPIRY_EPOCH
|
||||
);
|
||||
|
||||
String metricsString = item.toMetricsString();
|
||||
assertTrue("Metric should contain correct timestamp value",
|
||||
metricsString.endsWith(" " + CERT_EXPIRY_EPOCH));
|
||||
}
|
||||
}
|
||||
|
|
@ -3149,15 +3149,26 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
|
|||
private HostVO getNewHost(StartupCommand[] startupCommands) {
|
||||
StartupCommand startupCommand = startupCommands[0];
|
||||
|
||||
HostVO host = findHostByGuid(startupCommand.getGuid());
|
||||
String fullGuid = startupCommand.getGuid();
|
||||
logger.debug(String.format("Trying to find Host by guid %s", fullGuid));
|
||||
HostVO host = findHostByGuid(fullGuid);
|
||||
|
||||
if (host != null) {
|
||||
logger.debug(String.format("Found Host by guid %s: %s", fullGuid, host));
|
||||
return host;
|
||||
}
|
||||
|
||||
host = findHostByGuid(startupCommand.getGuidWithoutResource());
|
||||
String guidPrefix = startupCommand.getGuidWithoutResource();
|
||||
logger.debug(String.format("Trying to find Host by guid prefix %s", guidPrefix));
|
||||
host = findHostByGuidPrefix(guidPrefix);
|
||||
|
||||
return host; // even when host == null!
|
||||
if (host != null) {
|
||||
logger.debug(String.format("Found Host by guid prefix %s: %s", guidPrefix, host));
|
||||
return host;
|
||||
}
|
||||
|
||||
logger.debug(String.format("Could not find Host by guid %s", fullGuid));
|
||||
return null;
|
||||
}
|
||||
|
||||
protected HostVO createHostVO(final StartupCommand[] cmds, final ServerResource resource, final Map<String, String> details, List<String> hostTags,
|
||||
|
|
@ -4209,6 +4220,15 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
|
|||
public HostVO findHostByGuid(final String guid) {
|
||||
final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
|
||||
sc.and(sc.entity().getGuid(), Op.EQ, guid);
|
||||
sc.and(sc.entity().getRemoved(), Op.NULL);
|
||||
return sc.find();
|
||||
}
|
||||
|
||||
@Override
|
||||
public HostVO findHostByGuidPrefix(String guid) {
|
||||
final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
|
||||
sc.and(sc.entity().getGuid(), Op.LIKE, guid + "%");
|
||||
sc.and(sc.entity().getRemoved(), Op.NULL);
|
||||
return sc.find();
|
||||
}
|
||||
|
||||
|
|
@ -4216,6 +4236,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
|
|||
public HostVO findHostByName(final String name) {
|
||||
final QueryBuilder<HostVO> sc = QueryBuilder.create(HostVO.class);
|
||||
sc.and(sc.entity().getName(), Op.EQ, name);
|
||||
sc.and(sc.entity().getRemoved(), Op.NULL);
|
||||
return sc.find();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -139,23 +139,23 @@ public class HeuristicRuleHelper {
|
|||
* @param presetVariables used for injecting in the JS interpreter.
|
||||
*/
|
||||
protected void injectPresetVariables(JsInterpreter jsInterpreter, PresetVariables presetVariables) {
|
||||
jsInterpreter.injectVariable("secondaryStorages", presetVariables.getSecondaryStorages().toString());
|
||||
jsInterpreter.injectVariable("secondaryStorages", presetVariables.getSecondaryStorages());
|
||||
|
||||
if (presetVariables.getTemplate() != null) {
|
||||
jsInterpreter.injectVariable("template", presetVariables.getTemplate().toString());
|
||||
jsInterpreter.injectVariable("iso", presetVariables.getTemplate().toString());
|
||||
jsInterpreter.injectVariable("template", presetVariables.getTemplate());
|
||||
jsInterpreter.injectVariable("iso", presetVariables.getTemplate());
|
||||
}
|
||||
|
||||
if (presetVariables.getSnapshot() != null) {
|
||||
jsInterpreter.injectVariable("snapshot", presetVariables.getSnapshot().toString());
|
||||
jsInterpreter.injectVariable("snapshot", presetVariables.getSnapshot());
|
||||
}
|
||||
|
||||
if (presetVariables.getVolume() != null) {
|
||||
jsInterpreter.injectVariable("volume", presetVariables.getVolume().toString());
|
||||
jsInterpreter.injectVariable("volume", presetVariables.getVolume());
|
||||
}
|
||||
|
||||
if (presetVariables.getAccount() != null) {
|
||||
jsInterpreter.injectVariable("account", presetVariables.getAccount().toString());
|
||||
jsInterpreter.injectVariable("account", presetVariables.getAccount());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -185,8 +185,8 @@ public class HeuristicRuleHelper {
|
|||
Template template = new Template();
|
||||
|
||||
template.setName(templateVO.getName());
|
||||
template.setFormat(templateVO.getFormat());
|
||||
template.setHypervisorType(templateVO.getHypervisorType());
|
||||
template.setFormat(templateVO.getFormat().toString());
|
||||
template.setHypervisorType(templateVO.getHypervisorType().toString());
|
||||
|
||||
return template;
|
||||
}
|
||||
|
|
@ -195,7 +195,7 @@ public class HeuristicRuleHelper {
|
|||
Volume volumePresetVariable = new Volume();
|
||||
|
||||
volumePresetVariable.setName(volumeVO.getName());
|
||||
volumePresetVariable.setFormat(volumeVO.getFormat());
|
||||
volumePresetVariable.setFormat(volumeVO.getFormat().toString());
|
||||
volumePresetVariable.setSize(volumeVO.getSize());
|
||||
|
||||
return volumePresetVariable;
|
||||
|
|
@ -206,7 +206,7 @@ public class HeuristicRuleHelper {
|
|||
|
||||
snapshot.setName(snapshotInfo.getName());
|
||||
snapshot.setSize(snapshotInfo.getSize());
|
||||
snapshot.setHypervisorType(snapshotInfo.getHypervisorType());
|
||||
snapshot.setHypervisorType(snapshotInfo.getHypervisorType().toString());
|
||||
|
||||
return snapshot;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ public class Account extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
fieldNamesToIncludeInToString.add("id");
|
||||
}
|
||||
|
||||
public Domain getDomain() {
|
||||
|
|
@ -36,6 +35,5 @@ public class Account extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setDomain(Domain domain) {
|
||||
this.domain = domain;
|
||||
fieldNamesToIncludeInToString.add("domain");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,5 @@ public class Domain extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
fieldNamesToIncludeInToString.add("id");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,15 +16,11 @@
|
|||
// under the License.
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
public class GenericHeuristicPresetVariable {
|
||||
|
||||
protected transient Set<String> fieldNamesToIncludeInToString = new HashSet<>();
|
||||
|
||||
private String name;
|
||||
|
||||
public String getName() {
|
||||
|
|
@ -33,15 +29,10 @@ public class GenericHeuristicPresetVariable {
|
|||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
fieldNamesToIncludeInToString.add("name");
|
||||
}
|
||||
|
||||
/***
|
||||
* Converts the preset variable into a valid JSON object that will be injected into the JS interpreter.
|
||||
* This method should not be overridden or changed.
|
||||
*/
|
||||
@Override
|
||||
public final String toString() {
|
||||
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, fieldNamesToIncludeInToString.toArray(new String[0]));
|
||||
public String toString() {
|
||||
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ public class SecondaryStorage extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
fieldNamesToIncludeInToString.add("id");
|
||||
}
|
||||
|
||||
public Long getUsedDiskSize() {
|
||||
|
|
@ -41,7 +40,6 @@ public class SecondaryStorage extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setUsedDiskSize(Long usedDiskSize) {
|
||||
this.usedDiskSize = usedDiskSize;
|
||||
fieldNamesToIncludeInToString.add("usedDiskSize");
|
||||
}
|
||||
|
||||
public Long getTotalDiskSize() {
|
||||
|
|
@ -50,7 +48,6 @@ public class SecondaryStorage extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setTotalDiskSize(Long totalDiskSize) {
|
||||
this.totalDiskSize = totalDiskSize;
|
||||
fieldNamesToIncludeInToString.add("totalDiskSize");
|
||||
}
|
||||
|
||||
public String getProtocol() {
|
||||
|
|
@ -59,6 +56,5 @@ public class SecondaryStorage extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setProtocol(String protocol) {
|
||||
this.protocol = protocol;
|
||||
fieldNamesToIncludeInToString.add("protocol");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,11 @@
|
|||
// under the License.
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import com.cloud.hypervisor.Hypervisor;
|
||||
|
||||
public class Snapshot extends GenericHeuristicPresetVariable {
|
||||
|
||||
private Long size;
|
||||
|
||||
private Hypervisor.HypervisorType hypervisorType;
|
||||
private String hypervisorType;
|
||||
|
||||
public Long getSize() {
|
||||
return size;
|
||||
|
|
@ -30,15 +28,13 @@ public class Snapshot extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setSize(Long size) {
|
||||
this.size = size;
|
||||
fieldNamesToIncludeInToString.add("size");
|
||||
}
|
||||
|
||||
public Hypervisor.HypervisorType getHypervisorType() {
|
||||
public String getHypervisorType() {
|
||||
return hypervisorType;
|
||||
}
|
||||
|
||||
public void setHypervisorType(Hypervisor.HypervisorType hypervisorType) {
|
||||
public void setHypervisorType(String hypervisorType) {
|
||||
this.hypervisorType = hypervisorType;
|
||||
fieldNamesToIncludeInToString.add("hypervisorType");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,41 +16,35 @@
|
|||
// under the License.
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import com.cloud.hypervisor.Hypervisor;
|
||||
import com.cloud.storage.Storage;
|
||||
|
||||
public class Template extends GenericHeuristicPresetVariable {
|
||||
|
||||
private Hypervisor.HypervisorType hypervisorType;
|
||||
private String hypervisorType;
|
||||
|
||||
private Storage.ImageFormat format;
|
||||
private String format;
|
||||
|
||||
private Storage.TemplateType templateType;
|
||||
private String templateType;
|
||||
|
||||
public Hypervisor.HypervisorType getHypervisorType() {
|
||||
public String getHypervisorType() {
|
||||
return hypervisorType;
|
||||
}
|
||||
|
||||
public void setHypervisorType(Hypervisor.HypervisorType hypervisorType) {
|
||||
public void setHypervisorType(String hypervisorType) {
|
||||
this.hypervisorType = hypervisorType;
|
||||
fieldNamesToIncludeInToString.add("hypervisorType");
|
||||
}
|
||||
|
||||
public Storage.ImageFormat getFormat() {
|
||||
public String getFormat() {
|
||||
return format;
|
||||
}
|
||||
|
||||
public void setFormat(Storage.ImageFormat format) {
|
||||
public void setFormat(String format) {
|
||||
this.format = format;
|
||||
fieldNamesToIncludeInToString.add("format");
|
||||
}
|
||||
|
||||
public Storage.TemplateType getTemplateType() {
|
||||
public String getTemplateType() {
|
||||
return templateType;
|
||||
}
|
||||
|
||||
public void setTemplateType(Storage.TemplateType templateType) {
|
||||
public void setTemplateType(String templateType) {
|
||||
this.templateType = templateType;
|
||||
fieldNamesToIncludeInToString.add("templateType");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,11 @@
|
|||
// under the License.
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import com.cloud.storage.Storage;
|
||||
|
||||
public class Volume extends GenericHeuristicPresetVariable {
|
||||
|
||||
private Long size;
|
||||
|
||||
private Storage.ImageFormat format;
|
||||
private String format;
|
||||
|
||||
public Long getSize() {
|
||||
return size;
|
||||
|
|
@ -30,15 +28,13 @@ public class Volume extends GenericHeuristicPresetVariable {
|
|||
|
||||
public void setSize(Long size) {
|
||||
this.size = size;
|
||||
fieldNamesToIncludeInToString.add("size");
|
||||
}
|
||||
|
||||
public Storage.ImageFormat getFormat() {
|
||||
public String getFormat() {
|
||||
return format;
|
||||
}
|
||||
|
||||
public void setFormat(Storage.ImageFormat format) {
|
||||
public void setFormat(String format) {
|
||||
this.format = format;
|
||||
fieldNamesToIncludeInToString.add("format");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -474,6 +474,11 @@ public class MockResourceManagerImpl extends ManagerBase implements ResourceMana
|
|||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HostVO findHostByGuidPrefix(String guid) {
|
||||
return null;
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see com.cloud.resource.ResourceManager#findHostByName(java.lang.String)
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@
|
|||
// under the License.
|
||||
package org.apache.cloudstack.storage.heuristics;
|
||||
|
||||
import com.cloud.hypervisor.Hypervisor;
|
||||
import com.cloud.storage.Storage;
|
||||
import com.cloud.storage.VMTemplateVO;
|
||||
import com.cloud.storage.VolumeVO;
|
||||
import com.cloud.utils.exception.CloudRuntimeException;
|
||||
|
|
@ -29,6 +31,7 @@ import org.apache.cloudstack.storage.heuristics.presetvariables.PresetVariables;
|
|||
import org.apache.cloudstack.utils.jsinterpreter.JsInterpreter;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
|
|
@ -68,6 +71,19 @@ public class HeuristicRuleHelperTest {
|
|||
@InjectMocks
|
||||
HeuristicRuleHelper heuristicRuleHelperSpy = new HeuristicRuleHelper();
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
Mockito.doReturn("template-name").when(vmTemplateVOMock).getName();
|
||||
Mockito.doReturn(Storage.ImageFormat.QCOW2).when(vmTemplateVOMock).getFormat();
|
||||
Mockito.doReturn(Hypervisor.HypervisorType.KVM).when(vmTemplateVOMock).getHypervisorType();
|
||||
Mockito.doReturn("snapshot-name").when(snapshotInfoMock).getName();
|
||||
Mockito.doReturn(1024L).when(snapshotInfoMock).getSize();
|
||||
Mockito.doReturn(Hypervisor.HypervisorType.VMware).when(snapshotInfoMock).getHypervisorType();
|
||||
Mockito.doReturn("volume-name").when(volumeVOMock).getName();
|
||||
Mockito.doReturn(Storage.ImageFormat.RAW).when(volumeVOMock).getFormat();
|
||||
Mockito.doReturn(2048L).when(volumeVOMock).getSize();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getImageStoreIfThereIsHeuristicRuleTestZoneDoesNotHaveHeuristicRuleShouldReturnNull() {
|
||||
Long zoneId = 1L;
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class AccountTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnsValidJson() {
|
||||
Account variable = new Account();
|
||||
variable.setName("test name");
|
||||
variable.setId("test id");
|
||||
|
||||
Domain domainVariable = new Domain();
|
||||
domainVariable.setId("domain id");
|
||||
domainVariable.setName("domain name");
|
||||
variable.setDomain(domainVariable);
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "name", "id", "domain");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class DomainTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnsValidJson() {
|
||||
Domain variable = new Domain();
|
||||
variable.setName("test name");
|
||||
variable.setId("test id");
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "name", "id");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class GenericHeuristicPresetVariableTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnsValidJson() {
|
||||
GenericHeuristicPresetVariable variable = new GenericHeuristicPresetVariable();
|
||||
variable.setName("test name");
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "name");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class SecondaryStorageTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnsValidJson() {
|
||||
SecondaryStorage variable = new SecondaryStorage();
|
||||
variable.setName("test name");
|
||||
variable.setId("test id");
|
||||
variable.setProtocol("test protocol");
|
||||
variable.setUsedDiskSize(1L);
|
||||
variable.setTotalDiskSize(2L);
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "name", "id",
|
||||
"protocol", "usedDiskSize", "totalDiskSize");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import com.cloud.hypervisor.Hypervisor;
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class SnapshotTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnsValidJson() {
|
||||
Snapshot variable = new Snapshot();
|
||||
variable.setName("test name");
|
||||
variable.setSize(1L);
|
||||
variable.setHypervisorType(Hypervisor.HypervisorType.KVM);
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "name", "size",
|
||||
"hypervisorType");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import com.cloud.hypervisor.Hypervisor;
|
||||
import com.cloud.storage.Storage;
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class TemplateTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnsValidJson() {
|
||||
Template variable = new Template();
|
||||
variable.setName("test name");
|
||||
variable.setTemplateType(Storage.TemplateType.USER);
|
||||
variable.setHypervisorType(Hypervisor.HypervisorType.KVM);
|
||||
variable.setFormat(Storage.ImageFormat.QCOW2);
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "name", "templateType",
|
||||
"hypervisorType", "format");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
|
||||
package org.apache.cloudstack.storage.heuristics.presetvariables;
|
||||
|
||||
import com.cloud.storage.Storage;
|
||||
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class VolumeTest {
|
||||
|
||||
@Test
|
||||
public void toStringTestReturnsValidJson() {
|
||||
Volume variable = new Volume();
|
||||
variable.setName("test name");
|
||||
variable.setFormat(Storage.ImageFormat.QCOW2);
|
||||
variable.setSize(1L);
|
||||
|
||||
String expected = ReflectionToStringBuilderUtils.reflectOnlySelectedFields(variable, "name", "format",
|
||||
"size");
|
||||
String result = variable.toString();
|
||||
|
||||
Assert.assertEquals(expected, result);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -16,6 +16,8 @@
|
|||
// under the License.
|
||||
package org.apache.cloudstack.storage.template;
|
||||
|
||||
import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
|
|
@ -32,11 +34,11 @@ import java.util.concurrent.Executors;
|
|||
|
||||
import javax.naming.ConfigurationException;
|
||||
|
||||
import com.cloud.agent.api.Answer;
|
||||
|
||||
import com.cloud.agent.api.ConvertSnapshotCommand;
|
||||
import org.apache.cloudstack.storage.resource.SecondaryStorageResource;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import com.cloud.agent.api.Answer;
|
||||
import com.cloud.agent.api.ConvertSnapshotCommand;
|
||||
import com.cloud.agent.api.storage.CreateEntityDownloadURLAnswer;
|
||||
import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand;
|
||||
import com.cloud.agent.api.storage.DeleteEntityDownloadURLCommand;
|
||||
|
|
@ -51,15 +53,18 @@ import com.cloud.storage.template.FtpTemplateUploader;
|
|||
import com.cloud.storage.template.TemplateUploader;
|
||||
import com.cloud.storage.template.TemplateUploader.Status;
|
||||
import com.cloud.storage.template.TemplateUploader.UploadCompleteCallback;
|
||||
import com.cloud.utils.FileUtil;
|
||||
import com.cloud.utils.NumbersUtil;
|
||||
import com.cloud.utils.UuidUtils;
|
||||
import com.cloud.utils.component.ManagerBase;
|
||||
import com.cloud.utils.exception.CloudRuntimeException;
|
||||
import com.cloud.utils.script.Script;
|
||||
|
||||
import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
|
||||
|
||||
public class UploadManagerImpl extends ManagerBase implements UploadManager {
|
||||
|
||||
protected static final String EXTRACT_USERDATA_DIR = "userdata";
|
||||
protected static final String BASE_EXTRACT_PATH = String.format("/var/www/html/%s/", EXTRACT_USERDATA_DIR);
|
||||
|
||||
public class Completion implements UploadCompleteCallback {
|
||||
private final String jobId;
|
||||
|
||||
|
|
@ -269,7 +274,7 @@ public class UploadManagerImpl extends ManagerBase implements UploadManager {
|
|||
return new CreateEntityDownloadURLAnswer(errorString, CreateEntityDownloadURLAnswer.RESULT_FAILURE);
|
||||
}
|
||||
// Create the directory structure so that its visible under apache server root
|
||||
String extractDir = "/var/www/html/userdata/";
|
||||
String extractDir = BASE_EXTRACT_PATH;
|
||||
extractDir = extractDir + cmd.getFilepathInExtractURL() + File.separator;
|
||||
Script command = new Script("/bin/su", logger);
|
||||
command.add("-s");
|
||||
|
|
@ -333,12 +338,20 @@ public class UploadManagerImpl extends ManagerBase implements UploadManager {
|
|||
String extractUrl = cmd.getExtractUrl();
|
||||
String result;
|
||||
if (extractUrl != null) {
|
||||
command.add("unlink /var/www/html/userdata/" + extractUrl.substring(extractUrl.lastIndexOf(File.separator) + 1));
|
||||
URI uri = URI.create(extractUrl);
|
||||
String uriPath = uri.getPath();
|
||||
String marker = String.format("/%s/", EXTRACT_USERDATA_DIR);
|
||||
String linkPath = uriPath.startsWith(marker)
|
||||
? uriPath.substring(marker.length())
|
||||
: uriPath.substring(uriPath.indexOf(marker) + marker.length());
|
||||
command.add("unlink " + BASE_EXTRACT_PATH + linkPath);
|
||||
result = command.execute();
|
||||
if (result != null) {
|
||||
// FIXME - Ideally should bail out if you can't delete symlink. Not doing it right now.
|
||||
// This is because the ssvm might already be destroyed and the symlinks do not exist.
|
||||
logger.warn("Error in deleting symlink :" + result);
|
||||
} else {
|
||||
deleteEntitySymlinkRootDirectoryIfNeeded(cmd, linkPath);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -371,6 +384,30 @@ public class UploadManagerImpl extends ManagerBase implements UploadManager {
|
|||
return new Answer(cmd, true, "");
|
||||
}
|
||||
|
||||
protected void deleteEntitySymlinkRootDirectoryIfNeeded(DeleteEntityDownloadURLCommand cmd, String linkPath) {
|
||||
if (StringUtils.isEmpty(linkPath)) {
|
||||
return;
|
||||
}
|
||||
String[] parts = linkPath.split("/");
|
||||
if (parts.length == 0) {
|
||||
return;
|
||||
}
|
||||
String rootDir = parts[0];
|
||||
if (StringUtils.isEmpty(rootDir) || !UuidUtils.isUuid(rootDir)) {
|
||||
return;
|
||||
}
|
||||
logger.info("Deleting symlink root directory: {} for {}", rootDir, cmd.getExtractUrl());
|
||||
Path rootDirPath = Path.of(BASE_EXTRACT_PATH, rootDir);
|
||||
String failMsg = "Failed to delete symlink root directory: {} for {}";
|
||||
try {
|
||||
if (!FileUtil.deleteRecursively(rootDirPath)) {
|
||||
logger.warn(failMsg, rootDir, cmd.getExtractUrl());
|
||||
}
|
||||
} catch (IOException e) {
|
||||
logger.warn(failMsg, rootDir, cmd.getExtractUrl(), e);
|
||||
}
|
||||
}
|
||||
|
||||
private String getInstallPath(String jobId) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,85 @@
|
|||
// Licensed to the Apache Software Foundation (ASF) under one
|
||||
// or more contributor license agreements. See the NOTICE file
|
||||
// distributed with this work for additional information
|
||||
// regarding copyright ownership. The ASF licenses this file
|
||||
// to you under the Apache License, Version 2.0 (the
|
||||
// "License"); you may not use this file except in compliance
|
||||
// with the License. You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing,
|
||||
// software distributed under the License is distributed on an
|
||||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
package org.apache.cloudstack.storage.template;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.mockStatic;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
|
||||
import java.nio.file.Path;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.MockedStatic;
|
||||
import org.mockito.Mockito;
|
||||
import org.mockito.junit.MockitoJUnitRunner;
|
||||
|
||||
import com.cloud.agent.api.storage.DeleteEntityDownloadURLCommand;
|
||||
import com.cloud.utils.FileUtil;
|
||||
|
||||
@RunWith(MockitoJUnitRunner.class)
|
||||
public class UploadManagerImplTest {
|
||||
|
||||
@InjectMocks
|
||||
UploadManagerImpl uploadManager;
|
||||
|
||||
MockedStatic<FileUtil> fileUtilMock;
|
||||
|
||||
@Before
|
||||
public void setup() {
|
||||
fileUtilMock = mockStatic(FileUtil.class, Mockito.CALLS_REAL_METHODS);
|
||||
fileUtilMock.when(() -> FileUtil.deleteRecursively(any(Path.class))).thenReturn(true);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
fileUtilMock.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doesNotDeleteWhenLinkPathIsEmpty() {
|
||||
String emptyLinkPath = "";
|
||||
uploadManager.deleteEntitySymlinkRootDirectoryIfNeeded(mock(DeleteEntityDownloadURLCommand.class), emptyLinkPath);
|
||||
fileUtilMock.verify(() -> FileUtil.deleteRecursively(any(Path.class)), never());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void doesNotDeleteWhenRootDirIsNotUuid() {
|
||||
String invalidLinkPath = "invalidRootDir/file";
|
||||
uploadManager.deleteEntitySymlinkRootDirectoryIfNeeded(mock(DeleteEntityDownloadURLCommand.class), invalidLinkPath);
|
||||
fileUtilMock.verify(() -> FileUtil.deleteRecursively(any(Path.class)), never());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void deletesSymlinkRootDirectoryWhenValidUuid() {
|
||||
String validLinkPath = "123e4567-e89b-12d3-a456-426614174000/file";
|
||||
uploadManager.deleteEntitySymlinkRootDirectoryIfNeeded(mock(DeleteEntityDownloadURLCommand.class), validLinkPath);
|
||||
fileUtilMock.verify(() -> FileUtil.deleteRecursively(any(Path.class)), times(1));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void deletesSymlinkRootDirectoryWhenNoFile() {
|
||||
String validLinkPath = "123e4567-e89b-12d3-a456-426614174000";
|
||||
uploadManager.deleteEntitySymlinkRootDirectoryIfNeeded(mock(DeleteEntityDownloadURLCommand.class), validLinkPath);
|
||||
fileUtilMock.verify(() -> FileUtil.deleteRecursively(any(Path.class)), times(1));
|
||||
}
|
||||
}
|
||||
|
|
@ -31,6 +31,7 @@ import java.util.concurrent.Executors;
|
|||
import java.util.concurrent.Future;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import com.cloud.network.Network;
|
||||
import com.cloud.usage.dao.UsageNetworksDao;
|
||||
|
|
@ -179,6 +180,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
|
|||
private final List<UsageVmDiskVO> usageVmDisks = new ArrayList<UsageVmDiskVO>();
|
||||
|
||||
private final ScheduledExecutorService _executor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Usage-Job"));
|
||||
private final AtomicBoolean isParsingJobRunning = new AtomicBoolean(false);
|
||||
private final ScheduledExecutorService _heartbeatExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Usage-HB"));
|
||||
private final ScheduledExecutorService _sanityExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Usage-Sanity"));
|
||||
private Future _scheduledFuture = null;
|
||||
|
|
@ -354,7 +356,12 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
|
|||
(new ManagedContextRunnable() {
|
||||
@Override
|
||||
protected void runInContext() {
|
||||
runInContextInternal();
|
||||
isParsingJobRunning.set(true);
|
||||
try {
|
||||
runInContextInternal();
|
||||
} finally {
|
||||
isParsingJobRunning.set(false);
|
||||
}
|
||||
}
|
||||
}).run();
|
||||
}
|
||||
|
|
@ -2177,9 +2184,14 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna
|
|||
|
||||
if ((timeSinceLastSuccessJob > 0) && (timeSinceLastSuccessJob > (aggregationDurationMillis - 100))) {
|
||||
if (timeToJob > (aggregationDurationMillis / 2)) {
|
||||
logger.debug("it's been {} ms since last usage job and {} ms until next job, scheduling an immediate job to catch up (aggregation duration is {} minutes)"
|
||||
, timeSinceLastSuccessJob, timeToJob, _aggregationDuration);
|
||||
scheduleParse();
|
||||
logger.debug("Heartbeat: it's been {} ms since last finished usage job and {} ms until next job (aggregation duration is {} minutes)",
|
||||
timeSinceLastSuccessJob, timeToJob, _aggregationDuration);
|
||||
if (isParsingJobRunning.get()) {
|
||||
logger.debug("Heartbeat: A parsing job is already running");
|
||||
} else {
|
||||
logger.debug("Heartbeat: Scheduling an immediate job to catch up");
|
||||
scheduleParse();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import java.util.Arrays;
|
|||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
|
|
@ -44,6 +43,7 @@ import javax.script.SimpleBindings;
|
|||
import javax.script.SimpleScriptContext;
|
||||
|
||||
import org.apache.commons.collections.MapUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.openjdk.nashorn.api.scripting.ClassFilter;
|
||||
|
|
@ -67,7 +67,7 @@ public class JsInterpreter implements Closeable {
|
|||
|
||||
protected ScriptEngine interpreter;
|
||||
protected String interpreterName;
|
||||
private final String injectingLogMessage = "Injecting variable [%s] with value [%s] into the JS interpreter.";
|
||||
private final String injectingLogMessage = "Injecting variable [{}] with value [{}] into the JS interpreter.";
|
||||
protected ExecutorService executor;
|
||||
private TimeUnit defaultTimeUnit = TimeUnit.MILLISECONDS;
|
||||
private long timeout;
|
||||
|
|
@ -107,7 +107,7 @@ public class JsInterpreter implements Closeable {
|
|||
|
||||
NashornScriptEngineFactory factory = new NashornScriptEngineFactory();
|
||||
this.interpreterName = factory.getEngineName();
|
||||
logger.trace(String.format("Initiating JS interpreter: %s.", interpreterName));
|
||||
logger.trace("Initiating JS interpreter: {}.", interpreterName);
|
||||
|
||||
setScriptEngineDisablingJavaLanguage(factory);
|
||||
}
|
||||
|
|
@ -136,36 +136,25 @@ public class JsInterpreter implements Closeable {
|
|||
*/
|
||||
public void injectVariable(String key, Object value) {
|
||||
if (key == null) return;
|
||||
logger.trace(String.format(injectingLogMessage, key, String.valueOf(value)));
|
||||
logger.trace(injectingLogMessage, key, value);
|
||||
variables.put(key, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Not needed when using Bindings; kept for source compatibility.
|
||||
* Prefer {@link #injectVariable(String, Object)}.
|
||||
*/
|
||||
@Deprecated
|
||||
public void injectStringVariable(String key, String value) {
|
||||
if (value == null) {
|
||||
logger.trace(String.format("Not injecting [%s] because its value is null.", key));
|
||||
return;
|
||||
}
|
||||
injectVariable(key, value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Injects the variables via Bindings and executes the script with a fresh context.
|
||||
* @param script Code to be executed.
|
||||
* @return The result of the executed script.
|
||||
*/
|
||||
public Object executeScript(String script) {
|
||||
Objects.requireNonNull(script, "script");
|
||||
if (script == null) {
|
||||
throw new CloudRuntimeException("Script injected into the JavaScript interpreter must not be null.");
|
||||
}
|
||||
|
||||
logger.debug(String.format("Executing script [%s].", script));
|
||||
logger.debug("Executing script [{}].", script);
|
||||
|
||||
Object result = executeScriptInThread(script);
|
||||
|
||||
logger.debug(String.format("The script [%s] had the following result: [%s].", script, result));
|
||||
logger.debug("The script [{}] had the following result: [{}].", script, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -193,7 +182,7 @@ public class JsInterpreter implements Closeable {
|
|||
}
|
||||
return result;
|
||||
} catch (ScriptException se) {
|
||||
String msg = se.getMessage() == null ? "Script error" : se.getMessage();
|
||||
String msg = ObjectUtils.defaultIfNull(se.getMessage(), "Script error");
|
||||
throw new ScriptException("Script error: " + msg, se.getFileName(), se.getLineNumber(), se.getColumnNumber());
|
||||
}
|
||||
};
|
||||
|
|
@ -213,7 +202,7 @@ public class JsInterpreter implements Closeable {
|
|||
logger.error(message, e);
|
||||
throw new CloudRuntimeException(message, e);
|
||||
} catch (ExecutionException e) {
|
||||
Throwable cause = e.getCause() == null ? e : e.getCause();
|
||||
Throwable cause = ObjectUtils.defaultIfNull(e.getCause(), e);
|
||||
String message = String.format("Unable to execute script [%s] due to [%s]", script, cause.getMessage());
|
||||
logger.error(message, cause);
|
||||
throw new CloudRuntimeException(message, cause);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,11 @@
|
|||
package org.apache.cloudstack.utils.jsinterpreter;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import com.cloud.utils.StringUtils;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
|
|
@ -27,24 +31,25 @@ public class TagAsRuleHelper {
|
|||
|
||||
protected static Logger LOGGER = LogManager.getLogger(TagAsRuleHelper.class);
|
||||
|
||||
private static final String PARSE_TAGS = "tags = tags ? tags.split(',') : [];";
|
||||
|
||||
|
||||
public static boolean interpretTagAsRule(String rule, String tags, long timeout) {
|
||||
String script = PARSE_TAGS + rule;
|
||||
List<String> tagsPresetVariable = new ArrayList<>();
|
||||
if (!StringUtils.isEmpty(tags)) {
|
||||
tagsPresetVariable.addAll(Arrays.asList(tags.split(",")));
|
||||
}
|
||||
|
||||
try (JsInterpreter jsInterpreter = new JsInterpreter(timeout)) {
|
||||
jsInterpreter.injectVariable("tags", tags);
|
||||
Object scriptReturn = jsInterpreter.executeScript(script);
|
||||
jsInterpreter.injectVariable("tags", tagsPresetVariable);
|
||||
Object scriptReturn = jsInterpreter.executeScript(rule);
|
||||
if (scriptReturn instanceof Boolean) {
|
||||
return (Boolean)scriptReturn;
|
||||
}
|
||||
} catch (IOException ex) {
|
||||
String message = String.format("Error while executing script [%s].", script);
|
||||
String message = String.format("Error while executing script [%s].", rule);
|
||||
LOGGER.error(message, ex);
|
||||
throw new CloudRuntimeException(message, ex);
|
||||
}
|
||||
|
||||
LOGGER.debug(String.format("Result of tag rule [%s] was not a boolean, returning false.", script));
|
||||
LOGGER.debug("Result of tag rule [{}] was not a boolean, returning false.", rule);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -159,24 +159,6 @@ public class JsInterpreterTest {
|
|||
Mockito.any(ClassLoader.class), Mockito.any(ClassFilter.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void injectStringVariableTestNullValueDoNothing() {
|
||||
jsInterpreterSpy.variables = new LinkedHashMap<>();
|
||||
|
||||
jsInterpreterSpy.injectStringVariable("a", null);
|
||||
|
||||
Assert.assertTrue(jsInterpreterSpy.variables.isEmpty());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void injectStringVariableTestNotNullValueSurroundWithDoubleQuotes() {
|
||||
jsInterpreterSpy.variables = new LinkedHashMap<>();
|
||||
|
||||
jsInterpreterSpy.injectStringVariable("a", "b");
|
||||
|
||||
Assert.assertEquals(jsInterpreterSpy.variables.get("a"), "b");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void executeScriptTestValidScriptShouldPassWithMixedVariables() {
|
||||
try (JsInterpreter jsInterpreter = new JsInterpreter(1000)) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue