Merge branch '4.17'

Author: DaanHoogland

agent/src/main/java/com/cloud/agent/Agent.java

@@ -457,7 +457,7 @@ public void sendStartup(final Link link) {
             try {
                 link.send(request.toBytes());
             } catch (final ClosedChannelException e) {
-                s_logger.warn("Unable to send reques: " + request.toString());
+                s_logger.warn("Unable to send request: " + request.toString());
             }
         }
     }
@@ -467,7 +467,7 @@ protected void setupStartupCommand(final StartupCommand startup) {
         try {
             addr = InetAddress.getLocalHost();
         } catch (final UnknownHostException e) {
-            s_logger.warn("unknow host? ", e);
+            s_logger.warn("unknown host? ", e);
             throw new CloudRuntimeException("Cannot get local IP address");
         }
 
@@ -954,7 +954,7 @@ private void postRequest(final Request request) throws AgentControlChannelExcept
             try {
                 _link.send(request.toBytes());
             } catch (final ClosedChannelException e) {
-                s_logger.warn("Unable to post agent control reques: " + request.toString());
+                s_logger.warn("Unable to post agent control request: " + request.toString());
                 throw new AgentControlChannelException("Unable to post agent control request due to " + e.getMessage());
             }
         } else {

agent/src/main/java/com/cloud/agent/AgentShell.java

@@ -362,7 +362,7 @@ public void init(String[] args) throws ConfigurationException {
 
             s_logger.info("Agent started");
         } else {
-            s_logger.error("Could not start the Agent because the absolut path of the \"log4j-cloud.xml\" file cannot be determined.");
+            s_logger.error("Could not start the Agent because the absolute path of the \"log4j-cloud.xml\" file cannot be determined.");
         }
 
         final Class<?> c = this.getClass();

api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java

@@ -521,7 +521,7 @@ OVFFile getFileDefinitionFromDiskDefinition(String fileRef, List<OVFFile> files)
     public List<OVFNetworkTO> getNetPrerequisitesFromDocument(Document doc) throws InternalErrorException {
         if (doc == null) {
             if (s_logger.isTraceEnabled()) {
-                s_logger.trace("no document to parse; returning no prerequiste networks");
+                s_logger.trace("no document to parse; returning no prerequisite networks");
             }
             return Collections.emptyList();
         }

api/src/main/java/com/cloud/network/lb/LoadBalancingRulesService.java

@@ -65,7 +65,7 @@ LoadBalancer createPublicLoadBalancerRule(String xId, String name, String descri
      * @param cmd
      *            the command specifying the stickiness method name, params (name,value pairs), policy name and
      *            description.
-     * @return the newly created stickiness policy if successfull, null otherwise
+     * @return the newly created stickiness policy if successful, null otherwise
      * @thows NetworkRuleConflictException
      */
     public StickinessPolicy createLBStickinessPolicy(CreateLBStickinessPolicyCmd cmd) throws NetworkRuleConflictException;
@@ -81,7 +81,7 @@ LoadBalancer createPublicLoadBalancerRule(String xId, String name, String descri
      * @param cmd
      *            the command specifying the stickiness method name, params
      *            (name,value pairs), policy name and description.
-     * @return the newly created stickiness policy if successfull, null
+     * @return the newly created stickiness policy if successful, null
      *         otherwise
      * @thows NetworkRuleConflictException
      */

api/src/main/java/com/cloud/storage/Volume.java

@@ -56,7 +56,7 @@ enum State {
         NotUploaded("The volume entry is just created in DB, not yet uploaded"),
         UploadInProgress("Volume upload is in progress"),
         UploadError("Volume upload encountered some error"),
-        UploadAbandoned("Volume upload is abandoned since the upload was never initiated within a specificed time"),
+        UploadAbandoned("Volume upload is abandoned since the upload was never initiated within a specified time"),
         Attaching("The volume is attaching to a VM from Ready state.");
 
         String _description;

api/src/main/java/com/cloud/vm/UserVmService.java

@@ -502,7 +502,7 @@ UserVm upgradeVirtualMachine(ScaleVMCmd cmd) throws ResourceUnavailableException
     String getVmUserData(long vmId);
 
     /**
-     * determin whether the uservm should be visible to the end user
+     * determine whether the uservm should be visible to the end user
      * @return  value of the display flag
      */
     public boolean isDisplayResourceEnabled(Long vmId);

api/src/main/java/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java

@@ -69,7 +69,7 @@ public void execute() {
         boolean result = _networkService.releasePodIp(this);
         if (result) {
             SuccessResponse response = new SuccessResponse(getCommandName());
-            response.setDisplayText("IP is released sucessfully");
+            response.setDisplayText("IP is released successfully");
             setResponseObject(response);
         } else {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to release  Pod ip ");

api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java

@@ -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 specificed 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 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")
     private Integer vlan;
 
     @Parameter(name = ApiConstants.NETMASK, type = CommandType.STRING, required = true, description = "the netmask for storage network")

api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java

@@ -126,7 +126,7 @@ public void execute()  {
 
     private void validateInput() {
         if (email == null && username == null) {
-            throw new InvalidParameterValueException("Must specify atleast username");
+            throw new InvalidParameterValueException("Must specify at least username");
         }
         if (email != null && username == null) {
             throw new InvalidParameterValueException("Must specify username for given email ID");

api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java

@@ -37,7 +37,7 @@ public class QueryAsyncJobResultCmd extends BaseCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.JOB_ID, type = CommandType.UUID, entityType = AsyncJobResponse.class, required = true, description = "the ID of the asychronous job")
+    @Parameter(name = ApiConstants.JOB_ID, type = CommandType.UUID, entityType = AsyncJobResponse.class, required = true, description = "the ID of the asynchronous job")
     private Long id;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/RemoveFromGlobalLoadBalancerRuleCmd.java

@@ -67,7 +67,7 @@ public class RemoveFromGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
                collectionType = CommandType.UUID,
                entityType = FirewallRuleResponse.class,
                required = true,
-               description = "the list load balancer rules that will be assigned to gloabal load balancer rule")
+               description = "the list load balancer rules that will be assigned to global load balancer rule")
     private List<Long> loadBalancerRulesIds;
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/DeleteSecurityGroupCmd.java

@@ -94,7 +94,7 @@ public Long getId() {
         }
 
         if (id == null) {
-            throw new InvalidParameterValueException("Either id or name parameter is requred by deleteSecurityGroup command");
+            throw new InvalidParameterValueException("Either id or name parameter is required by deleteSecurityGroup command");
         }
 
         return id;

api/src/main/java/org/apache/cloudstack/api/command/user/vm/RestoreVMCmd.java

@@ -67,7 +67,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Restore a VM to orignal template or specific snapshot";
+        return "Restore a VM to original template or specific snapshot";
     }
 
     @Override

api/src/main/java/org/apache/cloudstack/api/response/LBStickinessPolicyResponse.java

@@ -55,7 +55,7 @@ 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 delimitor .
+    // 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
     // 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

core/src/main/java/com/cloud/agent/api/routing/SetFirewallRulesCommand.java

@@ -55,7 +55,7 @@ public String[][] generateFwRules() {
              */
             if (fwTO.revoked()) {
                 StringBuilder sb = new StringBuilder();
-                /* This entry is added just to make sure atleast there will one entry in the list to get the ipaddress */
+                /* This entry is added just to make sure at least there will one entry in the list to get the ipaddress */
                 sb.append(fwTO.getSrcIp()).append(":reverted:0:0:0:0:").append(fwTO.getId()).append(":");
                 String fwRuleEntry = sb.toString();
                 toAdd.add(fwRuleEntry);

core/src/main/java/com/cloud/agent/api/routing/SetNetworkACLCommand.java

@@ -60,7 +60,7 @@ public String[][] generateFwRules() {
              */
             if (aclTO.revoked() == true) {
                 final StringBuilder sb = new StringBuilder();
-                /* This entry is added just to make sure atleast there will one entry in the list to get the ipaddress */
+                /* This entry is added just to make sure at least there will one entry in the list to get the ipaddress */
                 List<String> revertRuleItems = Arrays.asList("", "reverted", "0", "0", "0", "");
                 sb.append(aclTO.getTrafficType().toString()).append(String.join(RULE_DETAIL_SEPARATOR, revertRuleItems));
                 final String aclRuleEntry = sb.toString();

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade410to420.java

@@ -719,7 +719,7 @@ private void persistLegacyZones(Connection conn) {
                         dcList = new ArrayList<String>();
                         count = 0L;
                         // Legacy zone term is meant only for VMware
-                        // Legacy zone is a zone with atleast 2 clusters & with multiple DCs or VCs
+                        // Legacy zone is a zone with at least 2 clusters & with multiple DCs or VCs
                         clusters = clustersQuery.executeQuery();
                         if (!clusters.next()) {
                             continue; // Ignore the zone without any clusters

plugins/hypervisors/ovm/src/main/scripts/vm/hypervisor/ovm/OvmStoragePoolModule.py

@@ -213,25 +213,25 @@ def downloadTemplate(uuid, secPath):
     def prepareOCFS2Nodes(clusterName, nodeString):
         def configureEtcHosts(nodes):
             if not exists(ETC_HOSTS):
-                orignalConf = ""
+                originalConf = ""
             else:
                 fd = open(ETC_HOSTS, "r")
-                orignalConf = fd.read()
+                originalConf = fd.read()
                 fd.close()
 
             pattern = r"(.*%s.*)|(.*%s.*)"
             newlines = []
             for n in nodes:
                 p = pattern % (n["ip_address"], n["name"])
-                orignalConf = re.sub(p, "", orignalConf)
+                originalConf = re.sub(p, "", originalConf)
                 newlines.append("%s\t%s\n"%(n["ip_address"], n["name"]))
 
-            orignalConf = orignalConf + "".join(newlines)
+            originalConf = originalConf + "".join(newlines)
             # remove extra empty lines
-            orignalConf = re.sub(r"\n\s*\n*", "\n", orignalConf)
-            logger.debug(OvmStoragePool.prepareOCFS2Nodes, "Configure /etc/hosts:%s\n"%orignalConf)
+            originalConf = re.sub(r"\n\s*\n*", "\n", originalConf)
+            logger.debug(OvmStoragePool.prepareOCFS2Nodes, "Configure /etc/hosts:%s\n"%originalConf)
             fd = open(ETC_HOSTS, "w")
-            fd.write(orignalConf)
+            fd.write(originalConf)
             fd.close()
 
         def configureHostName(nodes):

plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3VmSupport.java

@@ -223,7 +223,7 @@ public MigrateAnswer execute(final MigrateCommand cmd) {
                 xen.migrateVm(ovmObject.deDash(vm.getVmRootDiskPoolId()),
                         vm.getVmUuid(), destIp);
                 state = State.Stopping;
-                msg = "Migration of " + vmName + " successfull";
+                msg = "Migration of " + vmName + " successful";
                 return new MigrateAnswer(cmd, true, msg, null);
             } catch (Ovm3ResourceException e) {
                 msg = "Pooled VM Migrate" + ": Migration of " + vmName + " to "

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

@@ -6535,8 +6535,11 @@ private HashMap<String, VmStatsEntry> getVmStats(List<String> vmNames) throws Ex
                         }
                     }
 
-                    final VmStatsEntry vmStats = new VmStatsEntry(0, NumberUtils.toDouble(memkb) * 1024, NumberUtils.toDouble(guestMemusage) * 1024, NumberUtils.toDouble(memlimit) * 1024,
-                            maxCpuUsage, networkReadKBs, networkWriteKBs, NumberUtils.toInt(numberCPUs), diskReadKbs, diskWriteKbs, diskReadIops, diskWriteIops, "vm");
+                    double doubleMemKb = NumberUtils.toDouble(memkb);
+                    double guestFreeMem =  doubleMemKb - NumberUtils.toDouble(guestMemusage);
+
+                    final VmStatsEntry vmStats = new VmStatsEntry(0, doubleMemKb * 1024, guestFreeMem * 1024, NumberUtils.toDouble(memlimit) * 1024, maxCpuUsage, networkReadKBs,
+                            networkWriteKBs, NumberUtils.toInt(numberCPUs), diskReadKbs, diskWriteKbs, diskReadIops, diskWriteIops, "vm");
                     vmResponseMap.put(name, vmStats);
 
                 }

plugins/network-elements/ovs/src/main/java/com/cloud/network/element/OvsElement.java

@@ -669,7 +669,7 @@ private static boolean containsOnlyNumbers(final String str, final String endCha
             boolean matchedEndChar = false;
             if (str.length() < 2)
             {
-                return false; // atleast one numeric and one char. example:
+                return false; // at least one numeric and one char. example:
             }
             // 3h
             final char strEnd = str.toCharArray()[str.length() - 1];

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/client/ScaleIOGatewayClientImpl.java

@@ -792,7 +792,7 @@ public boolean migrateVolume(final String srcVolumeId, final String destPoolId,
                             long timeElapsedInSecs = (System.currentTimeMillis() - migrationStartTime) / 1000;
                             int timeRemainingInSecs = (int) (timeoutInSecs - timeElapsedInSecs);
                             if (timeRemainingInSecs > (timeoutInSecs / 2)) {
-                                // Try to pause gracefully (continue the migration) if atleast half of the time is remaining
+                                // Try to pause gracefully (continue the migration) if at least half of the time is remaining
                                 pauseVolumeMigration(srcVolumeId, false);
                                 status = waitForVolumeMigrationToComplete(volume.getVtreeId(), timeRemainingInSecs);
                             }

plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapManagerImplSpec.groovy

@@ -288,7 +288,7 @@ class LdapManagerImplSpec extends spock.lang.Specification {
         def ldapManager = new LdapManagerImpl(ldapConfigurationDao, ldapContextFactory, ldapUserManagerFactory, ldapConfiguration)
         when: "We search for users"
         def result = ldapManager.searchUsers("rmurphy");
-        then: "A list of atleast 1 is returned"
+        then: "A list of at least 1 is returned"
         result.size() > 0;
     }
 
@@ -390,7 +390,7 @@ class LdapManagerImplSpec extends spock.lang.Specification {
         def ldapManager = new LdapManagerImpl(ldapConfigurationDao, ldapContextFactory, ldapUserManagerFactory, ldapConfiguration)
         when: "A request for configurations is made"
         def result = ldapManager.listConfigurations(new LdapListConfigurationCmd())
-        then: "Then atleast 1 ldap configuration is returned"
+        then: "Then at least 1 ldap configuration is returned"
         result.second() > 0
     }
 

plugins/user-authenticators/ldap/src/test/groovy/org/apache/cloudstack/ldap/LdapSearchUserCmdSpec.groovy

@@ -55,7 +55,7 @@ class LdapSearchUserCmdSpec extends spock.lang.Specification {
         def ldapUserSearchCmd = new LdapUserSearchCmd(ldapManager)
 	when: "The command is executed"
 		ldapUserSearchCmd.execute()
-	then: "A array with length of atleast 1 is returned"
+	then: "A array with length of at least 1 is returned"
 		ldapUserSearchCmd.responseObject.getResponses().size() > 0
     }
 

server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java

@@ -1563,7 +1563,7 @@ protected Pair<Map<Volume, List<StoragePool>>, List<Volume>> findSuitablePoolsFo
         Map<Volume, List<StoragePool>> suitableVolumeStoragePools = new HashMap<Volume, List<StoragePool>>();
         List<Volume> readyAndReusedVolumes = new ArrayList<Volume>();
 
-        // There should be atleast the ROOT volume of the VM in usable state
+        // There should be at least the ROOT volume of the VM in usable state
         if (volumesTobeCreated.isEmpty()) {
             // OfflineVmwareMigration: find out what is wrong with the id of the vm we try to start
             throw new CloudRuntimeException("Unable to create deployment, no usable volumes found for the VM: " + vmProfile.getId());

server/src/main/java/com/cloud/event/ActionEventUtils.java

@@ -224,7 +224,7 @@ private static void publishOnEventBus(long userId, long accountId, String eventC
         eventDescription.put("status", state.toString());
         eventDescription.put("entity", resourceType);
         eventDescription.put("entityuuid", resourceUuid);
-        //Put all the first class entities that are touched during the action. For now atleast put in the vmid.
+        //Put all the first class entities that are touched during the action. For now at least put in the vmid.
         populateFirstClassEntities(eventDescription);
         eventDescription.put("description", description);
 

server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java

@@ -537,7 +537,7 @@ public AutoScalePolicyVO doInTransaction(TransactionStatus status) {
                     for (ConditionVO condition : conditions) {
                         if (counterIds.contains(condition.getCounterid())) {
                             throw new InvalidParameterValueException(
-                                "atleast two conditions in the conditionids have the same counter. It is not right to apply two different conditions for the same counter");
+                                "at least two conditions in the conditionids have the same counter. It is not right to apply two different conditions for the same counter");
                         }
                         counterIds.add(condition.getCounterid());
                     }