mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Fix spelling (#6597)
This commit is contained in:
parent
6ba0ef2f50
commit
f9347ecf2c
@ -381,7 +381,7 @@ public abstract class BaseCmd {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* display flag is used to control the display of the resource only to the end user. It doesnt affect Root Admin.
|
* display flag is used to control the display of the resource only to the end user. It doesn't affect Root Admin.
|
||||||
* @return display flag
|
* @return display flag
|
||||||
*/
|
*/
|
||||||
public boolean isDisplay(){
|
public boolean isDisplay(){
|
||||||
|
|||||||
@ -92,7 +92,7 @@ public class UpdateSnapshotPolicyCmd extends BaseAsyncCustomIdCmd {
|
|||||||
}
|
}
|
||||||
Volume volume = _responseGenerator.findVolumeById(policy.getVolumeId());
|
Volume volume = _responseGenerator.findVolumeById(policy.getVolumeId());
|
||||||
if (volume == null) {
|
if (volume == null) {
|
||||||
throw new InvalidParameterValueException("Snapshot policy's volume id doesnt exist");
|
throw new InvalidParameterValueException("Snapshot policy's volume id doesn't exist");
|
||||||
}else{
|
}else{
|
||||||
return volume.getAccountId();
|
return volume.getAccountId();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -107,7 +107,7 @@ public class RestoreVMCmd extends BaseAsyncCmd implements UserCmd {
|
|||||||
return templateId;
|
return templateId;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO - Remove vmid param and make it "id" in 5.0 so that we dont have two getters
|
// TODO - Remove vmid param and make it "id" in 5.0 so that we don't have two getters
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return getVmId();
|
return getVmId();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -286,7 +286,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade {
|
|||||||
pstmt3.close();
|
pstmt3.close();
|
||||||
|
|
||||||
// add the reference to this physical network for the default public network entries in vlan / user_ip_address tables
|
// add the reference to this physical network for the default public network entries in vlan / user_ip_address tables
|
||||||
// add first physicalNetworkId to op_dc_vnet_alloc for this zone - just a placeholder since direct networking dont need this
|
// add first physicalNetworkId to op_dc_vnet_alloc for this zone - just a placeholder since direct networking don't need this
|
||||||
if (isFirstPhysicalNtwk) {
|
if (isFirstPhysicalNtwk) {
|
||||||
s_logger.debug("Adding PhysicalNetwork to default Public network entries in vlan and user_ip_address");
|
s_logger.debug("Adding PhysicalNetwork to default Public network entries in vlan and user_ip_address");
|
||||||
pstmt3 = conn.prepareStatement("SELECT id FROM `cloud`.`networks` where traffic_type = 'Public' and data_center_id = " + zoneId);
|
pstmt3 = conn.prepareStatement("SELECT id FROM `cloud`.`networks` where traffic_type = 'Public' and data_center_id = " + zoneId);
|
||||||
|
|||||||
@ -76,7 +76,7 @@ public class Upgrade305to306 extends Upgrade30xBase {
|
|||||||
|
|
||||||
private void addIndexForAlert(Connection conn) {
|
private void addIndexForAlert(Connection conn) {
|
||||||
|
|
||||||
//First drop if it exists. (Due to patches shipped to customers some will have the index and some wont.)
|
//First drop if it exists. (Due to patches shipped to customers some will have the index and some won't.)
|
||||||
List<String> indexList = new ArrayList<String>();
|
List<String> indexList = new ArrayList<String>();
|
||||||
s_logger.debug("Dropping index i_alert__last_sent if it exists");
|
s_logger.debug("Dropping index i_alert__last_sent if it exists");
|
||||||
indexList.add("i_alert__last_sent");
|
indexList.add("i_alert__last_sent");
|
||||||
@ -115,7 +115,7 @@ public class Upgrade305to306 extends Upgrade30xBase {
|
|||||||
|
|
||||||
private void addIndexForHostDetails(Connection conn) {
|
private void addIndexForHostDetails(Connection conn) {
|
||||||
|
|
||||||
//First drop if it exists. (Due to patches shipped to customers some will have the index and some wont.)
|
//First drop if it exists. (Due to patches shipped to customers some will have the index and some won't.)
|
||||||
List<String> indexList = new ArrayList<String>();
|
List<String> indexList = new ArrayList<String>();
|
||||||
s_logger.debug("Dropping index fk_host_details__host_id if it exists");
|
s_logger.debug("Dropping index fk_host_details__host_id if it exists");
|
||||||
indexList.add("fk_host_details__host_id");
|
indexList.add("fk_host_details__host_id");
|
||||||
|
|||||||
@ -443,7 +443,7 @@ public class Upgrade410to420 implements DbUpgrade {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void addIndexForAlert(Connection conn) {
|
private void addIndexForAlert(Connection conn) {
|
||||||
//First drop if it exists. (Due to patches shipped to customers some will have the index and some wont.)
|
//First drop if it exists. (Due to patches shipped to customers some will have the index and some won't.)
|
||||||
List<String> indexList = new ArrayList<String>();
|
List<String> indexList = new ArrayList<String>();
|
||||||
s_logger.debug("Dropping index i_alert__last_sent if it exists");
|
s_logger.debug("Dropping index i_alert__last_sent if it exists");
|
||||||
indexList.add("last_sent"); // in 4.1, we created this index that is not in convention.
|
indexList.add("last_sent"); // in 4.1, we created this index that is not in convention.
|
||||||
|
|||||||
@ -388,7 +388,7 @@ public class DefaultEndPointSelector implements EndPointSelector {
|
|||||||
s_logger.debug("Received URISyntaxException for url" +downloadUrl);
|
s_logger.debug("Received URISyntaxException for url" +downloadUrl);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If ssvm doesnt exist then find any ssvm in the zone.
|
// If ssvm doesn't exist then find any ssvm in the zone.
|
||||||
s_logger.debug("Coudn't find ssvm for url" +downloadUrl);
|
s_logger.debug("Coudn't find ssvm for url" +downloadUrl);
|
||||||
return findEndpointForImageStorage(store);
|
return findEndpointForImageStorage(store);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -357,7 +357,7 @@ public class VolumeServiceImpl implements VolumeService {
|
|||||||
VolumeDataStoreVO volumeStore = _volumeStoreDao.findByVolume(volume.getId());
|
VolumeDataStoreVO volumeStore = _volumeStoreDao.findByVolume(volume.getId());
|
||||||
if (volumeStore != null) {
|
if (volumeStore != null) {
|
||||||
if (volumeStore.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_IN_PROGRESS) {
|
if (volumeStore.getDownloadState() == VMTemplateStorageResourceAssoc.Status.DOWNLOAD_IN_PROGRESS) {
|
||||||
String msg = "Volume: " + volume.getName() + " is currently being uploaded; cant' delete it.";
|
String msg = "Volume: " + volume.getName() + " is currently being uploaded; can't delete it.";
|
||||||
s_logger.debug(msg);
|
s_logger.debug(msg);
|
||||||
result.setSuccess(false);
|
result.setSuccess(false);
|
||||||
result.setResult(msg);
|
result.setResult(msg);
|
||||||
|
|||||||
@ -127,7 +127,7 @@ public class UserConcentratedPodPlanner extends FirstFitPlanner implements Deplo
|
|||||||
//UserConcentratedPod strategy
|
//UserConcentratedPod strategy
|
||||||
List<Long> podIds = listPodsByUserConcentration(plan.getDataCenterId(), accountId);
|
List<Long> podIds = listPodsByUserConcentration(plan.getDataCenterId(), accountId);
|
||||||
if (!podIds.isEmpty()) {
|
if (!podIds.isEmpty()) {
|
||||||
//remove pods that dont have capacity for this vm
|
//remove pods that don't have capacity for this vm
|
||||||
podIds.retainAll(podIdsByCapacity);
|
podIds.retainAll(podIdsByCapacity);
|
||||||
podIdsByCapacity.removeAll(podIds);
|
podIdsByCapacity.removeAll(podIds);
|
||||||
podIds.addAll(podIdsByCapacity);
|
podIds.addAll(podIdsByCapacity);
|
||||||
|
|||||||
@ -91,7 +91,7 @@ namespace HypervResource
|
|||||||
dest = Utils.NormalizePath(dest);
|
dest = Utils.NormalizePath(dest);
|
||||||
}
|
}
|
||||||
// if the filePathRelativeToShare string don't have filename and only a dir point then find the vhd files in that folder and use
|
// if the filePathRelativeToShare string don't have filename and only a dir point then find the vhd files in that folder and use
|
||||||
// In the clean setup, first copy command wont be having the filename it contains onlyu dir path.
|
// In the clean setup, first copy command won't be having the filename it contains onlyu dir path.
|
||||||
// we need to scan the folder point and then copy the file to destination.
|
// we need to scan the folder point and then copy the file to destination.
|
||||||
else if (!filePathRelativeToShare.EndsWith(".vhd") || !filePathRelativeToShare.EndsWith(".vhdx"))
|
else if (!filePathRelativeToShare.EndsWith(".vhd") || !filePathRelativeToShare.EndsWith(".vhdx"))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -955,7 +955,7 @@ namespace HypervResource
|
|||||||
|
|
||||||
if (vlanSettings == null)
|
if (vlanSettings == null)
|
||||||
{
|
{
|
||||||
// when modifying nic to not connected dont create vlan
|
// when modifying nic to not connected don't create vlan
|
||||||
if (enable)
|
if (enable)
|
||||||
{
|
{
|
||||||
if (vlanid != null)
|
if (vlanid != null)
|
||||||
@ -1024,7 +1024,7 @@ namespace HypervResource
|
|||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: make sure the index wont be out of range.
|
//TODO: make sure the index won't be out of range.
|
||||||
|
|
||||||
EthernetPortAllocationSettingData[] ethernetConnections = GetEthernetConnections(vm);
|
EthernetPortAllocationSettingData[] ethernetConnections = GetEthernetConnections(vm);
|
||||||
EthernetSwitchPortVlanSettingData vlanSettings = GetVlanSettings(ethernetConnections[index]);
|
EthernetSwitchPortVlanSettingData vlanSettings = GetVlanSettings(ethernetConnections[index]);
|
||||||
@ -1119,7 +1119,7 @@ namespace HypervResource
|
|||||||
|
|
||||||
if (vlanSettings == null)
|
if (vlanSettings == null)
|
||||||
{
|
{
|
||||||
// when modifying nic to not connected dont create vlan
|
// when modifying nic to not connected don't create vlan
|
||||||
if (enable)
|
if (enable)
|
||||||
{
|
{
|
||||||
if (vlanid != null)
|
if (vlanid != null)
|
||||||
|
|||||||
@ -1086,7 +1086,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa
|
|||||||
txn.start();
|
txn.start();
|
||||||
MockVolumeVO volume = _mockVolumeDao.findByName(cmd.getTemplatePath());
|
MockVolumeVO volume = _mockVolumeDao.findByName(cmd.getTemplatePath());
|
||||||
if (volume == null) {
|
if (volume == null) {
|
||||||
return new Answer(cmd, false, "cant' find volume:" + cmd.getTemplatePath());
|
return new Answer(cmd, false, "can't find volume:" + cmd.getTemplatePath());
|
||||||
}
|
}
|
||||||
String md5 = null;
|
String md5 = null;
|
||||||
try {
|
try {
|
||||||
@ -1113,7 +1113,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa
|
|||||||
txn.start();
|
txn.start();
|
||||||
volume = _mockVolumeDao.findByStoragePathAndType(cmd.getVolumePath());
|
volume = _mockVolumeDao.findByStoragePathAndType(cmd.getVolumePath());
|
||||||
if (volume == null) {
|
if (volume == null) {
|
||||||
return new CreatePrivateTemplateAnswer(cmd, false, "cant' find volume" + cmd.getVolumePath());
|
return new CreatePrivateTemplateAnswer(cmd, false, "can't find volume" + cmd.getVolumePath());
|
||||||
}
|
}
|
||||||
|
|
||||||
sec = _mockSecStorageDao.findByUrl(cmd.getSecondaryStorageUrl());
|
sec = _mockSecStorageDao.findByUrl(cmd.getSecondaryStorageUrl());
|
||||||
@ -1200,7 +1200,7 @@ public class MockStorageManagerImpl extends ManagerBase implements MockStorageMa
|
|||||||
txn.start();
|
txn.start();
|
||||||
volume = _mockVolumeDao.findByStoragePathAndType(cmd.getVolumePath());
|
volume = _mockVolumeDao.findByStoragePathAndType(cmd.getVolumePath());
|
||||||
if (volume == null) {
|
if (volume == null) {
|
||||||
return new CopyVolumeAnswer(cmd, false, "cant' find volume" + cmd.getVolumePath(), null, null);
|
return new CopyVolumeAnswer(cmd, false, "can't find volume" + cmd.getVolumePath(), null, null);
|
||||||
}
|
}
|
||||||
txn.commit();
|
txn.commit();
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
|
|||||||
@ -3163,7 +3163,7 @@ public abstract class CitrixResourceBase extends ServerResourceBase implements S
|
|||||||
// stability
|
// stability
|
||||||
if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <=
|
if (dynamicMaxRam > staticMax) { // XS contraint that dynamic max <=
|
||||||
// static max
|
// static max
|
||||||
s_logger.warn("dynamic max " + toHumanReadableSize(dynamicMaxRam) + " cant be greater than static max " + toHumanReadableSize(staticMax) + ", this can lead to stability issues. Setting static max as much as dynamic max ");
|
s_logger.warn("dynamic max " + toHumanReadableSize(dynamicMaxRam) + " can't be greater than static max " + toHumanReadableSize(staticMax) + ", this can lead to stability issues. Setting static max as much as dynamic max ");
|
||||||
return dynamicMaxRam;
|
return dynamicMaxRam;
|
||||||
}
|
}
|
||||||
return staticMax;
|
return staticMax;
|
||||||
|
|||||||
@ -476,7 +476,7 @@ public class KubernetesClusterStartWorker extends KubernetesClusterResourceModif
|
|||||||
startKubernetesVM(vm);
|
startKubernetesVM(vm);
|
||||||
} catch (ManagementServerException ex) {
|
} catch (ManagementServerException ex) {
|
||||||
LOGGER.warn(String.format("Failed to start VM : %s in Kubernetes cluster : %s due to ", vm.getDisplayName(), kubernetesCluster.getName()) + ex);
|
LOGGER.warn(String.format("Failed to start VM : %s in Kubernetes cluster : %s due to ", vm.getDisplayName(), kubernetesCluster.getName()) + ex);
|
||||||
// dont bail out here. proceed further to stop the reset of the VM's
|
// don't bail out here. proceed further to stop the reset of the VM's
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (final UserVm userVm : clusterVms) {
|
for (final UserVm userVm : clusterVms) {
|
||||||
|
|||||||
@ -3616,7 +3616,7 @@ public class NetscalerResource implements ServerResource {
|
|||||||
|
|
||||||
private String generateAutoScaleServiceGroupName(final LoadBalancerTO lbTO) {
|
private String generateAutoScaleServiceGroupName(final LoadBalancerTO lbTO) {
|
||||||
/*
|
/*
|
||||||
* ServiceGroup name in NetScaler wont support long names. Providing special name.
|
* ServiceGroup name in NetScaler won't support long names. Providing special name.
|
||||||
* Need for introducing uuid because every vmgroup creation should be distinguished.
|
* Need for introducing uuid because every vmgroup creation should be distinguished.
|
||||||
* Ex. (1) create a vm group, delete a vmgroup, create a vmgroup on same lb ip and port
|
* Ex. (1) create a vm group, delete a vmgroup, create a vmgroup on same lb ip and port
|
||||||
* This will reuse all vms from the original vm group in step (1)
|
* This will reuse all vms from the original vm group in step (1)
|
||||||
|
|||||||
@ -533,7 +533,7 @@ class LdapManagerImplSpec extends spock.lang.Specification {
|
|||||||
user.isDisabled() == true
|
user.isDisabled() == true
|
||||||
}
|
}
|
||||||
|
|
||||||
def "test getUser(username,type,group) when username doesnt exist in ldap"(){
|
def "test getUser(username,type,group) when username doesn't exist in ldap"(){
|
||||||
def ldapUserManager = Mock(LdapUserManager)
|
def ldapUserManager = Mock(LdapUserManager)
|
||||||
def ldapUserManagerFactory = Mock(LdapUserManagerFactory)
|
def ldapUserManagerFactory = Mock(LdapUserManagerFactory)
|
||||||
ldapUserManagerFactory.getInstance(_) >> ldapUserManager
|
ldapUserManagerFactory.getInstance(_) >> ldapUserManager
|
||||||
|
|||||||
@ -128,7 +128,7 @@ class LinkDomainToLdapCmdSpec extends Specification {
|
|||||||
result.getAdminId() == null
|
result.getAdminId() == null
|
||||||
}
|
}
|
||||||
|
|
||||||
def "test with valid params and with admin who doesnt exist in cloudstack"() {
|
def "test with valid params and with admin who doesn't exist in cloudstack"() {
|
||||||
def domainId = 1L;
|
def domainId = 1L;
|
||||||
def type = "GROUP";
|
def type = "GROUP";
|
||||||
def name = "CN=test,DC=ccp,DC=Citrix,DC=com"
|
def name = "CN=test,DC=ccp,DC=Citrix,DC=com"
|
||||||
@ -163,7 +163,7 @@ class LinkDomainToLdapCmdSpec extends Specification {
|
|||||||
result.getAdminId() == String.valueOf(accountId)
|
result.getAdminId() == String.valueOf(accountId)
|
||||||
}
|
}
|
||||||
|
|
||||||
def "test when admin doesnt exist in ldap"() {
|
def "test when admin doesn't exist in ldap"() {
|
||||||
def domainId = 1L;
|
def domainId = 1L;
|
||||||
def type = "GROUP";
|
def type = "GROUP";
|
||||||
def name = "CN=test,DC=ccp,DC=Citrix,DC=com"
|
def name = "CN=test,DC=ccp,DC=Citrix,DC=com"
|
||||||
|
|||||||
@ -56,7 +56,7 @@ public class LinkAccountToLdapCmdTest implements LdapConfigurationChanger {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void execute() throws Exception {
|
public void execute() throws Exception {
|
||||||
// test with valid params and with admin who doesnt exist in cloudstack
|
// test with valid params and with admin who doesn't exist in cloudstack
|
||||||
long domainId = 1;
|
long domainId = 1;
|
||||||
String type = "GROUP";
|
String type = "GROUP";
|
||||||
String ldapDomain = "CN=test,DC=ccp,DC=Citrix,DC=com";
|
String ldapDomain = "CN=test,DC=ccp,DC=Citrix,DC=com";
|
||||||
|
|||||||
@ -60,7 +60,7 @@ public class LinkDomainToLdapCmdTest implements LdapConfigurationChanger
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void execute() throws Exception {
|
public void execute() throws Exception {
|
||||||
// test with valid params and with admin who doesnt exist in cloudstack
|
// test with valid params and with admin who doesn't exist in cloudstack
|
||||||
Long domainId = 1L;
|
Long domainId = 1L;
|
||||||
String type = "GROUP";
|
String type = "GROUP";
|
||||||
String ldapDomain = "CN=test,DC=ccp,DC=Citrix,DC=com";
|
String ldapDomain = "CN=test,DC=ccp,DC=Citrix,DC=com";
|
||||||
|
|||||||
@ -61,15 +61,15 @@ public class SAML2AuthManagerImplTest {
|
|||||||
public void testStart() {
|
public void testStart() {
|
||||||
when(saml2AuthManager.getSAMLIdentityProviderMetadataURL()).thenReturn("file://does/not/exist");
|
when(saml2AuthManager.getSAMLIdentityProviderMetadataURL()).thenReturn("file://does/not/exist");
|
||||||
boolean started = saml2AuthManager.start();
|
boolean started = saml2AuthManager.start();
|
||||||
assertFalse("saml2authmanager should not start as the file doesnt exist", started);
|
assertFalse("saml2authmanager should not start as the file doesn't exist", started);
|
||||||
|
|
||||||
when(saml2AuthManager.getSAMLIdentityProviderMetadataURL()).thenReturn(" ");
|
when(saml2AuthManager.getSAMLIdentityProviderMetadataURL()).thenReturn(" ");
|
||||||
started = saml2AuthManager.start();
|
started = saml2AuthManager.start();
|
||||||
assertFalse("saml2authmanager should not start as the file doesnt exist", started);
|
assertFalse("saml2authmanager should not start as the file doesn't exist", started);
|
||||||
|
|
||||||
when(saml2AuthManager.getSAMLIdentityProviderMetadataURL()).thenReturn("");
|
when(saml2AuthManager.getSAMLIdentityProviderMetadataURL()).thenReturn("");
|
||||||
started = saml2AuthManager.start();
|
started = saml2AuthManager.start();
|
||||||
assertFalse("saml2authmanager should not start as the file doesnt exist", started);
|
assertFalse("saml2authmanager should not start as the file doesn't exist", started);
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -29,7 +29,7 @@ failed() {
|
|||||||
local returnval=$1
|
local returnval=$1
|
||||||
local returnmsg=$2
|
local returnmsg=$2
|
||||||
|
|
||||||
# check for an message, if there is no one dont print anything
|
# check for an message, if there is no one don't print anything
|
||||||
if [[ -z $returnmsg ]]; then
|
if [[ -z $returnmsg ]]; then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
|
|||||||
@ -24,7 +24,7 @@ failed() {
|
|||||||
local returnval=$1
|
local returnval=$1
|
||||||
local returnmsg=$2
|
local returnmsg=$2
|
||||||
|
|
||||||
# check for an message, if there is no one dont print anything
|
# check for an message, if there is no one don't print anything
|
||||||
if [[ -z $returnmsg ]]; then
|
if [[ -z $returnmsg ]]; then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
|
|||||||
@ -119,7 +119,7 @@ vm_port=$(find_port $vm_mac)
|
|||||||
pri_vlan_header=$((4096 + $pri_vlan))
|
pri_vlan_header=$((4096 + $pri_vlan))
|
||||||
sec_vlan_header=$((4096 + $sec_vlan))
|
sec_vlan_header=$((4096 + $sec_vlan))
|
||||||
|
|
||||||
# Get the groups for broadcast. Ensure we end the group id with ',' so that we wont accidentally match groupid 111 with 1110.
|
# Get the groups for broadcast. Ensure we end the group id with ',' so that we won't accidentally match groupid 111 with 1110.
|
||||||
# We're using the header value for the pri vlan port group, as anything from a promiscuous device has to go to every device in the vlan.
|
# We're using the header value for the pri vlan port group, as anything from a promiscuous device has to go to every device in the vlan.
|
||||||
# Since we're creating a separate group for just the promiscuous devices, adding 4096 so that it'll be unique. Hence we're restricted to 4096 vlans!
|
# Since we're creating a separate group for just the promiscuous devices, adding 4096 so that it'll be unique. Hence we're restricted to 4096 vlans!
|
||||||
# Not a big deal because if you have vxlan, why do you even need pvlan!!
|
# Not a big deal because if you have vxlan, why do you even need pvlan!!
|
||||||
|
|||||||
@ -4294,7 +4294,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
|
|||||||
String value = cmd.getValue();
|
String value = cmd.getValue();
|
||||||
Long resourceId = null;
|
Long resourceId = null;
|
||||||
|
|
||||||
//Validation - 1.1 - resourceId and value cant be null.
|
//Validation - 1.1 - resourceId and value can't be null.
|
||||||
if (resourceIdStr == null && value == null) {
|
if (resourceIdStr == null && value == null) {
|
||||||
throw new InvalidParameterValueException("Insufficient parameters passed for listing by resourceId OR key,value pair. Please check your params and try again.");
|
throw new InvalidParameterValueException("Insufficient parameters passed for listing by resourceId OR key,value pair. Please check your params and try again.");
|
||||||
}
|
}
|
||||||
|
|||||||
@ -230,7 +230,7 @@ public class VolumeJoinDaoImpl extends GenericDaoBaseWithTagInformation<VolumeJo
|
|||||||
volResponse.setAttached(volume.getAttached());
|
volResponse.setAttached(volume.getAttached());
|
||||||
volResponse.setDestroyed(volume.getState() == Volume.State.Destroy);
|
volResponse.setDestroyed(volume.getState() == Volume.State.Destroy);
|
||||||
boolean isExtractable = true;
|
boolean isExtractable = true;
|
||||||
if (volume.getVolumeType() != Volume.Type.DATADISK) { // Datadisk dont
|
if (volume.getVolumeType() != Volume.Type.DATADISK) { // Datadisk don't
|
||||||
// have any
|
// have any
|
||||||
// template
|
// template
|
||||||
// dependence.
|
// dependence.
|
||||||
|
|||||||
@ -357,7 +357,7 @@ public class CapacityManagerImpl extends ManagerBase implements CapacityManager,
|
|||||||
/* alloc from free resource */
|
/* alloc from free resource */
|
||||||
if (!((reservedCpu + usedCpu + cpu <= totalCpu) && (reservedMem + usedMem + ram <= totalMem))) {
|
if (!((reservedCpu + usedCpu + cpu <= totalCpu) && (reservedMem + usedMem + ram <= totalMem))) {
|
||||||
if (s_logger.isDebugEnabled()) {
|
if (s_logger.isDebugEnabled()) {
|
||||||
s_logger.debug("Host doesnt seem to have enough free capacity, but increasing the used capacity anyways, " +
|
s_logger.debug("Host doesn't seem to have enough free capacity, but increasing the used capacity anyways, " +
|
||||||
"since the VM is already starting on this host ");
|
"since the VM is already starting on this host ");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -459,7 +459,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
|
|||||||
public final static ConfigKey<Long> IOPS_MAX_WRITE_LENGTH = new ConfigKey<Long>(Long.class, "vm.disk.iops.maximum.write.length", "Advanced", "0",
|
public final static ConfigKey<Long> IOPS_MAX_WRITE_LENGTH = new ConfigKey<Long>(Long.class, "vm.disk.iops.maximum.write.length", "Advanced", "0",
|
||||||
"Maximum IOPS write burst duration (seconds). If '0' (zero) then does not check for maximum burst length.", true, ConfigKey.Scope.Global, null);
|
"Maximum IOPS write burst duration (seconds). If '0' (zero) then does not check for maximum burst length.", true, ConfigKey.Scope.Global, null);
|
||||||
public static final ConfigKey<Boolean> ADD_HOST_ON_SERVICE_RESTART_KVM = new ConfigKey<Boolean>(Boolean.class, "add.host.on.service.restart.kvm", "Advanced", "true",
|
public static final ConfigKey<Boolean> ADD_HOST_ON_SERVICE_RESTART_KVM = new ConfigKey<Boolean>(Boolean.class, "add.host.on.service.restart.kvm", "Advanced", "true",
|
||||||
"Indicates whether the host will be added back to cloudstack after restarting agent service on host. If false it wont be added back even after service restart",
|
"Indicates whether the host will be added back to cloudstack after restarting agent service on host. If false it won't be added back even after service restart",
|
||||||
true, ConfigKey.Scope.Global, null);
|
true, ConfigKey.Scope.Global, null);
|
||||||
public static final ConfigKey<Boolean> SET_HOST_DOWN_TO_MAINTENANCE = new ConfigKey<Boolean>(Boolean.class, "set.host.down.to.maintenance", "Advanced", "false",
|
public static final ConfigKey<Boolean> SET_HOST_DOWN_TO_MAINTENANCE = new ConfigKey<Boolean>(Boolean.class, "set.host.down.to.maintenance", "Advanced", "false",
|
||||||
"Indicates whether the host in down state can be put into maintenance state so thats its not enabled after it comes back.",
|
"Indicates whether the host in down state can be put into maintenance state so thats its not enabled after it comes back.",
|
||||||
|
|||||||
@ -1647,7 +1647,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
|
|||||||
// this volume since allocation_state is disabled.
|
// this volume since allocation_state is disabled.
|
||||||
// - remove any suitable pools found for other volumes.
|
// - remove any suitable pools found for other volumes.
|
||||||
// All volumes should get suitable pools under this cluster;
|
// All volumes should get suitable pools under this cluster;
|
||||||
// else we cant use this cluster.
|
// else we can't use this cluster.
|
||||||
suitableVolumeStoragePools.clear();
|
suitableVolumeStoragePools.clear();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -1698,7 +1698,7 @@ StateListener<State, VirtualMachine.Event, VirtualMachine>, Configurable {
|
|||||||
// No suitable storage pools found under this cluster for this
|
// No suitable storage pools found under this cluster for this
|
||||||
// volume. - remove any suitable pools found for other volumes.
|
// volume. - remove any suitable pools found for other volumes.
|
||||||
// All volumes should get suitable pools under this cluster;
|
// All volumes should get suitable pools under this cluster;
|
||||||
// else we cant use this cluster.
|
// else we can't use this cluster.
|
||||||
suitableVolumeStoragePools.clear();
|
suitableVolumeStoragePools.clear();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -297,7 +297,7 @@ public class FirstFitPlanner extends AdapterBase implements DeploymentClusterPla
|
|||||||
}
|
}
|
||||||
|
|
||||||
private Map<Short, Float> getCapacityThresholdMap() {
|
private Map<Short, Float> getCapacityThresholdMap() {
|
||||||
// Lets build this real time so that the admin wont have to restart MS
|
// Lets build this real time so that the admin won't have to restart MS
|
||||||
// if anyone changes these values
|
// if anyone changes these values
|
||||||
Map<Short, Float> disableThresholdMap = new HashMap<Short, Float>();
|
Map<Short, Float> disableThresholdMap = new HashMap<Short, Float>();
|
||||||
|
|
||||||
|
|||||||
@ -4588,7 +4588,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
|
|||||||
}
|
}
|
||||||
// For Storage, Control, Management, Public check if the zone has any other physical network with this
|
// For Storage, Control, Management, Public check if the zone has any other physical network with this
|
||||||
// traffictype already present
|
// traffictype already present
|
||||||
// If yes, we cant add these traffics to one more physical network in the zone.
|
// If yes, we can't add these traffics to one more physical network in the zone.
|
||||||
|
|
||||||
if (TrafficType.isSystemNetwork(trafficType) || TrafficType.Public.equals(trafficType) || TrafficType.Storage.equals(trafficType)) {
|
if (TrafficType.isSystemNetwork(trafficType) || TrafficType.Public.equals(trafficType) || TrafficType.Storage.equals(trafficType)) {
|
||||||
if (!_physicalNetworkDao.listByZoneAndTrafficType(network.getDataCenterId(), trafficType).isEmpty()) {
|
if (!_physicalNetworkDao.listByZoneAndTrafficType(network.getDataCenterId(), trafficType).isEmpty()) {
|
||||||
|
|||||||
@ -173,7 +173,7 @@ public class StoragePoolAutomationImpl implements StoragePoolAutomation {
|
|||||||
}
|
}
|
||||||
// check to see if other ps exist
|
// check to see if other ps exist
|
||||||
// if they do, then we can migrate over the system vms to them
|
// if they do, then we can migrate over the system vms to them
|
||||||
// if they dont, then just stop all vms on this one
|
// if they don't, then just stop all vms on this one
|
||||||
List<StoragePoolVO> upPools = primaryDataStoreDao.listByStatusInZone(pool.getDataCenterId(), StoragePoolStatus.Up);
|
List<StoragePoolVO> upPools = primaryDataStoreDao.listByStatusInZone(pool.getDataCenterId(), StoragePoolStatus.Up);
|
||||||
boolean restart = true;
|
boolean restart = true;
|
||||||
if (upPools == null || upPools.size() == 0) {
|
if (upPools == null || upPools.size() == 0) {
|
||||||
|
|||||||
@ -3527,7 +3527,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (volume.getVolumeType() != Volume.Type.DATADISK) {
|
if (volume.getVolumeType() != Volume.Type.DATADISK) {
|
||||||
// Datadisk dont have any template dependence.
|
// Datadisk don't have any template dependence.
|
||||||
|
|
||||||
VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId());
|
VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId());
|
||||||
if (template != null) { // For ISO based volumes template = null and
|
if (template != null) { // For ISO based volumes template = null and
|
||||||
|
|||||||
@ -528,7 +528,7 @@ public class HypervisorTemplateAdapter extends TemplateAdapterBase {
|
|||||||
for (TemplateDataStoreVO templateStore : templateStores) {
|
for (TemplateDataStoreVO templateStore : templateStores) {
|
||||||
if (templateStore.getDownloadState() == Status.DOWNLOAD_IN_PROGRESS) {
|
if (templateStore.getDownloadState() == Status.DOWNLOAD_IN_PROGRESS) {
|
||||||
String errorMsg = "Please specify a template that is not currently being downloaded.";
|
String errorMsg = "Please specify a template that is not currently being downloaded.";
|
||||||
s_logger.debug("Template: " + template.getName() + " is currently being downloaded to secondary storage host: " + store.getName() + "; cant' delete it.");
|
s_logger.debug("Template: " + template.getName() + " is currently being downloaded to secondary storage host: " + store.getName() + "; can't delete it.");
|
||||||
throw new CloudRuntimeException(errorMsg);
|
throw new CloudRuntimeException(errorMsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -341,7 +341,7 @@ public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGro
|
|||||||
|
|
||||||
for (AffinityGroupProcessor processor : _affinityProcessors) {
|
for (AffinityGroupProcessor processor : _affinityProcessors) {
|
||||||
if (processor.isAdminControlledGroup()) {
|
if (processor.isAdminControlledGroup()) {
|
||||||
continue; // we dont list the type if this group can be
|
continue; // we don't list the type if this group can be
|
||||||
// created only as an admin/system operation.
|
// created only as an admin/system operation.
|
||||||
}
|
}
|
||||||
types.add(processor.getType());
|
types.add(processor.getType());
|
||||||
|
|||||||
@ -209,7 +209,7 @@ public class FirstFitPlannerTest {
|
|||||||
List<Long> clusterList = planner.orderClusters(vmProfile, plan, avoids);
|
List<Long> clusterList = planner.orderClusters(vmProfile, plan, avoids);
|
||||||
|
|
||||||
assertTrue("Reordered cluster list have clusters which has hosts with specified host tag on offering", (clusterList.containsAll(matchingClusters)));
|
assertTrue("Reordered cluster list have clusters which has hosts with specified host tag on offering", (clusterList.containsAll(matchingClusters)));
|
||||||
assertTrue("Reordered cluster list does not have clusters which dont have hosts with matching host tag on offering", (!clusterList.contains(2L)));
|
assertTrue("Reordered cluster list does not have clusters which don't have hosts with matching host tag on offering", (!clusterList.contains(2L)));
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Long> initializeForClusterListBasedOnHostTag(ServiceOffering offering) {
|
private List<Long> initializeForClusterListBasedOnHostTag(ServiceOffering offering) {
|
||||||
|
|||||||
@ -314,7 +314,7 @@ public class UploadManagerImpl extends ManagerBase implements UploadManager {
|
|||||||
command.add("unlink /var/www/html/userdata/" + extractUrl.substring(extractUrl.lastIndexOf(File.separator) + 1));
|
command.add("unlink /var/www/html/userdata/" + extractUrl.substring(extractUrl.lastIndexOf(File.separator) + 1));
|
||||||
result = command.execute();
|
result = command.execute();
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
// FIXME - Ideally should bail out if you cant delete symlink. Not doing it right now.
|
// 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.
|
// This is because the ssvm might already be destroyed and the symlinks do not exist.
|
||||||
s_logger.warn("Error in deleting symlink :" + result);
|
s_logger.warn("Error in deleting symlink :" + result);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -124,9 +124,9 @@ class TestPrimaryResourceLimitsVolume(cloudstackTestCase):
|
|||||||
# 1. create a normal user account and update primary store limits to the current resource count
|
# 1. create a normal user account and update primary store limits to the current resource count
|
||||||
# 2. Upload a volume of any size
|
# 2. Upload a volume of any size
|
||||||
# 3. Verify that upload volume succeeds
|
# 3. Verify that upload volume succeeds
|
||||||
# 4. Verify that primary storage count doesnt change
|
# 4. Verify that primary storage count doesn't change
|
||||||
# 6. Try attaching volume to VM and verify that the attach fails (as the resource limits exceed)
|
# 6. Try attaching volume to VM and verify that the attach fails (as the resource limits exceed)
|
||||||
# 7. Verify that primary storage count doesnt change
|
# 7. Verify that primary storage count doesn't change
|
||||||
# done
|
# done
|
||||||
"""
|
"""
|
||||||
# create an account, launch a vm with default template and custom disk offering, update the primary store limits to the current primary store resource count
|
# create an account, launch a vm with default template and custom disk offering, update the primary store limits to the current primary store resource count
|
||||||
|
|||||||
@ -362,7 +362,7 @@ class TestPublicIp(cloudstackTestCase):
|
|||||||
Step 7: Try to display public ip address from shared networks
|
Step 7: Try to display public ip address from shared networks
|
||||||
Step 8: It should not return any result
|
Step 8: It should not return any result
|
||||||
Step 9: Try to display ip address of domain1 from domain2
|
Step 9: Try to display ip address of domain1 from domain2
|
||||||
Step 10: Ensure that it doesnt not return any result
|
Step 10: Ensure that it doesn't not return any result
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
# Step 1. Create isolated network
|
# Step 1. Create isolated network
|
||||||
@ -467,7 +467,7 @@ class TestPublicIp(cloudstackTestCase):
|
|||||||
# Step 10
|
# Step 10
|
||||||
self.fail("Domain should not access public ip of sibling domain")
|
self.fail("Domain should not access public ip of sibling domain")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.info("Got exception as expected since domain2 cant access network of domain1")
|
self.info("Got exception as expected since domain2 can't access network of domain1")
|
||||||
|
|
||||||
@attr(tags=["advanced", "basic", "sg"], required_hardware="false")
|
@attr(tags=["advanced", "basic", "sg"], required_hardware="false")
|
||||||
def test_03_list_publicip_user_domain(self):
|
def test_03_list_publicip_user_domain(self):
|
||||||
@ -604,7 +604,7 @@ class TestPublicIp(cloudstackTestCase):
|
|||||||
# Step 14
|
# Step 14
|
||||||
self.fail("Domain should not access public ip of sibling domain")
|
self.fail("Domain should not access public ip of sibling domain")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.info("Got exception as expected since domain2 cant access network of domain1")
|
self.info("Got exception as expected since domain2 can't access network of domain1")
|
||||||
|
|
||||||
@attr(tags=["advanced", "basic", "sg"], required_hardware="false")
|
@attr(tags=["advanced", "basic", "sg"], required_hardware="false")
|
||||||
def test_04_list_publicip_all_subdomains(self):
|
def test_04_list_publicip_all_subdomains(self):
|
||||||
@ -764,7 +764,7 @@ class TestPublicIp(cloudstackTestCase):
|
|||||||
# Step 6
|
# Step 6
|
||||||
self.fail("Domain should not access public ip of sibling domain")
|
self.fail("Domain should not access public ip of sibling domain")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.info("Got exception as expected since domain2 cant access network of domain1")
|
self.info("Got exception as expected since domain2 can't access network of domain1")
|
||||||
|
|
||||||
self.vpc_off.update(self.apiclient, state='Disabled')
|
self.vpc_off.update(self.apiclient, state='Disabled')
|
||||||
self.cleanup.append(vpc_1)
|
self.cleanup.append(vpc_1)
|
||||||
@ -826,7 +826,7 @@ class TestPublicIp(cloudstackTestCase):
|
|||||||
# Step 6
|
# Step 6
|
||||||
self.fail("Domain should not access public ip of sibling domain")
|
self.fail("Domain should not access public ip of sibling domain")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.info("Got exception as expected since domain2 cant access network of domain1")
|
self.info("Got exception as expected since domain2 can't access network of domain1")
|
||||||
|
|
||||||
def get_free_ipaddress(self, vlanId, domainId, account):
|
def get_free_ipaddress(self, vlanId, domainId, account):
|
||||||
ipaddresses = PublicIPAddress.list(
|
ipaddresses = PublicIPAddress.list(
|
||||||
|
|||||||
@ -201,7 +201,7 @@ class TestNetworkManagement(cloudstackTestCase):
|
|||||||
# 4. No exception should be thrown as multiple networks with same name can be created
|
# 4. No exception should be thrown as multiple networks with same name can be created
|
||||||
# 5. Now update the global setting allow.duplicate.networkname to false
|
# 5. Now update the global setting allow.duplicate.networkname to false
|
||||||
# 6. Try to create another shared network with same name in the same account
|
# 6. Try to create another shared network with same name in the same account
|
||||||
# 7. Exception should be thrown as network with same name cant be created in the same account
|
# 7. Exception should be thrown as network with same name can't be created in the same account
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
# Update the global setting to true
|
# Update the global setting to true
|
||||||
|
|||||||
@ -296,7 +296,7 @@ class TestUpdateSecurityGroup(cloudstackTestCase):
|
|||||||
#
|
#
|
||||||
# 1. Create a security group
|
# 1. Create a security group
|
||||||
# 2. Update the security group and change its name to "default"
|
# 2. Update the security group and change its name to "default"
|
||||||
# 3. Exception should be thrown as "default" name cant be used
|
# 3. Exception should be thrown as "default" name can't be used
|
||||||
|
|
||||||
security_group = SecurityGroup.create(
|
security_group = SecurityGroup.create(
|
||||||
self.apiclient,
|
self.apiclient,
|
||||||
|
|||||||
@ -995,7 +995,7 @@ class TestPathVolume(cloudstackTestCase):
|
|||||||
)
|
)
|
||||||
self.fail("Volume got attached to a destroyed vm ")
|
self.fail("Volume got attached to a destroyed vm ")
|
||||||
except Exception:
|
except Exception:
|
||||||
self.debug("Volume cant not be attached to a destroyed vm ")
|
self.debug("Volume can't not be attached to a destroyed vm ")
|
||||||
|
|
||||||
# 11.Upload the volume by providing the URL of the downloaded
|
# 11.Upload the volume by providing the URL of the downloaded
|
||||||
# volume, but specify a wrong format (not supported by the hypervisor)
|
# volume, but specify a wrong format (not supported by the hypervisor)
|
||||||
|
|||||||
@ -27,7 +27,7 @@ under the License.
|
|||||||
internal dns and CIDR are given
|
internal dns and CIDR are given
|
||||||
-->
|
-->
|
||||||
<!--
|
<!--
|
||||||
Test case 13: It doesnt contain user_data, size, network_group_list
|
Test case 13: It doesn't contain user_data, size, network_group_list
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- Test case #3 - createUser command -->
|
<!-- Test case #3 - createUser command -->
|
||||||
|
|||||||
@ -26,7 +26,7 @@ under the License.
|
|||||||
2. Destroy the Virtual Machine
|
2. Destroy the Virtual Machine
|
||||||
3. List the Destroyed Virtual Machine
|
3. List the Destroyed Virtual Machine
|
||||||
4. Check that the Destroyed VM cannot be started
|
4. Check that the Destroyed VM cannot be started
|
||||||
5. Check that a non-existing VM cannot be listed (Id doesnt exist)
|
5. Check that a non-existing VM cannot be listed (Id doesn't exist)
|
||||||
6. Create the Account and a User for the account (List VM for a Removed User exercise BEGIN)
|
6. Create the Account and a User for the account (List VM for a Removed User exercise BEGIN)
|
||||||
7. List the Created User
|
7. List the Created User
|
||||||
8. Creating default network
|
8. Creating default network
|
||||||
@ -164,7 +164,7 @@ under the License.
|
|||||||
<!-- Test case #73 - verify that listVm returns nothing when id of non-existing VM is specified -->
|
<!-- Test case #73 - verify that listVm returns nothing when id of non-existing VM is specified -->
|
||||||
<command>
|
<command>
|
||||||
<name>listVirtualMachines</name>
|
<name>listVirtualMachines</name>
|
||||||
<testcase>73 [Check that a non-existing VM cannot be listed (Id doesnt exist)]</testcase>
|
<testcase>73 [Check that a non-existing VM cannot be listed (Id doesn't exist)]</testcase>
|
||||||
<parameters>
|
<parameters>
|
||||||
<item>
|
<item>
|
||||||
<name>account</name>
|
<name>account</name>
|
||||||
|
|||||||
2
tools/ngui/static/js/lib/jquery-1.7.2.js
vendored
2
tools/ngui/static/js/lib/jquery-1.7.2.js
vendored
@ -8521,7 +8521,7 @@ jQuery.fn.extend({
|
|||||||
replace = hooks.expand( prop[ name ] );
|
replace = hooks.expand( prop[ name ] );
|
||||||
delete prop[ name ];
|
delete prop[ name ];
|
||||||
|
|
||||||
// not quite $.extend, this wont overwrite keys already present.
|
// not quite $.extend, this won't overwrite keys already present.
|
||||||
// also - reusing 'p' from above because we have the correct "name"
|
// also - reusing 'p' from above because we have the correct "name"
|
||||||
for ( p in replace ) {
|
for ( p in replace ) {
|
||||||
if ( ! ( p in prop ) ) {
|
if ( ! ( p in prop ) ) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user