Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ public void validateSpecificParameters(final Map<String, String> params){
}

/**
* 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
*/
public boolean isDisplay(){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public long getEntityOwnerId() {
}
Volume volume = _responseGenerator.findVolumeById(policy.getVolumeId());
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{
return volume.getAccountId();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public Long getTemplateId() {
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() {
return getVmId();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ private void setupPhysicalNetworks(Connection conn) {
pstmt3.close();

// 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) {
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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void performDataMigration(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>();
s_logger.debug("Dropping index i_alert__last_sent if it exists");
indexList.add("i_alert__last_sent");
Expand Down Expand Up @@ -115,7 +115,7 @@ private void upgradeEIPNetworkOfferings(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>();
s_logger.debug("Dropping index fk_host_details__host_id if it exists");
indexList.add("fk_host_details__host_id");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ private void fixBaremetalForeignKeys(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>();
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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ public EndPoint select(DataStore store, String 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);
return findEndpointForImageStorage(store);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ public AsyncCallFuture<VolumeApiResult> expungeVolumeAsync(VolumeInfo volume) {
VolumeDataStoreVO volumeStore = _volumeStoreDao.findByVolume(volume.getId());
if (volumeStore != null) {
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);
result.setSuccess(false);
result.setResult(msg);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ protected List<Long> reorderPods(Pair<List<Long>, Map<Long, Double>> podCapacity
//UserConcentratedPod strategy
List<Long> podIds = listPodsByUserConcentration(plan.getDataCenterId(), accountId);
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);
podIdsByCapacity.removeAll(podIds);
podIds.addAll(podIdsByCapacity);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public static void DownloadCifsFileToLocalFile(string filePathRelativeToShare, N
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
// 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.
else if (!filePathRelativeToShare.EndsWith(".vhd") || !filePathRelativeToShare.EndsWith(".vhdx"))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -955,7 +955,7 @@ public void ModifyVmVLan(string vmName, String vlanid, String mac)

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 (vlanid != null)
Expand Down Expand Up @@ -1024,7 +1024,7 @@ public void DisableNicVlan(String mac, String vmName)
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);
EthernetSwitchPortVlanSettingData vlanSettings = GetVlanSettings(ethernetConnections[index]);
Expand Down Expand Up @@ -1119,7 +1119,7 @@ public void ModifyVmVLan(string vmName, String vlanid, uint pos, bool enable, st

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 (vlanid != null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ public Answer ComputeChecksum(ComputeChecksumCommand cmd) {
txn.start();
MockVolumeVO volume = _mockVolumeDao.findByName(cmd.getTemplatePath());
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;
try {
Expand All @@ -1113,7 +1113,7 @@ public CreatePrivateTemplateAnswer CreatePrivateTemplateFromVolume(CreatePrivate
txn.start();
volume = _mockVolumeDao.findByStoragePathAndType(cmd.getVolumePath());
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());
Expand Down Expand Up @@ -1200,7 +1200,7 @@ public CopyVolumeAnswer CopyVolume(CopyVolumeCommand cmd) {
txn.start();
volume = _mockVolumeDao.findByStoragePathAndType(cmd.getVolumePath());
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();
} catch (Exception ex) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3163,7 +3163,7 @@ private long getStaticMax(final String os, final boolean b, final long dynamicMi
// stability
if (dynamicMaxRam > staticMax) { // XS contraint that dynamic 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 staticMax;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ private void startKubernetesClusterVMs() {
startKubernetesVM(vm);
} catch (ManagementServerException 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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3616,7 +3616,7 @@ private String generateAutoScaleVmGroupIdentifier(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.
* 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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ class LdapManagerImplSpec extends spock.lang.Specification {
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 ldapUserManagerFactory = Mock(LdapUserManagerFactory)
ldapUserManagerFactory.getInstance(_) >> ldapUserManager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class LinkDomainToLdapCmdSpec extends Specification {
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 type = "GROUP";
def name = "CN=test,DC=ccp,DC=Citrix,DC=com"
Expand Down Expand Up @@ -163,7 +163,7 @@ class LinkDomainToLdapCmdSpec extends Specification {
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 type = "GROUP";
def name = "CN=test,DC=ccp,DC=Citrix,DC=com"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public void setUp() throws NoSuchFieldException, IllegalAccessException {

@Test
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;
String type = "GROUP";
String ldapDomain = "CN=test,DC=ccp,DC=Citrix,DC=com";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void tearDown() {

@Test
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;
String type = "GROUP";
String ldapDomain = "CN=test,DC=ccp,DC=Citrix,DC=com";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ public void setUp() {
public void testStart() {
when(saml2AuthManager.getSAMLIdentityProviderMetadataURL()).thenReturn("file://does/not/exist");
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(" ");
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("");
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);

}
}
2 changes: 1 addition & 1 deletion scripts/storage/secondary/cloud-install-sys-tmplt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ failed() {
local returnval=$1
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
:
else
Expand Down
2 changes: 1 addition & 1 deletion scripts/storage/secondary/setup-sysvm-tmplt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ failed() {
local returnval=$1
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
:
else
Expand Down
2 changes: 1 addition & 1 deletion scripts/vm/network/ovs-pvlan-kvm-vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ vm_port=$(find_port $vm_mac)
pri_vlan_header=$((4096 + $pri_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.
# 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!!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4289,7 +4289,7 @@ public List<ResourceDetailResponse> listResourceDetails(ListResourceDetailsCmd c
String value = cmd.getValue();
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) {
throw new InvalidParameterValueException("Insufficient parameters passed for listing by resourceId OR key,value pair. Please check your params and try again.");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public VolumeResponse newVolumeResponse(ResponseView view, VolumeJoinVO volume)
volResponse.setAttached(volume.getAttached());
volResponse.setDestroyed(volume.getState() == Volume.State.Destroy);
boolean isExtractable = true;
if (volume.getVolumeType() != Volume.Type.DATADISK) { // Datadisk dont
if (volume.getVolumeType() != Volume.Type.DATADISK) { // Datadisk don't
// have any
// template
// dependence.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
/* alloc from free resource */
if (!((reservedCpu + usedCpu + cpu <= totalCpu) && (reservedMem + usedMem + ram <= totalMem))) {
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 ");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
"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",
"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);
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.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1647,7 +1647,7 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo
// this volume since allocation_state is disabled.
// - remove any suitable pools found for other volumes.
// All volumes should get suitable pools under this cluster;
// else we cant use this cluster.
// else we can't use this cluster.
suitableVolumeStoragePools.clear();
break;
}
Expand Down Expand Up @@ -1698,7 +1698,7 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo
// No suitable storage pools found under this cluster for this
// volume. - remove any suitable pools found for other volumes.
// All volumes should get suitable pools under this cluster;
// else we cant use this cluster.
// else we can't use this cluster.
suitableVolumeStoragePools.clear();
break;
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/deploy/FirstFitPlanner.java
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ private List<Long> scanPodsForDestination(VirtualMachineProfile vmProfile, Deplo
}

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
Map<Short, Float> disableThresholdMap = new HashMap<Short, Float>();

Expand Down
Loading