diff --git a/api/src/main/java/com/cloud/server/ManagementService.java b/api/src/main/java/com/cloud/server/ManagementService.java index 14d46e00ec6..a01a22172e7 100644 --- a/api/src/main/java/com/cloud/server/ManagementService.java +++ b/api/src/main/java/com/cloud/server/ManagementService.java @@ -106,7 +106,7 @@ public interface ManagementService { Pair, Integer> searchForConfigurations(ListCfgsByCmd c); /** - * returns the the configuration groups + * returns the configuration groups * * @return list of configuration groups */ diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java index 08235c56ca9..44710d018d3 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListNicsCmd.java @@ -51,7 +51,7 @@ public class ListNicsCmd extends BaseListCmd { //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name = ApiConstants.NIC_ID, type = CommandType.UUID, entityType = NicResponse.class, required = false, description = "the ID of the nic to to list IPs") + @Parameter(name = ApiConstants.NIC_ID, type = CommandType.UUID, entityType = NicResponse.class, required = false, description = "the ID of the nic to list IPs") private Long nicId; @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "the ID of the vm") diff --git a/api/src/test/java/com/cloud/agent/api/storage/OVFHelperTest.java b/api/src/test/java/com/cloud/agent/api/storage/OVFHelperTest.java index f52d3045e40..65e3b961b1e 100644 --- a/api/src/test/java/com/cloud/agent/api/storage/OVFHelperTest.java +++ b/api/src/test/java/com/cloud/agent/api/storage/OVFHelperTest.java @@ -488,7 +488,7 @@ public class OVFHelperTest { " \n" + " \n" + " \n" + - " String naming the the hostname of the server on which the external database is running (ignored when db.type is 'embedded').\n" + + " String naming the hostname of the server on which the external database is running (ignored when db.type is 'embedded').\n" + " \n" + " \n" + " \n" + diff --git a/engine/components-api/src/main/java/com/cloud/event/UsageEventUtils.java b/engine/components-api/src/main/java/com/cloud/event/UsageEventUtils.java index ec305fee766..1a2fab150a7 100644 --- a/engine/components-api/src/main/java/com/cloud/event/UsageEventUtils.java +++ b/engine/components-api/src/main/java/com/cloud/event/UsageEventUtils.java @@ -240,7 +240,7 @@ public class UsageEventUtils { try { s_eventBus.publish(event); } catch (EventBusException e) { - s_logger.warn("Failed to publish usage event on the the event bus."); + s_logger.warn("Failed to publish usage event on the event bus."); } } diff --git a/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java b/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java index 1dd999dad97..22def16c400 100644 --- a/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java +++ b/engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java @@ -53,7 +53,7 @@ public interface HighAvailabilityManager extends Manager { ConfigKey TimeBetweenCleanup = new ConfigKey<>("Advanced", Long.class, "time.between.cleanup", "86400", "The time in seconds to wait before the" + " cleanup thread runs for the different HA-Worker-Threads. The cleanup thread finds all the work items " - + "that were successful and is now ready to be purged from the the database (table: op_ha_work).", + + "that were successful and is now ready to be purged from the database (table: op_ha_work).", true, Cluster); ConfigKey MaxRetries = new ConfigKey<>("Advanced", Integer.class, "max.retries", diff --git a/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java b/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java index ef8dddc1f23..1e1251d8cdc 100644 --- a/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java +++ b/engine/components-api/src/main/java/com/cloud/network/NetworkStateListener.java @@ -94,7 +94,7 @@ public class NetworkStateListener implements StateListener(address.getAddress().addr(), port); } } - LOGGER.warn(String.format("No public IP found for the the VPC tier: %s, Kubernetes cluster : %s", network, kubernetesCluster.getName())); + LOGGER.warn(String.format("No public IP found for the VPC tier: %s, Kubernetes cluster : %s", network, kubernetesCluster.getName())); return new Pair<>(null, port); } @@ -584,7 +584,7 @@ public class KubernetesClusterActionWorker { writer.write(data); writer.close(); } catch (IOException e) { - logAndThrow(Level.ERROR, String.format("Kubernetes Cluster %s : Failed to to fetch script %s", + logAndThrow(Level.ERROR, String.format("Kubernetes Cluster %s : Failed to fetch script %s", kubernetesCluster.getName(), filename), e); } return file; diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java index d17525d265f..99f7102b13b 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetscalerResource.java @@ -248,7 +248,7 @@ public class NetscalerResource implements ServerResource { enableLoadBalancingFeature(); SSL.enableSslFeature(_netscalerService, _isSdx); - //if the the device is cloud stack provisioned then make it part of the public network + //if the device is cloud stack provisioned then make it part of the public network if (_cloudManaged) { _publicIP = (String)params.get("publicip"); _publicIPNetmask = (String)params.get("publicipnetmask"); @@ -1856,7 +1856,7 @@ public class NetscalerResource implements ServerResource { public static void linkCerts(final nitro_service ns, final String userCertName, final String caCertName) throws ExecutionException { try { - // the assumption is that that both userCertName and caCertName are present on NS + // the assumption is that both userCertName and caCertName are present on NS final sslcertkey caCert = sslcertkey.get(ns, caCertName); final sslcertkey userCert = sslcertkey.get(ns, userCertName); diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigureSharedNetworkUuidCommandWrapper.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigureSharedNetworkUuidCommandWrapper.java index 3a1d2cb9db0..5f3198abb4f 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigureSharedNetworkUuidCommandWrapper.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/resource/wrapper/NiciraNvpConfigureSharedNetworkUuidCommandWrapper.java @@ -140,7 +140,7 @@ public final class NiciraNvpConfigureSharedNetworkUuidCommandWrapper extends Com cleanupLSwitchPort(logicalSwitchUuid, lSwitchPort, niciraNvpApi); return handleException(e, command, niciraNvpResource); } - s_logger.debug("Logical Router Port " + lRouterPort.getUuid() + " (" + lRouterPort.getDisplayName() + ") successfully attached to to Logical Switch Port " + lSwitchPort.getUuid() + " (" + lSwitchPort.getDisplayName() + ") with a PatchAttachment"); + s_logger.debug("Logical Router Port " + lRouterPort.getUuid() + " (" + lRouterPort.getDisplayName() + ") successfully attached to Logical Switch Port " + lSwitchPort.getUuid() + " (" + lSwitchPort.getDisplayName() + ") with a PatchAttachment"); //Step 5: Attach lSwitchPort to lRouterPort with a PatchAttachment @@ -154,7 +154,7 @@ public final class NiciraNvpConfigureSharedNetworkUuidCommandWrapper extends Com cleanupLSwitchPort(logicalSwitchUuid, lSwitchPort, niciraNvpApi); return handleException(e, command, niciraNvpResource); } - s_logger.debug("Logical Switch Port " + lSwitchPort.getUuid() + " (" + lSwitchPort.getDisplayName() + ") successfully attached to to Logical Router Port " + lRouterPort.getUuid() + " (" + lRouterPort.getDisplayName() + ") with a PatchAttachment"); + s_logger.debug("Logical Switch Port " + lSwitchPort.getUuid() + " (" + lSwitchPort.getDisplayName() + ") successfully attached to Logical Router Port " + lRouterPort.getUuid() + " (" + lRouterPort.getDisplayName() + ") with a PatchAttachment"); s_logger.info("Successfully attached Logical Switch " + logicalSwitchUuid + " on Logical Router " + logicalRouterUuid + " for Shared Network " + networkId); return new ConfigureSharedNetworkUuidAnswer(command, true, "OK"); diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java index 0ba5c0c3735..0c70c4d5b30 100644 --- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java +++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java @@ -376,7 +376,7 @@ public class LdapListUsersCmd extends BaseListCmd { } /** - * @return true unless the the user is imported in the specified cloudstack domain from LDAP + * @return true unless the user is imported in the specified cloudstack domain from LDAP */ private boolean isNotAlreadyImportedInTheCurrentDomain(LdapUserResponse user) { UserResponse cloudstackUser = getCloudstackUser(user); diff --git a/scripts/vm/hypervisor/xenserver/copy_vhd_from_secondarystorage.sh b/scripts/vm/hypervisor/xenserver/copy_vhd_from_secondarystorage.sh index 61c65ea45a0..6c78613e5a7 100755 --- a/scripts/vm/hypervisor/xenserver/copy_vhd_from_secondarystorage.sh +++ b/scripts/vm/hypervisor/xenserver/copy_vhd_from_secondarystorage.sh @@ -114,7 +114,7 @@ copyvhd() dd if=$srcvhd of=$desvhd bs=512 seek=$(($(($vsize/512))-1)) count=1 $VHDUTIL modify -s $vsize -n $desvhd if [ $? -ne 0 ]; then - echo "32#failed to set new vhd physical size for vdi vdi $uuid" + echo "32#failed to set new vhd physical size for vdi $uuid" cleanup exit 0 fi diff --git a/server/src/main/java/com/cloud/api/ApiServer.java b/server/src/main/java/com/cloud/api/ApiServer.java index e88d7cf8b53..b602ed2edbc 100644 --- a/server/src/main/java/com/cloud/api/ApiServer.java +++ b/server/src/main/java/com/cloud/api/ApiServer.java @@ -373,7 +373,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer try { eventBus.publish(event); } catch (EventBusException evx) { - String errMsg = "Failed to publish async job event on the the event bus."; + String errMsg = "Failed to publish async job event on the event bus."; s_logger.warn(errMsg, evx); } } diff --git a/server/src/main/java/com/cloud/event/ActionEventUtils.java b/server/src/main/java/com/cloud/event/ActionEventUtils.java index dacccb5e1e2..c9cf933b010 100644 --- a/server/src/main/java/com/cloud/event/ActionEventUtils.java +++ b/server/src/main/java/com/cloud/event/ActionEventUtils.java @@ -236,7 +236,7 @@ public class ActionEventUtils { try { s_eventBus.publish(event); } catch (EventBusException e) { - s_logger.warn("Failed to publish action event on the the event bus."); + s_logger.warn("Failed to publish action event on the event bus."); } } diff --git a/server/src/main/java/com/cloud/event/AlertGenerator.java b/server/src/main/java/com/cloud/event/AlertGenerator.java index 49a0ae944bd..9e12486db47 100644 --- a/server/src/main/java/com/cloud/event/AlertGenerator.java +++ b/server/src/main/java/com/cloud/event/AlertGenerator.java @@ -109,7 +109,7 @@ public class AlertGenerator { try { s_eventBus.publish(event); } catch (EventBusException e) { - s_logger.warn("Failed to publish alert on the the event bus."); + s_logger.warn("Failed to publish alert on the event bus."); } } } diff --git a/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java b/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java index 0d683292cfa..52096f97954 100644 --- a/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java +++ b/server/src/main/java/com/cloud/network/Ipv6AddressManagerImpl.java @@ -135,7 +135,7 @@ public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressMa /** * Allocates a public IPv6 address for the guest NIC. It will throw exceptions in the following cases: *
    - *
  • the the requested IPv6 address is already in use in the network;
    • + *
  • the requested IPv6 address is already in use in the network;
    • *
  • IPv6 address is equals to the Gateway;
    • *
  • the network offering is empty;
    • *
  • the IPv6 address is not in the network.
    • @@ -151,7 +151,7 @@ public class Ipv6AddressManagerImpl extends ManagerBase implements Ipv6AddressMa /** * Performs some checks on the given IPv6 address. It will throw exceptions in the following cases: *
      - *
    • the the requested IPv6 address is already in use in the network;
      • + *
    • the requested IPv6 address is already in use in the network;
      • *
    • IPv6 address is equals to the Gateway;
      • *
    • the network offering is empty;
      • *
    • the IPv6 address is not in the network.
      • diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index ac698f69689..7b160416547 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -834,7 +834,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C } /** - * It allocates a secondary IP alias on the NIC. It can be either an Ipv4 or an Ipv6 or even both, according to the the given IpAddresses object. + * It allocates a secondary IP alias on the NIC. It can be either an Ipv4 or an Ipv6 or even both, according to the given IpAddresses object. */ @Override @ActionEvent(eventType = EventTypes.EVENT_NIC_SECONDARY_IP_ASSIGN, eventDescription = "assigning secondary ip to nic", create = true) diff --git a/server/src/main/java/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/main/java/com/cloud/network/guru/DirectPodBasedNetworkGuru.java index f0ddc128b95..7186812151c 100644 --- a/server/src/main/java/com/cloud/network/guru/DirectPodBasedNetworkGuru.java +++ b/server/src/main/java/com/cloud/network/guru/DirectPodBasedNetworkGuru.java @@ -222,7 +222,7 @@ public class DirectPodBasedNetworkGuru extends DirectNetworkGuru { * Linux, FreeBSD and Windows all calculate the same IPv6 address when configured properly. * * Using Router Advertisements the routers in the network should announce the IPv6 CIDR which is configured - * in in the vlan table in the database. + * in the vlan table in the database. * * This way the NIC will be populated with a IPv6 address on which the Instance is reachable. */ diff --git a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java index 0feb240743f..115364c527a 100644 --- a/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/main/java/com/cloud/network/rules/RulesManagerImpl.java @@ -1134,7 +1134,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules // revoke all port forwarding rules success = success && applyPortForwardingRules(ipId, _ipAddrMgr.RulesContinueOnError.value(), caller); - // revoke all all static nat rules + // revoke all static nat rules success = success && applyStaticNatRulesForIp(ipId, _ipAddrMgr.RulesContinueOnError.value(), caller, true); // revoke static nat for the ip address @@ -1190,7 +1190,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules success = success && applyPortForwardingRulesForNetwork(networkId, true, caller); success = success && applyPortForwardingRulesForNetwork(networkId, _ipAddrMgr.RulesContinueOnError.value(), caller); - // revoke all all static nat rules for the network + // revoke all static nat rules for the network success = success && applyStaticNatRulesForNetwork(networkId, true, caller); success = success && applyStaticNatRulesForNetwork(networkId, _ipAddrMgr.RulesContinueOnError.value(), caller); diff --git a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java index b423ce78fa8..f13e6ac7a4b 100644 --- a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -476,7 +476,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro protected List getAffectedVmsForVmStop(VMInstanceVO vm) { List affectedVms = new ArrayList(); List groupsForVm = _securityGroupVMMapDao.listByInstanceId(vm.getId()); - // For each group, find the security rules rules that allow the group + // For each group, find the security rules that allow the group for (SecurityGroupVMMapVO mapVO : groupsForVm) {// FIXME: use custom sql in the dao //Add usage events for security group remove UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SECURITY_GROUP_REMOVE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), mapVO.getSecurityGroupId(), vm diff --git a/server/src/main/java/com/cloud/storage/ImageStoreDetailsUtil.java b/server/src/main/java/com/cloud/storage/ImageStoreDetailsUtil.java index 1a4a246ee31..baf5ef8902d 100755 --- a/server/src/main/java/com/cloud/storage/ImageStoreDetailsUtil.java +++ b/server/src/main/java/com/cloud/storage/ImageStoreDetailsUtil.java @@ -51,7 +51,7 @@ public class ImageStoreDetailsUtil { * Obtain NFS protocol version (if provided) for a store id, if not use default config value
      * @param storeId image store id * @return {@code null} if {@code secstorage.nfs.version} is not found for storeId
      - * {@code X} if {@code secstorage.nfs.version} is found found for storeId + * {@code X} if {@code secstorage.nfs.version} is found for storeId */ public String getNfsVersion(long storeId) throws NumberFormatException { @@ -68,7 +68,7 @@ public class ImageStoreDetailsUtil { * Obtain NFS protocol version (if provided) for a store uuid.
      * @param storeUuid image store id * @return {@code null} if {@code secstorage.nfs.version} is not found for storeUuid
      - * {@code X} if {@code secstorage.nfs.version} is found found for storeUuid + * {@code X} if {@code secstorage.nfs.version} is found for storeUuid */ public String getNfsVersionByUuid(String storeUuid){ ImageStoreVO imageStore = imageStoreDao.findByUuid(storeUuid); diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index 814bb485556..3fba1994723 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -548,7 +548,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic sanitizeFormat(format); - // Check that the the disk offering specified is valid + // Check that the disk offering specified is valid if (diskOfferingId != null) { DiskOfferingVO diskOffering = _diskOfferingDao.findById(diskOfferingId); if ((diskOffering == null) || diskOffering.getRemoved() != null || diskOffering.isComputeOnly()) { @@ -738,7 +738,7 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic } } - // Check that the the disk offering is specified + // Check that the disk offering is specified diskOffering = _diskOfferingDao.findById(diskOfferingId); if ((diskOffering == null) || diskOffering.getRemoved() != null || diskOffering.isComputeOnly()) { throw new InvalidParameterValueException("Please specify a valid disk offering."); diff --git a/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java b/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java index d8d036f637f..c68b05c5062 100644 --- a/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java +++ b/server/src/main/java/com/cloud/storage/listener/SnapshotStateListener.java @@ -106,7 +106,7 @@ public class SnapshotStateListener implements StateListener try { s_eventBus.publish(eventMsg); } catch (EventBusException e) { - s_logger.warn("Failed to state change event on the the event bus."); + s_logger.warn("Failed to state change event on the event bus."); } } diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index c948a221875..23be3facd25 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -6134,7 +6134,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir */ protected void validateKvmExtraConfig(String decodedUrl) { String[] allowedConfigOptionList = KvmAdditionalConfigAllowList.value().split(","); - // Skip allowed keys validation validation for DPDK + // Skip allowed keys validation for DPDK if (!decodedUrl.contains(":")) { try { DocumentBuilder builder = ParserUtils.getSaferDocumentBuilderFactory().newDocumentBuilder(); diff --git a/server/src/main/java/com/cloud/vm/UserVmStateListener.java b/server/src/main/java/com/cloud/vm/UserVmStateListener.java index e4df6bbbeb8..e9f7e7c5c72 100644 --- a/server/src/main/java/com/cloud/vm/UserVmStateListener.java +++ b/server/src/main/java/com/cloud/vm/UserVmStateListener.java @@ -152,7 +152,7 @@ public class UserVmStateListener implements StateListenerqueue", "queue", "OUT"); diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in index 57bfbcbc35b..41b54b07e60 100755 --- a/setup/bindir/cloud-setup-databases.in +++ b/setup/bindir/cloud-setup-databases.in @@ -543,7 +543,7 @@ for example: This command sets up the CloudStack Management Server and CloudStack Usage Server database configuration (connection credentials and host information) based on the first argument. - If the the --deploy-as option is present, this command will also connect to the database using the administrative credentials specified as the value for the --deploy-as argument, construct the database environment needed to run the CloudStack Management Server, and alter the password specified for the user in the first argument. In this case, the user name specified in --deploy-as= cannot be the same as the user name specified for the connection credentials that the CloudStack Management Server will be set up with. + If the --deploy-as option is present, this command will also connect to the database using the administrative credentials specified as the value for the --deploy-as argument, construct the database environment needed to run the CloudStack Management Server, and alter the password specified for the user in the first argument. In this case, the user name specified in --deploy-as= cannot be the same as the user name specified for the connection credentials that the CloudStack Management Server will be set up with. If a server-setup.xml cloud setup information file is specified with the --auto option, this command will also construct a customized database environment according to the cloud setup information in the file. diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index a319dc309ba..f20a52c6952 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -801,7 +801,7 @@ CREATE TABLE `cloud`.`port_forwarding_rules` ( `instance_id` bigint unsigned NOT NULL COMMENT 'vm instance id', `dest_ip_address` char(40) NOT NULL COMMENT 'id_address', `dest_port_start` int(10) NOT NULL COMMENT 'starting port of the port range to map to', - `dest_port_end` int(10) NOT NULL COMMENT 'end port of the the port range to map to', + `dest_port_end` int(10) NOT NULL COMMENT 'end port of the port range to map to', PRIMARY KEY (`id`), CONSTRAINT `fk_port_forwarding_rules__id` FOREIGN KEY(`id`) REFERENCES `firewall_rules`(`id`) ON DELETE CASCADE, CONSTRAINT `fk_port_forwarding_rules__instance_id` FOREIGN KEY `fk_port_forwarding_rules__instance_id` (`instance_id`) REFERENCES `vm_instance` (`id`) ON DELETE CASCADE @@ -2137,7 +2137,7 @@ CREATE TABLE `cloud`.`external_load_balancer_devices` ( `allocation_state` varchar(32) NOT NULL DEFAULT 'Free' COMMENT 'Allocation state (Free/Shared/Dedicated/Provider) of the device', `is_dedicated` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if device/appliance is provisioned for dedicated use only', `is_inline` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer will be used in in-line configuration with firewall', - `is_managed` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is provisioned and its life cycle is managed by by cloudstack', + `is_managed` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if load balancer appliance is provisioned and its life cycle is managed by cloudstack', `host_id` bigint unsigned NOT NULL COMMENT 'host id corresponding to the external load balancer device', `parent_host_id` bigint unsigned COMMENT 'if the load balancer appliance is cloudstack managed, then host id on which this appliance is provisioned', PRIMARY KEY (`id`), diff --git a/systemvm/agent/noVNC/app/ui.js b/systemvm/agent/noVNC/app/ui.js index c85d9c2f19e..3a85648bb84 100644 --- a/systemvm/agent/noVNC/app/ui.js +++ b/systemvm/agent/noVNC/app/ui.js @@ -704,7 +704,7 @@ const UI = { updateControlbarHandle() { // Since the control bar is fixed on the viewport and not the page, - // the move function expects coordinates relative the the viewport. + // the move function expects coordinates relative the viewport. const handle = document.getElementById("noVNC_control_bar_handle"); const handleBounds = handle.getBoundingClientRect(); UI.moveControlbarHandle(handleBounds.top); diff --git a/systemvm/agent/noVNC/core/display.js b/systemvm/agent/noVNC/core/display.js index bf8d5fab699..b9c8d213845 100644 --- a/systemvm/agent/noVNC/core/display.js +++ b/systemvm/agent/noVNC/core/display.js @@ -347,7 +347,7 @@ export default class Display { // 1. https://bugzilla.mozilla.org/show_bug.cgi?id=1194719 // // We need to set these every time since all properties are reset - // when the the size is changed + // when the size is changed this._drawCtx.mozImageSmoothingEnabled = false; this._drawCtx.webkitImageSmoothingEnabled = false; this._drawCtx.msImageSmoothingEnabled = false; diff --git a/systemvm/agent/noVNC/core/rfb.js b/systemvm/agent/noVNC/core/rfb.js index a8d63ff7809..228340a2dec 100644 --- a/systemvm/agent/noVNC/core/rfb.js +++ b/systemvm/agent/noVNC/core/rfb.js @@ -883,7 +883,7 @@ export default class RFB extends EventTargetMixin { size.w + 'x' + size.h); } - // Gets the the size of the available screen + // Gets the size of the available screen _screenSize() { let r = this._screen.getBoundingClientRect(); return { w: r.width, h: r.height }; diff --git a/test/integration/component/maint/test_host_high_availability.py b/test/integration/component/maint/test_host_high_availability.py index c95b5db89b6..c335c66b481 100644 --- a/test/integration/component/maint/test_host_high_availability.py +++ b/test/integration/component/maint/test_host_high_availability.py @@ -483,7 +483,7 @@ class TestHostHighAvailability(cloudstackTestCase): self.assertEqual( vm_response.id, vm.id, - "The virtual machine id and the the virtual machine from listVirtualMachines is not matching." + "The virtual machine id and the virtual machine from listVirtualMachines is not matching." ) self.assertEqual( diff --git a/test/integration/component/test_acl_isolatednetwork.py b/test/integration/component/test_acl_isolatednetwork.py index 5126aff06d4..038fd358972 100644 --- a/test/integration/component/test_acl_isolatednetwork.py +++ b/test/integration/component/test_acl_isolatednetwork.py @@ -427,7 +427,7 @@ class TestIsolatedNetwork(cloudstackTestCase): self.cleanup.append(network) self.assertEqual(network.state.lower() == ALLOCATED.lower(), True, - "Admin User is not able to create a network for for other users in other domain") + "Admin User is not able to create a network for other users in other domain") ## Test cases relating to createNetwork as domain admin user @@ -575,7 +575,7 @@ class TestIsolatedNetwork(cloudstackTestCase): except Exception as e: self.debug("When user tries to create network for users in their domain %s" % e) if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.UNABLE_TO_LIST_NETWORK_ACCOUNT): - self.fail("Error message validation failed when when User tries to create network for other users in their domain ") + self.fail("Error message validation failed when User tries to create network for other users in their domain ") @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_10_createNetwork_user_foruserinotherdomain(self): @@ -674,7 +674,7 @@ class TestIsolatedNetwork(cloudstackTestCase): self.cleanup.append(vm) self.assertEqual(vm.state.lower() == RUNNING.lower() and vm.account == self.account_d2a.name and vm.domainid == self.account_d2a.domainid, True, - "Admin User is not able to deploy VM for users users in other domain") + "Admin User is not able to deploy VM for users in other domain") @attr("simulator_only", tags=["advanced"], required_hardware="false") def test_13_1_deployvm_admin_foruserinotherdomain_crossnetwork(self): diff --git a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py index 1cb445b96fe..36b71defadb 100644 --- a/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py +++ b/test/integration/component/test_acl_sharednetwork_deployVM-impersonation.py @@ -1714,7 +1714,7 @@ class TestSharedNetworkImpersonation(cloudstackTestCase): accountid=self.account_d2a.name, domainid=self.account_d2a.domainid ) - self.fail("Domain admin is able able to deploy a VM for an regular user from a differnt domain in a shared network with scope=account") + self.fail("Domain admin is able to deploy a VM for an regular user from a differnt domain in a shared network with scope=account") except Exception as e: self.debug("When a user from different domain deploys a VM in a shared network with scope=account %s" % e) if not CloudstackAclException.verifyMsginException(e, CloudstackAclException.NO_PERMISSION_TO_OPERATE_DOMAIN): diff --git a/test/integration/component/test_base_image_updation.py b/test/integration/component/test_base_image_updation.py index 234a86e1ce8..bd78082be3e 100644 --- a/test/integration/component/test_base_image_updation.py +++ b/test/integration/component/test_base_image_updation.py @@ -331,7 +331,7 @@ class TestBaseImageUpdate(cloudstackTestCase): except Exception as e: self.fail("Failed to reboot the virtual machines, %s" % e) - # Check if the the root disk was destroyed and recreated for isVolatile=True + # Check if the root disk was destroyed and recreated for isVolatile=True self.debug("Checking root disk of VM with isVolatile=True") vms = VirtualMachine.list( self.apiclient, @@ -358,7 +358,7 @@ class TestBaseImageUpdate(cloudstackTestCase): %(vm_with_reset.nic[0].ipaddress, self.vm_with_reset.nic[0].ipaddress) ) - # Check if the the root disk was not destroyed for isVolatile=False + # Check if the root disk was not destroyed for isVolatile=False self.debug("Checking root disk of VM with isVolatile=False") vms = VirtualMachine.list( self.apiclient, @@ -473,7 +473,7 @@ class TestBaseImageUpdate(cloudstackTestCase): %(vm_with_reset.nic[0].ipaddress, self.vm_with_reset.nic[0].ipaddress) ) - # Check if the the root disk was not destroyed for isVolatile=False + # Check if the root disk was not destroyed for isVolatile=False self.debug("Checking template id of VM with isVolatile=False") vms = VirtualMachine.list( self.apiclient, @@ -606,7 +606,7 @@ class TestBaseImageUpdate(cloudstackTestCase): except Exception as e: self.fail("Failed to reboot the virtual machine. Error: %s" % e) - # Check if the the root disk was destroyed and recreated for isVolatile=True + # Check if the root disk was destroyed and recreated for isVolatile=True self.debug("Checking whether root disk of VM with isVolatile=True was destroyed") vms = VirtualMachine.list( self.apiclient, diff --git a/test/integration/component/test_configdrive.py b/test/integration/component/test_configdrive.py index 38e753480db..b092273cd5f 100644 --- a/test/integration/component/test_configdrive.py +++ b/test/integration/component/test_configdrive.py @@ -366,7 +366,7 @@ class ConfigDriveUtils: return None def _get_config_drive_data(self, ssh, file, name, fail_on_missing=True): - """Fetches the content of a file file on the config drive + """Fetches the content of a file on the config drive :param ssh: SSH connection to the VM :param file: path to the file to fetch @@ -1613,7 +1613,7 @@ class TestConfigDrive(cloudstackTestCase, ConfigDriveUtils): "List network should return a valid list" ) self.assertEqual(network.name, networks[0].name, - "Name of the network should match with with the " + "Name of the network should match with the " "returned list data" ) if state: @@ -1777,11 +1777,11 @@ class TestConfigDrive(cloudstackTestCase, ConfigDriveUtils): # And the VM is successfully deployed and is in the "Running" state # And there is no VR is deployed. # 4. And the user data in the ConfigDrive device is as expected - # 5. And the the vm password in the ConfigDrive device is as expected + # 5. And the vm password in the ConfigDrive device is as expected # 6. When I stop, reset the password, and start the VM # 7. Then I can login into the VM using the new password. - # 8. And the the vm password in the ConfigDrive device is the new one + # 8. And the vm password in the ConfigDrive device is the new one # 9. Verify various scenarios and check the data in configdriveIso # 10. Delete all the created objects (cleanup). @@ -2000,11 +2000,11 @@ class TestConfigDrive(cloudstackTestCase, ConfigDriveUtils): # And the VM is successfully deployed and is in the "Running" state # 4. And the user data in the ConfigDrive device is as expected - # 5. And the the vm password in the ConfigDrive device is as expected + # 5. And the vm password in the ConfigDrive device is as expected # 6. When I stop, reset the password, and start the VM # 7. Then I can login into the VM using the new password. - # 8. And the the vm password in the ConfigDrive device is the new one + # 8. And the vm password in the ConfigDrive device is the new one # 9. Verify various scenarios and check the data in configdriveIso # 10. Delete all the created objects (cleanup). diff --git a/test/integration/component/test_ldap.py b/test/integration/component/test_ldap.py index 56f844ac21a..6c6179e292b 100644 --- a/test/integration/component/test_ldap.py +++ b/test/integration/component/test_ldap.py @@ -105,7 +105,7 @@ class TestLdap(cloudstackTestCase): self.apiClient.deleteAccount(deleteAcct) self.debug( - "Deleted the the following account name %s:" % + "Deleted the following account name %s:" % acct_name) if self.ldapconfRes == 1: diff --git a/test/integration/component/test_ldap_auto_import.py b/test/integration/component/test_ldap_auto_import.py index c2cc6b5a23c..c397386a3b7 100644 --- a/test/integration/component/test_ldap_auto_import.py +++ b/test/integration/component/test_ldap_auto_import.py @@ -379,7 +379,7 @@ class TestLdap(cloudstackTestCase): self.apiClient.deleteAccount(deleteAcct2) self.debug( - "Deleted the the following account name %s:" % + "Deleted the following account name %s:" % acct_name) except Exception as e: diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py index 6c24ec1a78b..a9e1ca9a182 100644 --- a/test/integration/component/test_multiple_ips_per_nic.py +++ b/test/integration/component/test_multiple_ips_per_nic.py @@ -297,7 +297,7 @@ class TestBasicOperations(cloudstackTestCase): # Validations: # 1. Step 3 should succeed # 2. Step 4 should fail - # 3. Step 5 should should fail + # 3. Step 5 should fail # 4. Step 6 should fail self.account = Account.create( diff --git a/test/integration/smoke/test_privategw_acl.py b/test/integration/smoke/test_privategw_acl.py index da0ae6a0020..06a6241d199 100644 --- a/test/integration/smoke/test_privategw_acl.py +++ b/test/integration/smoke/test_privategw_acl.py @@ -850,7 +850,7 @@ class TestPrivateGwACL(cloudstackTestCase): self.assertTrue(check_state == 0, "Routers private gateway interface should not be on the same state!") self.assertTrue(check_mac == 0, "Routers private gateway interface should not have the same mac address!") else: - self.assertTrue(check_state == 1, "Routers private gateway interface should should have been removed!") + self.assertTrue(check_state == 1, "Routers private gateway interface should have been removed!") def check_routers_state(self, status_to_check="PRIMARY", expected_count=1): routers = self.query_routers() diff --git a/test/integration/testpaths/testpath_multiple_snapshot.py b/test/integration/testpaths/testpath_multiple_snapshot.py index 50cccff61e5..f4bc4148611 100644 --- a/test/integration/testpaths/testpath_multiple_snapshot.py +++ b/test/integration/testpaths/testpath_multiple_snapshot.py @@ -157,7 +157,7 @@ class TestMultipleVolumeSnapshots(cloudstackTestCase): storage pools available in the setup") if len(list(storagePool for storagePool in self.pools if storagePool.scope == "CLUSTER")) < 2: - self.skipTest("There must be at at least two cluster wide\ + self.skipTest("There must be at least two cluster wide\ storage pools available in the setup") except Exception as e: self.skipTest(e) diff --git a/test/integration/testpaths/testpath_restore_vm.py b/test/integration/testpaths/testpath_restore_vm.py index 32ac214a739..956e41183bc 100644 --- a/test/integration/testpaths/testpath_restore_vm.py +++ b/test/integration/testpaths/testpath_restore_vm.py @@ -141,7 +141,7 @@ class TestRestoreVM(cloudstackTestCase): "Check: Failed to list cluster wide storage pools") if len(self.pools) < 2: - self.skipTest("There must be at at least two cluster wide\ + self.skipTest("There must be at least two cluster wide\ storage pools available in the setup") except Exception as e: diff --git a/test/integration/testpaths/testpath_usage.py b/test/integration/testpaths/testpath_usage.py index 3774bf8471c..772611659ac 100644 --- a/test/integration/testpaths/testpath_usage.py +++ b/test/integration/testpaths/testpath_usage.py @@ -432,7 +432,7 @@ class TestUsage(cloudstackTestCase): def test_01_positive_tests_usage(self): """ Positive test for usage test path - # 1. Register a template and verify that usage usage is generated + # 1. Register a template and verify that usage is generated for correct size of template # 2. Register an ISO, verify usage is generate for the correct size of ISO diff --git a/test/integration/testpaths/testpath_volumelifecycle.py b/test/integration/testpaths/testpath_volumelifecycle.py index 42dd7c05e93..3b8350c164f 100644 --- a/test/integration/testpaths/testpath_volumelifecycle.py +++ b/test/integration/testpaths/testpath_volumelifecycle.py @@ -732,7 +732,7 @@ class TestPathVolume(cloudstackTestCase): self.assertGreater( len(list_pool), 0, - "Check the list list storagepoolresponse for vm id: %s" % + "Check the list storagepoolresponse for vm id: %s" % list_volume[0].storageid) list_pools = StoragePool.list(self.apiclient, scope=list_pool[0].scope diff --git a/test/scripts/deploycluster.sh b/test/scripts/deploycluster.sh index 91111d98ff1..7d7e168cb7a 100755 --- a/test/scripts/deploycluster.sh +++ b/test/scripts/deploycluster.sh @@ -49,7 +49,7 @@ deploy_server() { echo "Deploying management server software on remote machine $1" rsync -avzh -e ssh $path/cloudstack-oss root@$1:/root/ - if [ $? -gt 0 ]; then echo "failed to rsync software between $path/cloudstack-oss and and remote machine $1"; return 2; fi + if [ $? -gt 0 ]; then echo "failed to rsync software between $path/cloudstack-oss and remote machine $1"; return 2; fi ssh root@$1 "cd /root/cloudstack-oss && ant clean build-all deploy-server" if [ $? -gt 0 ]; then echo "failed to deploy cluster on $1"; return 2; fi diff --git a/test/systemvm/test_update_config.py b/test/systemvm/test_update_config.py index 6b78bfbee42..5bdfb05dc73 100644 --- a/test/systemvm/test_update_config.py +++ b/test/systemvm/test_update_config.py @@ -280,7 +280,7 @@ class UpdateConfigTestCase(SystemVMTestCase): unique["eth%s" % ips["nic_dev_id"]] = 1 # If this is the first run, the drops will not be there yet - # this is so I can get get a true count of what is explicitly added + # this is so I can get a true count of what is explicitly added drops = len(unique) for dev in unique: drops -= ip.count_fw_rules('ACL_INBOUND_%s -j DROP' % dev) diff --git a/tools/marvin/marvin/misc/build/CI.md b/tools/marvin/marvin/misc/build/CI.md index 3400e7ef765..d98685091f8 100644 --- a/tools/marvin/marvin/misc/build/CI.md +++ b/tools/marvin/marvin/misc/build/CI.md @@ -90,7 +90,7 @@ h. puppet - set puppetmaster to listen on 8140 2. NFS storage - the nfs server is a single server serving as both primary and secondary storage. This is likely a limitation when compared to true production deployments but serves in good stead for a test setup. Where it becomes a limitation is in testing different storage backends. Object stores, local storage, clustered local storage etc are not addressed by this setup. -3. Hypervisor hosts - There currently are 4 hosts in this environment. These are arranged at the moment in three pods so as to be capable of being deployed in a two zone environment. One zone with two pods and and a second zone with a single pod. This covers tests that depend on +3. Hypervisor hosts - There currently are 4 hosts in this environment. These are arranged at the moment in three pods so as to be capable of being deployed in a two zone environment. One zone with two pods and a second zone with a single pod. This covers tests that depend on a. single zone/pod/cluster b. multiple cluster c. inter-zone tests