Merge branch '4.17'

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

@@ -457,7 +457,7 @@ public class Agent implements HandlerFactory, IAgentControl {
             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 @@ public class Agent implements HandlerFactory, IAgentControl {
         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 @@ public class Agent implements HandlerFactory, IAgentControl {
             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 class AgentShell implements IAgentShell, Daemon {
 
             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 @@ public class OVFHelper {
     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 @@ public interface LoadBalancingRulesService {
      * @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 @@ public interface LoadBalancingRulesService {
      * @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 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba
         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 @@ public interface UserVmService {
     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 class ReleasePodIpCmdByAdmin extends BaseCmd {
         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/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 class DeleteSecurityGroupCmd extends BaseCmd {
         }
 
         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 class RestoreVMCmd extends BaseAsyncCmd implements UserCmd {
 
     @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

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

@@ -213,25 +213,25 @@ class OvmStoragePool(OvmObject):
     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)
+            originalConf = re.sub(r"\n\s*\n*", "\n", originalConf)
-            logger.debug(OvmStoragePool.prepareOCFS2Nodes, "Configure /etc/hosts:%s\n"%orignalConf)
+            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 class Ovm3VmSupport {
                 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 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes
                         }
                     }
 
-                    final VmStatsEntry vmStats = new VmStatsEntry(0, NumberUtils.toDouble(memkb) * 1024, NumberUtils.toDouble(guestMemusage) * 1024, NumberUtils.toDouble(memlimit) * 1024,
+                    double doubleMemKb = NumberUtils.toDouble(memkb);
-                            maxCpuUsage, networkReadKBs, networkWriteKBs, NumberUtils.toInt(numberCPUs), diskReadKbs, diskWriteKbs, diskReadIops, diskWriteIops, "vm");
+                    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);
 
                 }

server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java

@@ -503,7 +503,7 @@ public class RollingMaintenanceManagerImpl extends ManagerBase implements Rollin
     /**
      * Execute stage on host
      * @return tuple: (SUCCESS, DETAILS, AVOID_MAINTENANCE) where:
-     *                  - SUCCESS: True if stage is successfull
+     *                  - SUCCESS: True if stage is successful
      *                  - DETAILS: Information retrieved by the host after executing the stage
      *                  - AVOID_MAINTENANCE: True if maintenance stage must be avoided
      */
@@ -519,7 +519,7 @@ public class RollingMaintenanceManagerImpl extends ManagerBase implements Rollin
     /**
      * Send rolling maintenance command to a host to perform a certain stage specified in cmd
      * @return tuple: (SUCCESS, DETAILS, AVOID_MAINTENANCE) where:
-     *                  - SUCCESS: True if stage is successfull
+     *                  - SUCCESS: True if stage is successful
      *                  - DETAILS: Information retrieved by the host after executing the stage
      *                  - AVOID_MAINTENANCE: True if maintenance stage must be avoided
      */
@@ -617,7 +617,7 @@ public class RollingMaintenanceManagerImpl extends ManagerBase implements Rollin
         }
         List<String> hostTags = hostTagsDao.getHostTags(host.getId());
 
-        int sucessfullyCheckedVmMigrations = 0;
+        int successfullyCheckedVmMigrations = 0;
         for (VMInstanceVO runningVM : vmsRunning) {
             boolean canMigrateVm = false;
             ServiceOfferingVO serviceOffering = serviceOfferingDao.findById(runningVM.getServiceOfferingId());
@@ -656,9 +656,9 @@ public class RollingMaintenanceManagerImpl extends ManagerBase implements Rollin
                 s_logger.error(msg);
                 return new Pair<>(false, msg);
             }
-            sucessfullyCheckedVmMigrations++;
+            successfullyCheckedVmMigrations++;
         }
-        if (sucessfullyCheckedVmMigrations != vmsRunning.size()) {
+        if (successfullyCheckedVmMigrations != vmsRunning.size()) {
             String migrationCheckDetails = String.format("%s cannot enter maintenance mode as capacity check failed for hosts in cluster %s", host, cluster);
             return new Pair<>(false, migrationCheckDetails);
         }

server/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java

@@ -409,7 +409,7 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR
 
             success = true;
         } catch (ResourceUnavailableException e) {
-            throw new CloudRuntimeException("Failed to update removed load balancer details from gloabal load balancer");
+            throw new CloudRuntimeException("Failed to update removed load balancer details from global load balancer");
         }
 
         return success;
@@ -479,7 +479,7 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR
                 applyGlobalLoadBalancerRuleConfig(gslbRuleId, true);
             }
         } catch (ResourceUnavailableException e) {
-            throw new CloudRuntimeException("Failed to update the gloabal load balancer");
+            throw new CloudRuntimeException("Failed to update the global load balancer");
         }
 
         Transaction.execute(new TransactionCallbackNoReturn() {

server/src/test/java/com/cloud/vpc/NetworkACLManagerTest.java

@@ -250,7 +250,7 @@ public class NetworkACLManagerTest extends TestCase {
 
         Mockito.verify(aclItem, Mockito.times(4)).getState();
 
-        assertTrue("Operation should be successfull!", result);
+        assertTrue("Operation should be successful!", result);
     }
 
     @Configuration

services/console-proxy/rdpconsole/src/main/java/vncclient/vnc/Vnc33Authentication.java

@@ -229,7 +229,7 @@ public class Vnc33Authentication extends OneTimeSwitch {
         case RfbConstants.VNC_AUTH_OK: {
             // Nothing to do
             if (verbose)
-                System.out.println("[" + this + "] INFO: Authentication successfull.");
+                System.out.println("[" + this + "] INFO: Authentication successful.");
             break;
         }
 

test/integration/component/test_add_remove_network.py

@@ -926,7 +926,7 @@ class TestRemoveNetworkFromVirtualMachine(cloudstackTestCase):
         # 'deployVirtualMachine' api with 'ipaddress' as one of the parameters.
         # 4. Acquire public IP in n3 network.
         # 5. Configure PF on the acquired IP and assign it to vm v2
-        # 6. Try to remove nic  n2 from v1. Should be successfull
+        # 6. Try to remove nic  n2 from v1. Should be successful
         # There was a bug due to both vms has same ip address, so not allowing to remove nic
 
         vm1 = self.virtual_machine

test/integration/component/test_egress_fw_rules.py

@@ -599,7 +599,7 @@ class TestEgressFWRules(cloudstackTestCase):
         # 1. deploy VM.using network offering with egress policy true.
         # 2. create egress rule without specific CIDR.
         # 3. login to VM.
-        # 4. access to public network should not be successfull.
+        # 4. access to public network should not be successful.
         self.create_vm()
         self.createEgressRule(cidr=None)
         self.exec_script_on_user_vm('ping -c 1 www.google.com',
@@ -615,7 +615,7 @@ class TestEgressFWRules(cloudstackTestCase):
         # 1. deploy VM.using network offering with egress policy false.
         # 2. create egress rule without specific CIDR.
         # 3. login to VM.
-        # 4. access to public network should be successfull.
+        # 4. access to public network should be successful.
         self.create_vm(egress_policy=False)
         self.createEgressRule(cidr=None)
         self.exec_script_on_user_vm('ping -c 1 www.google.com',
@@ -631,7 +631,7 @@ class TestEgressFWRules(cloudstackTestCase):
         # 1. deploy VM using network offering with egress policy true.
         # 2. create egress rule without specific end port.
         # 3. login to VM.
-        # 4. access to public network should not be successfull.
+        # 4. access to public network should not be successful.
         self.create_vm()
         self.createEgressRule(protocol='tcp', start_port=80, cidr=TestEgressFWRules.zone.guestcidraddress)
         self.exec_script_on_user_vm(' wget -t1 http://apache.claz.org/favicon.ico 2>&1',
@@ -779,7 +779,7 @@ class TestEgressFWRules(cloudstackTestCase):
         # 1. deploy VM using network offering with egress policy true.
         # 2. create egress rule valid cidr and port range.
         # 3. reboot router.
-        # 4. access to public network should not be successfull.
+        # 4. access to public network should not be successful.
         self.create_vm()
         self.createEgressRule(cidr=TestEgressFWRules.zone.guestcidraddress)
         self.reboot_Router()
@@ -796,7 +796,7 @@ class TestEgressFWRules(cloudstackTestCase):
         # 1. deploy VM using network offering with egress policy false.
         # 2. create egress rule valid  cidr port range.
         # 3. reboot router.
-        # 4. access to public network should be successfull.
+        # 4. access to public network should be successful.
         self.create_vm(egress_policy=False)
         self.createEgressRule(cidr=TestEgressFWRules.zone.guestcidraddress)
         self.reboot_Router()

test/src-not-used/main/java/com/cloud/test/stress/StressTestDirectAttach.java

@@ -1107,7 +1107,7 @@ public class StressTestDirectAttach {
                 if (isAuthenticated == false) {
                     return "Authentication failed";
                 } else {
-                    s_logger.info("Authentication is successfull");
+                    s_logger.info("Authentication is successful");
                 }
 
                 try {

test/src-not-used/main/java/com/cloud/test/stress/TestClientWithAPI.java

@@ -2037,7 +2037,7 @@ public class TestClientWithAPI {
                 if (isAuthenticated == false) {
                     return "Authentication failed";
                 } else {
-                    s_logger.info("Authentication is successfull");
+                    s_logger.info("Authentication is successful");
                 }
 
                 try {

ui/src/components/view/SearchView.vue

@@ -51,6 +51,8 @@
                 v-ctrl-enter="handleSubmit">
                 <a-form-item
                   v-for="(field, index) in fields"
+                  :ref="field.name"
+                  :name="field.name"
                   :key="index"
                   :label="field.name==='keyword' ?
                     ('listAnnotations' in $store.getters.apis ? $t('label.annotation') : $t('label.name')) : $t('label.' + field.name)">