mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 01:32:18 +02:00
Fix spelling (#6898)
Co-authored-by: davidjumani <dj.davidjumani1994@gmail.com>
This commit is contained in:
parent
3106dba28c
commit
def7ce655d
@ -3,7 +3,7 @@ Contributing to Apache CloudStack (ACS)
|
||||
|
||||
Summary
|
||||
-------
|
||||
This document covers how to contribute to the ACS project. ACS uses github PRs to manage code contributions.
|
||||
This document covers how to contribute to the ACS project. ACS uses GitHub PRs to manage code contributions.
|
||||
These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one. Your proposed code changes will be published to your own fork of the ACS project and you will submit a Pull Request for your changes to be added.
|
||||
|
||||
_Lets get started!!!_
|
||||
|
||||
@ -59,7 +59,7 @@ You may get the source code from the repository hosted on Apache:
|
||||
|
||||
$ git clone https://gitbox.apache.org/repos/asf/cloudstack.git
|
||||
|
||||
Or, you may fork the repository from the official Apache CloudStack mirror on [Github](https://github.com/apache/cloudstack)
|
||||
Or, you may fork the repository from the official Apache CloudStack mirror on [GitHub](https://github.com/apache/cloudstack)
|
||||
|
||||
To checkout a specific branch, for example 4.11, do:
|
||||
|
||||
|
||||
@ -51,13 +51,13 @@ Apache CloudStack project uses Git. The official Git repository is at:
|
||||
|
||||
https://gitbox.apache.org/repos/asf/cloudstack.git
|
||||
|
||||
And a mirror is hosted on Github:
|
||||
And a mirror is hosted on GitHub:
|
||||
|
||||
https://github.com/apache/cloudstack
|
||||
|
||||
The Github mirror is strictly read only and provides convenience to users and
|
||||
The GitHub mirror is strictly read only and provides convenience to users and
|
||||
developers to explore the code and for the community to accept contributions
|
||||
via Github pull requests.
|
||||
via GitHub pull requests.
|
||||
|
||||
## Documentation
|
||||
|
||||
@ -95,7 +95,7 @@ Mailing lists:
|
||||
- [Issues Mailing List](mailto:issues-subscribe@cloudstack.apache.org)
|
||||
- [Marketing Mailing List](mailto:marketing-subscribe@cloudstack.apache.org)
|
||||
|
||||
Report and/or check bugs on [Github](https://github.com/apache/cloudstack/issues) and check our
|
||||
Report and/or check bugs on [GitHub](https://github.com/apache/cloudstack/issues) and check our
|
||||
developer [page](https://cloudstack.apache.org/developers.html) for contributing code.
|
||||
|
||||
## Reporting Security Vulnerabilities
|
||||
|
||||
@ -33,7 +33,6 @@ public class HostEnvironment {
|
||||
public String storageNetwork;
|
||||
public String storageGateway;
|
||||
public String storageVlan;
|
||||
public String secondaryStroageIpAddress;
|
||||
|
||||
public String storage2IpAddress;
|
||||
public String storage2Network;
|
||||
|
||||
@ -20,7 +20,7 @@ import org.apache.cloudstack.acl.ControlledEntity;
|
||||
import org.apache.cloudstack.api.Identity;
|
||||
import org.apache.cloudstack.api.InternalIdentity;
|
||||
|
||||
/** Each entry represents the alis ip of a perticular nic.
|
||||
/** Each entry represents the alias ip of a particular nic.
|
||||
*
|
||||
*/
|
||||
public interface NicIpAlias extends ControlledEntity, Identity, InternalIdentity {
|
||||
|
||||
@ -49,7 +49,7 @@ public class CreateDomainCmd extends BaseCmd {
|
||||
@Parameter(name = ApiConstants.PARENT_DOMAIN_ID,
|
||||
type = CommandType.UUID,
|
||||
entityType = DomainResponse.class,
|
||||
description = "assigns new domain a parent domain by domain ID of the parent. If no parent domain is specied, the ROOT domain is assumed.")
|
||||
description = "assigns new domain a parent domain by domain ID of the parent. If no parent domain is specified, the ROOT domain is assumed.")
|
||||
private Long parentDomainId;
|
||||
|
||||
@Parameter(name = ApiConstants.NETWORK_DOMAIN, type = CommandType.STRING, description = "Network domain for networks in the domain")
|
||||
|
||||
@ -89,7 +89,7 @@ public class CreateManagementNetworkIpRangeCmd extends BaseAsyncCmd {
|
||||
|
||||
@Parameter(name = ApiConstants.VLAN,
|
||||
type = CommandType.STRING,
|
||||
description = "Optional. The vlan id the ip range sits on, default to Null when it is not specified which means you network is not on any Vlan")
|
||||
description = "Optional. The vlan id the ip range sits on, default to Null when it is not specified which means your network is not on any Vlan")
|
||||
private String vlan;
|
||||
|
||||
/////////////////////////////////////////////////////
|
||||
|
||||
@ -64,7 +64,7 @@ public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
|
||||
|
||||
@Parameter(name = ApiConstants.VLAN,
|
||||
type = CommandType.INTEGER,
|
||||
description = "Optional. The vlan the ip range sits on, default to Null when it is not specified which means you network is not on any Vlan. This is mainly for Vmware as other hypervisors can directly reterive bridge from pyhsical network traffic type table")
|
||||
description = "Optional. The vlan the ip range sits on, default to Null when it is not specified which means your network is not on any Vlan. This is mainly for Vmware as other hypervisors can directly retrieve bridge from physical network traffic type table")
|
||||
private Integer vlan;
|
||||
|
||||
@Parameter(name = ApiConstants.NETMASK, type = CommandType.STRING, required = true, description = "the netmask for storage network")
|
||||
|
||||
@ -190,7 +190,7 @@ public class CreateServiceOfferingCmd extends BaseCmd {
|
||||
since = "4.14")
|
||||
private String cacheMode;
|
||||
|
||||
// Introduce 4 new optional paramaters to work custom compute offerings
|
||||
// Introduce 4 new optional parameters to work custom compute offerings
|
||||
@Parameter(name = ApiConstants.CUSTOMIZED,
|
||||
type = CommandType.BOOLEAN,
|
||||
since = "4.13",
|
||||
|
||||
@ -34,7 +34,7 @@ import com.cloud.event.EventTypes;
|
||||
import com.cloud.user.Account;
|
||||
import com.cloud.vm.VirtualMachine;
|
||||
|
||||
@APICommand(name = "destroySystemVm", responseObject = SystemVmResponse.class, description = "Destroyes a system virtual machine.", entityType = {VirtualMachine.class},
|
||||
@APICommand(name = "destroySystemVm", responseObject = SystemVmResponse.class, description = "Destroys a system virtual machine.", entityType = {VirtualMachine.class},
|
||||
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
|
||||
public class DestroySystemVmCmd extends BaseAsyncCmd {
|
||||
public static final Logger s_logger = Logger.getLogger(DestroySystemVmCmd.class.getName());
|
||||
|
||||
@ -53,13 +53,13 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
|
||||
|
||||
@Parameter(name = ApiConstants.ACCOUNT,
|
||||
type = CommandType.STRING,
|
||||
description = "account who will own the VLAN. If VLAN is Zone wide, this parameter should be ommited")
|
||||
description = "account who will own the VLAN. If VLAN is Zone wide, this parameter should be omitted")
|
||||
private String accountName;
|
||||
|
||||
@Parameter(name = ApiConstants.PROJECT_ID,
|
||||
type = CommandType.UUID,
|
||||
entityType = ProjectResponse.class,
|
||||
description = "project who will own the VLAN. If VLAN is Zone wide, this parameter should be ommited")
|
||||
description = "project who will own the VLAN. If VLAN is Zone wide, this parameter should be omitted")
|
||||
private Long projectId;
|
||||
|
||||
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning a VLAN")
|
||||
|
||||
@ -95,7 +95,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
|
||||
private Integer publicPort;
|
||||
|
||||
@Parameter(name = ApiConstants.OPEN_FIREWALL, type = CommandType.BOOLEAN, description = "if true, firewall rule for"
|
||||
+ " source/end public port is automatically created; if false - firewall rule has to be created explicitely. If not specified 1) defaulted to false when LB"
|
||||
+ " source/end public port is automatically created; if false - firewall rule has to be created explicitly. If not specified 1) defaulted to false when LB"
|
||||
+ " rule is being created for VPC guest network 2) in all other cases defaulted to true")
|
||||
private Boolean openFirewall;
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ import com.cloud.user.Account;
|
||||
|
||||
@APICommand(name = "updateTemplatePermissions", responseObject = SuccessResponse.class, description = "Updates a template visibility permissions. "
|
||||
+ "A public template is visible to all accounts within the same domain. " + "A private template is visible only to the owner of the template. "
|
||||
+ "A priviledged template is a private template with account permissions added. " + "Only accounts specified under the template permissions are visible to them.", entityType = {VirtualMachineTemplate.class},
|
||||
+ "A privileged template is a private template with account permissions added. " + "Only accounts specified under the template permissions are visible to them.", entityType = {VirtualMachineTemplate.class},
|
||||
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
|
||||
public class UpdateTemplatePermissionsCmd extends BaseUpdateTemplateOrIsoPermissionsCmd {
|
||||
@Override
|
||||
|
||||
@ -74,7 +74,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd {
|
||||
|
||||
@Parameter(name = ApiConstants.OPEN_FIREWALL,
|
||||
type = CommandType.BOOLEAN,
|
||||
description = "if true, firewall rule for source/end public port is automatically created; if false - firewall rule has to be created explicitely. Has value true by default")
|
||||
description = "if true, firewall rule for source/end public port is automatically created; if false - firewall rule has to be created explicitly. Has value true by default")
|
||||
private Boolean openFirewall;
|
||||
|
||||
@Parameter(name = ApiConstants.FOR_DISPLAY, type = CommandType.BOOLEAN, description = "an optional field, whether to the display the vpn to the end user or not", since = "4.4", authorized = {RoleType.Admin})
|
||||
|
||||
@ -40,11 +40,11 @@ public class AnnotationResponse extends BaseResponse {
|
||||
private String entityType;
|
||||
|
||||
@SerializedName(ApiConstants.ENTITY_ID)
|
||||
@Param(description = "the (uu)id of the entitiy to which this annotation pertains")
|
||||
@Param(description = "the (uu)id of the entity to which this annotation pertains")
|
||||
private String entityUuid;
|
||||
|
||||
@SerializedName(ApiConstants.ENTITY_NAME)
|
||||
@Param(description = "the name of the entitiy to which this annotation pertains")
|
||||
@Param(description = "the name of the entity to which this annotation pertains")
|
||||
private String entityName;
|
||||
|
||||
@SerializedName(ApiConstants.ANNOTATION)
|
||||
|
||||
@ -55,8 +55,8 @@ public class LBStickinessPolicyResponse extends BaseResponse {
|
||||
@Param(description = "is policy for display to the regular user", since = "4.4", authorized = {RoleType.Admin})
|
||||
private Boolean forDisplay;
|
||||
|
||||
// FIXME : if prams with the same name exists more then once then value are concatinated with ":" as delimiter .
|
||||
// Reason: Map does not support duplicate keys, need to look for the alernate data structure
|
||||
// FIXME : if params with the same name exist more than once then values are concatenated with ":" as delimiter .
|
||||
// Reason: Map does not support duplicate keys, need to look for the alternate data structure
|
||||
// Example: <params>{indirect=null, name=testcookie, nocache=null, domain=www.yahoo.com:www.google.com, postonly=null}</params>
|
||||
// in the above there are two domains with values www.yahoo.com and www.google.com
|
||||
@SerializedName("params")
|
||||
|
||||
@ -94,7 +94,7 @@ public class PrivateGatewayResponse extends BaseResponseWithAssociatedNetwork im
|
||||
private String state;
|
||||
|
||||
@SerializedName(ApiConstants.SOURCE_NAT_SUPPORTED)
|
||||
@Param(description = "Souce Nat enable status")
|
||||
@Param(description = "Source Nat enable status")
|
||||
private Boolean sourceNat;
|
||||
|
||||
@SerializedName(ApiConstants.ACL_ID)
|
||||
|
||||
@ -78,7 +78,7 @@ public class VMSnapshotResponse extends BaseResponseWithTagInformation implement
|
||||
private String parentName;
|
||||
|
||||
@SerializedName("current")
|
||||
@Param(description = "indiates if this is current snapshot")
|
||||
@Param(description = "indicates if this is current snapshot")
|
||||
private Boolean current;
|
||||
|
||||
@SerializedName("type")
|
||||
|
||||
@ -80,7 +80,7 @@ public interface RegionService {
|
||||
|
||||
/**
|
||||
* Updates an account
|
||||
* isPopagate falg is set to true if sent from peer Region
|
||||
* isPopagate flag is set to true if sent from peer Region
|
||||
*
|
||||
* @param cmd
|
||||
* - the parameter containing accountId or account nameand domainId
|
||||
|
||||
@ -1441,7 +1441,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
|
||||
} else if (action == TapAgentsAction.Contains) {
|
||||
return _loadingAgents.contains(hostId);
|
||||
} else {
|
||||
throw new CloudRuntimeException("Unkonwn TapAgentsAction " + action);
|
||||
throw new CloudRuntimeException("Unknown TapAgentsAction " + action);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
||||
@ -118,7 +118,7 @@ CREATE TABLE IF NOT EXISTS `cloud`.`ha_config` (
|
||||
|
||||
DELETE from `cloud`.`configuration` where name='outofbandmanagement.sync.interval';
|
||||
|
||||
-- Annotations specifc changes following
|
||||
-- Annotations specific changes following
|
||||
CREATE TABLE IF NOT EXISTS `cloud`.`annotations` (
|
||||
`id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`uuid` varchar(40) UNIQUE,
|
||||
|
||||
@ -414,7 +414,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
|
||||
} else if (cmd.getBootDev() == BootDev.pxe) {
|
||||
bootCmd = _setPxeBootCommand;
|
||||
} else {
|
||||
throw new CloudRuntimeException("Unkonwn boot dev " + cmd.getBootDev());
|
||||
throw new CloudRuntimeException("Unknown boot dev " + cmd.getBootDev());
|
||||
}
|
||||
|
||||
String bootDev = cmd.getBootDev().name();
|
||||
|
||||
@ -70,7 +70,7 @@ public class BaremetalPingPxeResource extends BaremetalPxeResourceBase {
|
||||
}
|
||||
|
||||
if (_storageServer == null) {
|
||||
throw new ConfigurationException("No stroage server specified");
|
||||
throw new ConfigurationException("No storage server specified");
|
||||
}
|
||||
|
||||
if (_tftpDir == null) {
|
||||
|
||||
@ -131,7 +131,7 @@ public class LibvirtUtilitiesHelper {
|
||||
String exceptionMessage = ex.getMessage();
|
||||
s_logger.error(String.format("Unable to validate if the Libvirt's version is equal or higher than [%s] due to [%s]. Returning 'false' as default'.", version,
|
||||
exceptionMessage), ex);
|
||||
return new Pair<>(String.format("Unknow due to [%s]", exceptionMessage), false);
|
||||
return new Pair<>(String.format("Unknown due to [%s]", exceptionMessage), false);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1609,7 +1609,7 @@ public class KVMStorageProcessor implements StorageProcessor {
|
||||
s_logger.info(String.format("It was not possible to take live disk snapshot for volume [%s], in VM [%s], due to [%s]. We will take full snapshot of the VM"
|
||||
+ " and extract the disk instead. Consider upgrading your QEMU binary.", volume, vmName, e.getMessage()));
|
||||
|
||||
takeFullVmSnaphotForBinariesThatDoesNotSupportLiveDiskSnapshot(vm, snapshotName, vmName);
|
||||
takeFullVmSnapshotForBinariesThatDoesNotSupportLiveDiskSnapshot(vm, snapshotName, vmName);
|
||||
primaryPool.createFolder(TemplateConstants.DEFAULT_SNAPSHOT_ROOT_DIR);
|
||||
extractDiskFromFullVmSnapshot(disk, volume, snapshotPath, snapshotName, vmName, vm);
|
||||
}
|
||||
@ -1711,7 +1711,7 @@ public class KVMStorageProcessor implements StorageProcessor {
|
||||
}
|
||||
}
|
||||
|
||||
protected void takeFullVmSnaphotForBinariesThatDoesNotSupportLiveDiskSnapshot(Domain vm, String snapshotName, String vmName) throws LibvirtException {
|
||||
protected void takeFullVmSnapshotForBinariesThatDoesNotSupportLiveDiskSnapshot(Domain vm, String snapshotName, String vmName) throws LibvirtException {
|
||||
String vmUuid = vm.getUUIDString();
|
||||
|
||||
long start = System.currentTimeMillis();
|
||||
|
||||
@ -42,7 +42,7 @@ public class LibvirtUtilitiesHelperTest extends TestCase {
|
||||
Mockito.doThrow(LibvirtException.class).when(connectMock).getLibVirVersion();
|
||||
Pair<String, Boolean> result = LibvirtUtilitiesHelper.isLibvirtVersionEqualOrHigherThanVersionInParameter(connectMock, 0l);
|
||||
|
||||
Assert.assertEquals("Unknow due to [null]", result.first());
|
||||
Assert.assertEquals("Unknown due to [null]", result.first());
|
||||
Assert.assertFalse(result.second());
|
||||
}
|
||||
|
||||
|
||||
@ -557,7 +557,7 @@ public class OvmResourceBase implements ServerResource, HypervisorResource {
|
||||
data.isIso = false;
|
||||
vm.disks.add(data);
|
||||
} else {
|
||||
throw new CloudRuntimeException("Unknow volume type: " + volume.getType());
|
||||
throw new CloudRuntimeException("Unknown volume type: " + volume.getType());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -363,7 +363,7 @@ class OvmVm(OvmObject):
|
||||
|
||||
|
||||
if not isdir(vmPath):
|
||||
# The case is, when vm starting was not completed at primaryStroageDownload or createVolume(e.g. mgmt server stop), the mgmt
|
||||
# The case is, when vm starting was not completed at primaryStorageDownload or createVolume(e.g. mgmt server stop), the mgmt
|
||||
# server will keep vm state in staring, then a stop command will be sent. The stop command will delete bridges that vm attaches,
|
||||
# by retriving birdge info by OvmVm.getDetails(). In this case, the vm doesn't exists, so returns a fake object here.
|
||||
fakeDisk = OvmDisk()
|
||||
|
||||
@ -1454,7 +1454,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
|
||||
|
||||
private String deleteVolumeDirOnSecondaryStorage(long volumeId, String secStorageUrl, String nfsVersion) throws Exception {
|
||||
String secondaryMountPoint = _mountService.getMountPoint(secStorageUrl, nfsVersion);
|
||||
String volumeMountRoot = secondaryMountPoint + "/" + getVolumeRelativeDirInSecStroage(volumeId);
|
||||
String volumeMountRoot = secondaryMountPoint + "/" + getVolumeRelativeDirInSecStorage(volumeId);
|
||||
|
||||
return deleteDir(volumeMountRoot);
|
||||
}
|
||||
@ -1468,7 +1468,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
|
||||
}
|
||||
}
|
||||
|
||||
private static String getVolumeRelativeDirInSecStroage(long volumeId) {
|
||||
private static String getVolumeRelativeDirInSecStorage(long volumeId) {
|
||||
return "volumes/" + volumeId;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3983,7 +3983,7 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
|
||||
return networkInfo;
|
||||
}
|
||||
|
||||
// return Ternary <switch name, switch tyep, vlan tagging>
|
||||
// return Ternary <switch name, switch type, vlan tagging>
|
||||
private Ternary<String, String, String> getTargetSwitch(NicTO nicTo) throws CloudException {
|
||||
TrafficType[] supportedTrafficTypes = new TrafficType[]{TrafficType.Guest, TrafficType.Public, TrafficType.Control, TrafficType.Management, TrafficType.Storage};
|
||||
|
||||
|
||||
@ -4085,7 +4085,7 @@ public abstract class CitrixResourceBase extends ServerResourceBase implements S
|
||||
return states;
|
||||
}
|
||||
|
||||
public HashMap<String, String> parseDefaultOvsRuleComamnd(final String str) {
|
||||
public HashMap<String, String> parseDefaultOvsRuleCommand(final String str) {
|
||||
final HashMap<String, String> cmd = new HashMap<String, String>();
|
||||
final String[] sarr = str.split("/");
|
||||
for (int i = 0; i < sarr.length; i++) {
|
||||
|
||||
@ -114,7 +114,7 @@ public final class CitrixStartCommandWrapper extends CommandWrapper<StartCommand
|
||||
// TODO(Salvatore-orlando): This code should go
|
||||
for (final NicTO nic : vmSpec.getNics()) {
|
||||
if (nic.getBroadcastType() == Networks.BroadcastDomainType.Vswitch) {
|
||||
final HashMap<String, String> args = citrixResourceBase.parseDefaultOvsRuleComamnd(BroadcastDomainType.getValue(nic.getBroadcastUri()));
|
||||
final HashMap<String, String> args = citrixResourceBase.parseDefaultOvsRuleCommand(BroadcastDomainType.getValue(nic.getBroadcastUri()));
|
||||
final OvsSetTagAndFlowCommand flowCmd = new OvsSetTagAndFlowCommand(args.get("vmName"), args.get("tag"), args.get("vlans"), args.get("seqno"),
|
||||
Long.parseLong(args.get("vmId")));
|
||||
|
||||
|
||||
@ -113,7 +113,7 @@ public class StorPoolSnapshotStrategy implements SnapshotStrategy {
|
||||
_snapshotDetailsDao.removeDetails(snapshotId);
|
||||
}
|
||||
res = deleteSnapshotFromDb(snapshotId);
|
||||
StorPoolUtil.spLog("StorpoolSnapshotStrategy.deleteSnapshot: executed successfuly=%s, snapshot uuid=%s, name=%s", res, snapshotVO.getUuid(), name);
|
||||
StorPoolUtil.spLog("StorpoolSnapshotStrategy.deleteSnapshot: executed successfully=%s, snapshot uuid=%s, name=%s", res, snapshotVO.getUuid(), name);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
String errMsg = String.format("Cannot delete snapshot due to %s", e.getMessage());
|
||||
|
||||
@ -19,7 +19,7 @@ package groovy.org.apache.cloudstack.ldap
|
||||
import org.apache.cloudstack.api.response.LdapConfigurationResponse
|
||||
|
||||
class LdapConfigurationResponseSpec extends spock.lang.Specification {
|
||||
def "Testing succcessful setting of LdapConfigurationResponse hostname"() {
|
||||
def "Testing successful setting of LdapConfigurationResponse hostname"() {
|
||||
given: "We have a LdapConfigurationResponse"
|
||||
LdapConfigurationResponse response = new LdapConfigurationResponse();
|
||||
when: "The hostname is set"
|
||||
|
||||
@ -108,7 +108,7 @@ class LdapContextFactorySpec extends spock.lang.Specification {
|
||||
result['java.naming.security.credentials'] == password
|
||||
}
|
||||
|
||||
def "Test successully binding as system"() {
|
||||
def "Test successfully binding as system"() {
|
||||
given: "We have a LdapContextFactory"
|
||||
def ldapContextFactory = new LdapContextFactory(ldapConfiguration)
|
||||
when: "A bind context attempts to bind and no Ldap server is available"
|
||||
|
||||
2
pom.xml
2
pom.xml
@ -41,7 +41,7 @@
|
||||
</scm>
|
||||
|
||||
<issueManagement>
|
||||
<system>Github</system>
|
||||
<system>GitHub</system>
|
||||
<url>https://github.com/apache/cloudstack/issues</url>
|
||||
</issueManagement>
|
||||
|
||||
|
||||
@ -463,7 +463,7 @@ public class UserVmJoinDaoImpl extends GenericDaoBaseWithTagInformation<UserVmJo
|
||||
nicResponse.setId(uvo.getNicUuid());
|
||||
/*2: networkUuid*/
|
||||
nicResponse.setNetworkid(uvo.getNetworkUuid());
|
||||
/*3: vmId makes no sense on a nested nic object so it is ommited here */
|
||||
/*3: vmId makes no sense on a nested nic object so it is omitted here */
|
||||
|
||||
if (uvo.getTrafficType() != null) {
|
||||
/*4: trafficType*/
|
||||
|
||||
@ -3755,7 +3755,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
|
||||
HashSet<String> tempVnets = new HashSet<String>();
|
||||
HashSet<String> vnetsInDb = new HashSet<String>();
|
||||
List<Pair<Integer, Integer>> vnetranges = null;
|
||||
String comaSeperatedStingOfVnetRanges = null;
|
||||
String commaSeparatedStringOfVnetRanges = null;
|
||||
int i = 0;
|
||||
if (listOfRanges.length != 0) {
|
||||
_physicalNetworkDao.acquireInLockTable(network.getId(), 10);
|
||||
@ -3786,11 +3786,11 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
|
||||
vnetsInDb.addAll(tempVnets);
|
||||
}
|
||||
|
||||
//sorting the vnets in Db to generate a coma separated list of the vnet string.
|
||||
//sorting the vnets in Db to generate a comma separated list of the vnet string.
|
||||
if (vnetsInDb.size() != 0) {
|
||||
comaSeperatedStingOfVnetRanges = generateVnetString(new ArrayList<String>(vnetsInDb));
|
||||
commaSeparatedStringOfVnetRanges = generateVnetString(new ArrayList<String>(vnetsInDb));
|
||||
}
|
||||
network.setVnet(comaSeperatedStingOfVnetRanges);
|
||||
network.setVnet(commaSeparatedStringOfVnetRanges);
|
||||
|
||||
final List<String> addVnetsFinal = addVnets;
|
||||
final List<String> removeVnetsFinal = removeVnets;
|
||||
@ -3859,7 +3859,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
|
||||
return vlanTokens;
|
||||
}
|
||||
if (VnetRange.length < 2) {
|
||||
throw new InvalidParameterValueException("Please provide valid vnet range. vnet range should be a coma separated list of vlan ranges. example 500-500,600-601" + rangeMessage);
|
||||
throw new InvalidParameterValueException("Please provide valid vnet range. vnet range should be a comma separated list of vlan ranges. example 500-500,600-601" + rangeMessage);
|
||||
}
|
||||
|
||||
if (VnetRange[0] == null || VnetRange[1] == null) {
|
||||
@ -3871,7 +3871,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
|
||||
EndVnet = Integer.parseInt(VnetRange[1]);
|
||||
} catch (NumberFormatException e) {
|
||||
s_logger.warn("Unable to parse vnet range:", e);
|
||||
throw new InvalidParameterValueException("Please provide valid vnet range. The vnet range should be a coma separated list example 2001-2012,3000-3005." + rangeMessage);
|
||||
throw new InvalidParameterValueException("Please provide valid vnet range. The vnet range should be a comma separated list example 2001-2012,3000-3005." + rangeMessage);
|
||||
}
|
||||
if (StartVnet < minVnet || EndVnet > maxVnet) {
|
||||
throw new InvalidParameterValueException("Vnet range has to be" + rangeMessage);
|
||||
|
||||
@ -556,7 +556,7 @@ public class ConsoleProxyServlet extends HttpServlet {
|
||||
}
|
||||
return equalSig;
|
||||
} catch (Exception ex) {
|
||||
s_logger.error("unable to verifty request signature", ex);
|
||||
s_logger.error("unable to verify request signature", ex);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -330,7 +330,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
|
||||
SnapshotStrategy snapshotStrategy = _storageStrategyFactory.getSnapshotStrategy(snapshot, SnapshotOperation.REVERT);
|
||||
|
||||
if (snapshotStrategy == null) {
|
||||
s_logger.error("Unable to find snaphot strategy to handle snapshot with id '" + snapshotId + "'");
|
||||
s_logger.error("Unable to find snapshot strategy to handle snapshot with id '" + snapshotId + "'");
|
||||
String errorMsg = String.format("Revert snapshot command failed for snapshot with id %d, because this command is supported only for KVM hypervisor", snapshotId);
|
||||
throw new CloudRuntimeException(errorMsg);
|
||||
}
|
||||
@ -497,7 +497,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
|
||||
try {
|
||||
SnapshotStrategy snapshotStrategy = _storageStrategyFactory.getSnapshotStrategy(snapshot, SnapshotOperation.BACKUP);
|
||||
if (snapshotStrategy == null) {
|
||||
throw new CloudRuntimeException("Unable to find snaphot strategy to handle snapshot with id '" + snapshotId + "'");
|
||||
throw new CloudRuntimeException("Unable to find snapshot strategy to handle snapshot with id '" + snapshotId + "'");
|
||||
}
|
||||
snapshotInfo = snapshotStrategy.backupSnapshot(snapshotInfo);
|
||||
|
||||
@ -598,7 +598,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
|
||||
SnapshotStrategy snapshotStrategy = _storageStrategyFactory.getSnapshotStrategy(snapshotCheck, SnapshotOperation.DELETE);
|
||||
|
||||
if (snapshotStrategy == null) {
|
||||
s_logger.error("Unable to find snaphot strategy to handle snapshot with id '" + snapshotId + "'");
|
||||
s_logger.error("Unable to find snapshot strategy to handle snapshot with id '" + snapshotId + "'");
|
||||
|
||||
return false;
|
||||
}
|
||||
@ -815,7 +815,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
|
||||
for (SnapshotVO snapshot : snapshots) {
|
||||
SnapshotStrategy snapshotStrategy = _storageStrategyFactory.getSnapshotStrategy(snapshot, SnapshotOperation.DELETE);
|
||||
if (snapshotStrategy == null) {
|
||||
s_logger.error("Unable to find snaphot strategy to handle snapshot with id '" + snapshot.getId() + "'");
|
||||
s_logger.error("Unable to find snapshot strategy to handle snapshot with id '" + snapshot.getId() + "'");
|
||||
continue;
|
||||
}
|
||||
SnapshotDataStoreVO snapshotStoreRef = _snapshotStoreDao.findBySnapshot(snapshot.getId(), DataStoreRole.Image);
|
||||
|
||||
@ -84,7 +84,7 @@ public interface RegionManager {
|
||||
|
||||
/**
|
||||
* Updates an account
|
||||
* isPopagate falg is set to true if sent from peer Region
|
||||
* isPopagate flag is set to true if sent from peer Region
|
||||
*
|
||||
* @param cmd
|
||||
* - the parameter containing accountId or account nameand domainId
|
||||
|
||||
@ -225,10 +225,10 @@ public class NegoFlags {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String.format("NegoFlags [value=0x%04x (%s)]", value, flagsToSting());
|
||||
return String.format("NegoFlags [value=0x%04x (%s)]", value, flagsToString());
|
||||
}
|
||||
|
||||
public String flagsToSting() {
|
||||
public String flagsToString() {
|
||||
|
||||
String str = "";
|
||||
|
||||
|
||||
@ -452,7 +452,7 @@ public class ServerIOChannelRouter extends BaseElement {
|
||||
break;
|
||||
|
||||
default:
|
||||
throw new RuntimeException("Unknow data PDU type: " + type2 + ", data: " + buf + ".");
|
||||
throw new RuntimeException("Unknown data PDU type: " + type2 + ", data: " + buf + ".");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -728,7 +728,7 @@ public class ByteBuffer {
|
||||
case 8:
|
||||
value = readSignedLong();
|
||||
if (value < 0)
|
||||
throw new RuntimeException("Cannot read 64 bit integers which are larger than 0x7FffFFffFFffFFff, because of lack of unsinged long type in Java. Value: " + value
|
||||
throw new RuntimeException("Cannot read 64 bit integers which are larger than 0x7FffFFffFFffFFff, because of lack of unsigned long type in Java. Value: " + value
|
||||
+ ". Data: " + this + ".");
|
||||
break;
|
||||
default:
|
||||
|
||||
@ -20,7 +20,7 @@ under the License.
|
||||
// Version: 1.9.1.152
|
||||
|
||||
//
|
||||
// Javascript logger utility
|
||||
// JavaScript logger utility
|
||||
// Author
|
||||
// Kelven Yang
|
||||
// 2/25/2010
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
* 60: Connection popups
|
||||
* 100: Status bar
|
||||
* ...
|
||||
* 1000: Javascript crash
|
||||
* 1000: JavaScript crash
|
||||
* ...
|
||||
* 10000: Max (used for polyfills)
|
||||
*/
|
||||
@ -341,7 +341,7 @@ select:active {
|
||||
|
||||
transition: 0.5s ease-in-out;
|
||||
|
||||
/* Edge misrenders animations wihthout this */
|
||||
/* Edge misrenders animations without this */
|
||||
transform: translateX(0);
|
||||
}
|
||||
:root.noVNC_connected #noVNC_control_bar_anchor.noVNC_idle {
|
||||
|
||||
@ -1284,7 +1284,7 @@ class TestPathDisableStorage_Cross_Cluster(cloudstackTestCase):
|
||||
"""
|
||||
# Tests in this path requires to be run independently (not to be run in parallel with any other tests \
|
||||
since it involves disabling/enabling storage pools and may cause unexpected failures in other tests
|
||||
# This test at least 2 Clusters in the set up wiht suitable hosts for migration.
|
||||
# This test at least 2 Clusters in the set up with suitable hosts for migration.
|
||||
# For running the tests on local storage, ensure there are 2 local storage pools set up on each host
|
||||
|
||||
"""
|
||||
|
||||
@ -797,7 +797,7 @@ class TestStorageLiveMigrationVmware(cloudstackTestCase):
|
||||
def GetDestinationHostLocal(self, hostsToavoid, vm, scope):
|
||||
"""
|
||||
This method gives us the destination host to which VM will be migrated
|
||||
It takes the souce host i.e. hostsToavoid as input
|
||||
It takes the source host i.e. hostsToavoid as input
|
||||
"""
|
||||
destinationHost = None
|
||||
destinationCluster = None
|
||||
|
||||
@ -1502,7 +1502,7 @@ class TestSnapshotList(cloudstackTestCase):
|
||||
def test_listSnapshot_as_rootadmin_domainid_listall_false_rec_true(self):
|
||||
"""
|
||||
Test listing of Snapshots by passing domainid, listall="false" and isrecusrive="true" parameter as admin
|
||||
Validate that it returns all the Snapshots in the subdoamin and domain passed
|
||||
Validate that it returns all the Snapshots in the subdomain and domain passed
|
||||
"""
|
||||
|
||||
self.apiclient.connection.apiKey = self.user_a_apikey
|
||||
|
||||
@ -1475,7 +1475,7 @@ class TestVMList(cloudstackTestCase):
|
||||
def test_listVM_as_rootadmin_domainid_listall_false_rec_true(self):
|
||||
"""
|
||||
# Test listing of Vms by passing domainid, listall="false" and isrecusrive="true" parameter as admin
|
||||
# Validate that it returns all the Vms in the subdoamin and domain passed
|
||||
# Validate that it returns all the Vms in the subdomain and domain passed
|
||||
"""
|
||||
|
||||
self.apiclient.connection.apiKey = self.user_a_apikey
|
||||
|
||||
@ -1484,7 +1484,7 @@ class TestVolumeList(cloudstackTestCase):
|
||||
def test_listVolume_as_rootadmin_domainid_listall_false_rec_true(self):
|
||||
"""
|
||||
# Test listing of Volumes by passing domainid, listall="false" and isrecusrive="true" parameter as admin
|
||||
# Validate that it returns all the Volumes in the subdoamin and domain passed
|
||||
# Validate that it returns all the Volumes in the subdomain and domain passed
|
||||
"""
|
||||
|
||||
self.apiclient.connection.apiKey = self.user_a_apikey
|
||||
|
||||
@ -74,7 +74,7 @@ class TestDeployVmWithUserData(cloudstackTestCase):
|
||||
cls.zone = get_zone(cls.apiClient, cls.testClient.getZoneForTests())
|
||||
cls._cleanup = []
|
||||
if cls.zone.localstorageenabled:
|
||||
#For devcloud since localstroage is enabled
|
||||
#For devcloud since localstorage is enabled
|
||||
cls.services["service_offering"]["storagetype"] = "local"
|
||||
cls.service_offering = ServiceOffering.create(
|
||||
cls.apiClient,
|
||||
|
||||
@ -491,7 +491,7 @@ class TestCreateSnapshot(cloudstackTestCase):
|
||||
self.testClient.submitCmdsAndWait(jobs)
|
||||
return
|
||||
|
||||
def create_Snaphot_Stop_VM(self):
|
||||
def create_Snapshot_Stop_VM(self):
|
||||
"""Creates a snapshot on ROOT disk while vm is in stopping state
|
||||
|
||||
1. Create a virtual machine
|
||||
@ -598,7 +598,7 @@ class TestCreateSnapshot(cloudstackTestCase):
|
||||
# b. listSnapshots should list this newly created snapshot.
|
||||
|
||||
self.debug("Create virtual machine and snapshot on ROOT disk volume")
|
||||
self.create_Snaphot_Stop_VM()
|
||||
self.create_Snapshot_Stop_VM()
|
||||
|
||||
self.debug("Verify whether snapshots were created properly or not?")
|
||||
self.verify_Snapshots()
|
||||
|
||||
@ -231,7 +231,7 @@ class TestLDAP(cloudstackTestCase):
|
||||
some ldap accounts are linked and present with the same uid
|
||||
some ldap accounts are not yet linked but present at other locations in cloudstack
|
||||
|
||||
NOTE 1: if this test is run last only the explicitely imported test user from test_03_sync
|
||||
NOTE 1: if this test is run last only the explicitly imported test user from test_03_sync
|
||||
is in the system. The accounts from test_01_manual and test_02_import should have been cleared
|
||||
by the test tearDown(). We can not depend on test_03_sync having run so the test must avoid
|
||||
depending on it either being available or not.
|
||||
|
||||
@ -39,7 +39,7 @@ class TestDeployVmWithUserData(cloudstackTestCase):
|
||||
cls.zone = get_zone(cls.apiClient, testClient.getZoneForTests())
|
||||
cls.hypervisor = testClient.getHypervisorInfo()
|
||||
if cls.zone.localstorageenabled:
|
||||
#For devcloud since localstroage is enabled
|
||||
#For devcloud since localstorage is enabled
|
||||
cls.services["service_offerings"]["tiny"]["storagetype"] = "local"
|
||||
cls.service_offering = ServiceOffering.create(
|
||||
cls.apiClient,
|
||||
|
||||
@ -141,7 +141,7 @@ class TestSameVMName(cloudstackTestCase):
|
||||
def test_vms_with_same_name(self):
|
||||
""" Test vm deployment with same name
|
||||
|
||||
# 1. Deploy a VM on with perticular name from account_1
|
||||
# 1. Deploy a VM on with particular name from account_1
|
||||
# 2. Try to deploy another vm with same name from account_2
|
||||
# 3. Verify that second VM deployment fails
|
||||
|
||||
|
||||
@ -460,10 +460,10 @@ class TestSnapshotsHardning(cloudstackTestCase):
|
||||
is still in progress start the VM and check
|
||||
the integrity of the snapshot
|
||||
6. Initiate ROOT volume snapshot and while snapshot is
|
||||
in pregress Stop the VM Verify that the VM stops
|
||||
in progress Stop the VM Verify that the VM stops
|
||||
successfully and check integrity of snapshot
|
||||
7. Initiate ROOT volume snapshot and while snapshot is
|
||||
in pregress Reboot the VM
|
||||
in progress Reboot the VM
|
||||
Verify that the VM reboot successfully and
|
||||
check integrity of snapshot
|
||||
8. Initiate ROOT volume snapshot and while snapshot is
|
||||
@ -875,15 +875,15 @@ class TestSnapshotsHardning(cloudstackTestCase):
|
||||
while snapshot is still in progress
|
||||
start the VM and check the integrity of the snapshot
|
||||
6. Initiate ROOT volume snapshot and while snapshot is
|
||||
in pregress Stop the VM
|
||||
in progress Stop the VM
|
||||
Verify that the VM stops successfully and
|
||||
check integrity of snapshot
|
||||
7. Initiate ROOT volume snapshot and while snapshot is
|
||||
in pregress Reboot the VM
|
||||
in progress Reboot the VM
|
||||
Verify that the VM reboot successfully and
|
||||
check integrity of snapshot
|
||||
8. Initiate ROOT volume snapshot and while snapshot is
|
||||
in pregress create snapshot of the same volume
|
||||
in progress create snapshot of the same volume
|
||||
and check integrity of both the snapshots
|
||||
9. Initiate snapshot of DATA volume and while snapshot
|
||||
is in progress detach the volume
|
||||
|
||||
@ -3738,7 +3738,7 @@ class TestStorageLiveMigrationVmware(cloudstackTestCase):
|
||||
def GetDestinationHost(self, hostsToavoid):
|
||||
"""
|
||||
This method gives us the destination host to which VM will be migrated
|
||||
It takes the souce host i.e. hostsToavoid as input
|
||||
It takes the source host i.e. hostsToavoid as input
|
||||
"""
|
||||
destinationHost = None
|
||||
for host in self.hosts:
|
||||
|
||||
@ -285,9 +285,9 @@ class TestConcurrentSnapshots(cloudstackTestCase):
|
||||
4. Verify backup_snap_id was non null in "snapshots"table
|
||||
2. Perform step 1 for all the 4 VM's.
|
||||
3. Verify that VM gets migrated when snapshot
|
||||
is in pregress for the VM.
|
||||
is in progress for the VM.
|
||||
4. Verify that snapshots get created when
|
||||
VM's are stoped in between snapshot creation.
|
||||
VM's are stopped in between snapshot creation.
|
||||
5. Perform live Migration then stop all the
|
||||
VM's after that verify that snapshot creation success .
|
||||
6. Verify success of snapshots creation in case:
|
||||
|
||||
@ -74,7 +74,7 @@ When a new image needs to be added we create a 'distro' in cobbler and associate
|
||||
|
||||
b. Puppet master - Cobbler reimages machines on-demand but it is upto puppet recipes to do configuration management within them. The configuration management is required for kvm hypervisors (kvm agent for eg:) and for the cloudstack management server which needs mysql, cloudstack, etc. The puppetmasterd daemon on the driver-vm is responsible for 'kicking' nodes to initiate configuration management on themselves when they come alive.
|
||||
|
||||
So the driver-vm is also the repository of all the puppet recipes for various modules that need to be configured for the test infrastructure to work. The modules are placed in /etc/puppet and bear the same structure as our github repo. When we need to affect a configuration change on any of our systems we only change the github repo and the systems in place are affected upon next run.
|
||||
So the driver-vm is also the repository of all the puppet recipes for various modules that need to be configured for the test infrastructure to work. The modules are placed in /etc/puppet and bear the same structure as our GitHub repo. When we need to affect a configuration change on any of our systems we only change the GitHub repo and the systems in place are affected upon next run.
|
||||
|
||||
c. dnsmasq - DNS is controlled by cobbler but its configuration of hosts is set within dnsmasq.d/hosts. This is a simple 1-1 mapping of hostnames with IPs. For the most part this should be the single place where one needs to alter for replicating the test setup. Everywhere else only DNS names are/should-be used. open ports 53, 67 on server
|
||||
|
||||
@ -107,7 +107,7 @@ Only the latest tests from git are run on the setup. This allows us to test in a
|
||||
control via github
|
||||
==================
|
||||
|
||||
there are two github repositories controlling the test infrastructure.
|
||||
there are two GitHub repositories controlling the test infrastructure.
|
||||
a. The puppet recipes at gh:acs-infra-test
|
||||
b. The gh:cloud-autodeploy repo that has the scripts to orchestrate the overall workflow
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
The modern CloudStack UI is role-based progressive app that uses VueJS and Ant Design.
|
||||
|
||||
Javascript, VueJS references:
|
||||
JavaScript, VueJS references:
|
||||
- https://www.w3schools.com/js/
|
||||
- https://www.geeksforgeeks.org/javascript-tutorial/
|
||||
- https://vuejs.org/v2/guide/
|
||||
@ -96,7 +96,7 @@ The children should have:
|
||||
- `tabs`: Array of custom components that will get rendered as tabs in the
|
||||
resource view
|
||||
- `component`: The custom component for rendering the route view
|
||||
- `related`: A list of associated entitiy types that can be listed via passing
|
||||
- `related`: A list of associated entity types that can be listed via passing
|
||||
the current resource's id as a parameter in their respective list APIs
|
||||
- `actions`: Array of actions that can be performed on the resource
|
||||
|
||||
|
||||
@ -180,10 +180,10 @@ public class StringUtils {
|
||||
return cleanResult;
|
||||
}
|
||||
|
||||
public static String cleanDetails(final String stringToClean, final String detailsIndexSting) {
|
||||
public static String cleanDetails(final String stringToClean, final String detailsIndexString) {
|
||||
String cleanResult = stringToClean;
|
||||
for (final String log : stringToClean.split("&|%26")) {
|
||||
if (log.contains(detailsIndexSting)) {
|
||||
if (log.contains(detailsIndexString)) {
|
||||
cleanResult = cleanResult.replace(log, "");
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user