apache · nvazquez · Mar 29, 2022 · Mar 23, 2022 · Mar 23, 2022
diff --git a/agent/bindir/cloud-setup-agent.in b/agent/bindir/cloud-setup-agent.in
@@ -80,7 +80,7 @@ def getUserInputs():
     network = input("Please choose which network used to create VM:[%s]"%defNic)
     if network == "":
         if defNic == "":
-            print("You need to specifiy one of Nic or bridge on your system")
+            print("You need to specify one of Nic or bridge on your system")
             exit(1)
         elif network == "":
             network = defNic

diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
@@ -263,7 +263,7 @@ hypervisor.type=kvm
 # Recommend value is: i6300esb
 #
 # vm.watchdog.action=none
-# Action to take when the Guest/Instance is no longer notifiying the Watchdog
+# Action to take when the Guest/Instance is no longer notifying the Watchdog
 # timer.
 # For all actions refer to the libvirt documentation.
 # Recommended values are: none, reset and poweroff.

diff --git a/agent/src/main/java/com/cloud/agent/Agent.java b/agent/src/main/java/com/cloud/agent/Agent.java
@@ -568,7 +568,7 @@ public void processStartupAnswer(final Answer answer, final Response response, f
             return;
         }
 
-        s_logger.info("Proccess agent startup answer, agent id = " + startup.getHostId());
+        s_logger.info("Process agent startup answer, agent id = " + startup.getHostId());
 
         setId(startup.getHostId());
         _pingInterval = (long)startup.getPingInterval() * 1000; // change to ms.

diff --git a/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java b/agent/src/main/java/com/cloud/agent/direct/download/DirectTemplateDownloaderImpl.java
@@ -125,7 +125,7 @@ public boolean validateChecksum() {
                     s_logger.info("Performing checksum validation for downloaded template " + templateId + " using " + checksum + ", retries left: " + retry);
                     valid = DigestHelper.check(checksum, new FileInputStream(downloadedFilePath));
                     if (!valid && retry > 0) {
-                        s_logger.info("Checksum validation failded, re-downloading template");
+                        s_logger.info("Checksum validation failed, re-downloading template");
                         redownload = true;
                         resetDownloadFile();
                         downloadTemplate();

diff --git a/api/src/main/java/com/cloud/network/NetworkMigrationResponder.java b/api/src/main/java/com/cloud/network/NetworkMigrationResponder.java
@@ -43,7 +43,7 @@ public interface NetworkMigrationResponder {
      * Cancel for migration preparation.
      *
      * This method will be called per nic when the entire vm migration
-     * process failed and need to release the resouces that was
+     * process failed and need to release the resources that was
      * allocated at the migration preparation.
      * @param nic destination nic
      * @param network destination network

diff --git a/api/src/main/java/com/cloud/network/guru/NetworkGuru.java b/api/src/main/java/com/cloud/network/guru/NetworkGuru.java
@@ -41,7 +41,7 @@
  * A Network goes through the following life cycles through the NetworkGuru.
  *   - When a guest network is created, NetworkGuru is asked to "design" the network.
  *     This means the NetworkGuru checks the parameters such as cidr, gateway,
- *     vlan, etc and returns a network that can work with those paremeters.
+ *     vlan, etc and returns a network that can work with those parameters.
  *     Note that at this point the network is only a virtual network.  It has
  *     not been substantiated with resources, such as vlan, to make the network
  *     functional in the physical environment.  At this stage, the network is in

diff --git a/api/src/main/java/com/cloud/server/ManagementService.java b/api/src/main/java/com/cloud/server/ManagementService.java
@@ -91,7 +91,7 @@ public interface ManagementService {
     static final String Name = "management-server";
 
     /**
-     * returns the a map of the names/values in the configuraton table
+     * returns the a map of the names/values in the configuration table
      *
      * @return map of configuration name/values
      */

diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
@@ -33,7 +33,7 @@ public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
     @Parameter(name = ApiConstants.BOOTABLE, type = CommandType.BOOLEAN, description = "true if image is bootable, false otherwise; available only for updateIso API")
     private Boolean bootable;
 
-    @Parameter(name = ApiConstants.REQUIRES_HVM, type = CommandType.BOOLEAN, description = "true if the template requres HVM, false otherwise; available only for updateTemplate API")
+    @Parameter(name = ApiConstants.REQUIRES_HVM, type = CommandType.BOOLEAN, description = "true if the template requires HVM, false otherwise; available only for updateTemplate API")
     private Boolean requiresHvm;
 
     @Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, description = "the display text of the image", length = 4096)

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -96,7 +96,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd implements UserCmd {
     @Parameter(name = ApiConstants.SSHKEY_ENABLED, type = CommandType.BOOLEAN, description = "true if the template supports the sshkey upload feature; default is false")
     private Boolean sshKeyEnabled;
 
-    @Parameter(name = ApiConstants.REQUIRES_HVM, type = CommandType.BOOLEAN, description = "true if the template requres HVM, false otherwise")
+    @Parameter(name = ApiConstants.REQUIRES_HVM, type = CommandType.BOOLEAN, description = "true if the template requires HVM, false otherwise")
     private Boolean requiresHvm;
 
     @Parameter(name = ApiConstants.SNAPSHOT_ID,

diff --git a/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateRoleCmdTest.java b/api/src/test/java/org/apache/cloudstack/api/command/test/UpdateRoleCmdTest.java
@@ -55,7 +55,7 @@ public void testUpdateSuccess() {
         when(roleService.findRole(updateRoleCmd.getRoleId())).thenReturn(role);
         when(role.getId()).thenReturn(1L);
         when(role.getUuid()).thenReturn("12345-abcgdkajd");
-        when(role.getDescription()).thenReturn("Defualt user");
+        when(role.getDescription()).thenReturn("Default user");
         when(role.getName()).thenReturn("User");
         when(role.getRoleType()).thenReturn(RoleType.User);
         when(roleService.updateRole(role,updateRoleCmd.getRoleName(),updateRoleCmd.getRoleType(),updateRoleCmd.getRoleDescription())).thenReturn(role);

diff --git a/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -347,7 +347,7 @@ public Pair<List<? extends FirewallRule>, Integer> listFirewallRules(IListFirewa
         return new Pair<List<? extends FirewallRule>, Integer>(result.first(), result.second());
     }
 
-    //Intermediate funciton used in detectRulesConflict to check for the conflicting cidrs in the rules already applied and the newRule being applied.
+    //Intermediate function used in detectRulesConflict to check for the conflicting cidrs in the rules already applied and the newRule being applied.
     boolean detectConflictingCidrs(List<String> cidrList1, List<String> cidrList2){
         if(cidrList1.isEmpty() && cidrList2.isEmpty()){
             return true;

diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py
@@ -984,7 +984,7 @@ def test_03_multiple_netscaler_full_capacilty(self):
     @attr(configuration = "network.gc")
     @attr(tags = ["advancedns"])
     def test_04_delete_account_after_capacity_full(self):
-        """Test delete and add resouces after netscaler device capacity is full
+        """Test delete and add resources after netscaler device capacity is full
         """
 
 

diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py
@@ -2900,7 +2900,7 @@ def test_vpc_force_delete_domain(self):
         child_domain.delete(self.apiclient, cleanup=True)
 
         self.debug("Waiting for account.cleanup.interval" +
-                   " to cleanup any remaining resouces")
+                   " to cleanup any remaining resources")
         # Sleep 3*account.gc to ensure that all resources are deleted
         wait_for_cleanup(self.apiclient, ["account.cleanup.interval"] * 3)
 
@@ -3128,7 +3128,7 @@ def test_vpc_delete_account(self):
 
         # Verify all the resources owned by the account are deleted
         self.debug("Waiting for account.cleanup.interval" +
-                   " to cleanup any remaining resouces")
+                   " to cleanup any remaining resources")
         # Sleep 3*account.gc to ensure that all resources are deleted
         wait_for_cleanup(self.apiclient, ["account.cleanup.interval"] * 3)
 

diff --git a/test/integration/smoke/test_accounts.py b/test/integration/smoke/test_accounts.py
@@ -1955,7 +1955,7 @@ def test_forceDeleteDomain(self):
 
         except Exception as e:
             self.debug("Waiting for account.cleanup.interval" +
-                       " to cleanup any remaining resouces")
+                       " to cleanup any remaining resources")
             # Sleep 3*account.gc to ensure that all resources are deleted
             wait_for_cleanup(self.apiclient, ["account.cleanup.interval"] * 3)
             with self.assertRaises(CloudstackAPIException):

diff --git a/tools/ngui/precache.py b/tools/ngui/precache.py
diff --git a/ui/public/locales/ar.json b/ui/public/locales/ar.json
@@ -2273,7 +2273,7 @@
 "message.setup.physical.network.during.zone.creation": "When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.<br/><br/><strong>Drag and drop one or more traffic types</strong> onto each physical network.",
 "message.setup.physical.network.during.zone.creation.basic": "When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.",
 "message.setup.successful": "Cloud setup successful!",
-"message.specifiy.tag.key.value": "Please specify a tag key and value",
+"message.specify.tag.key.value": "Please specify a tag key and value",
 "message.specify.url": "Please specify URL",
 "message.step.1.desc": "Please select a template for your new virtual instance. You can also choose to select a blank template from which an ISO image can be installed onto.",
 "message.step.2.continue": "Please select a service offering to continue",

diff --git a/ui/public/locales/ca.json b/ui/public/locales/ca.json
@@ -2275,7 +2275,7 @@
 "message.setup.physical.network.during.zone.creation": "When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined.<br/><br/><strong>Drag and drop one or more traffic types</strong> onto each physical network.",
 "message.setup.physical.network.during.zone.creation.basic": "When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>drag and drop</strong> other traffic types onto the physical network.",
 "message.setup.successful": "Instal\u00b7laci\u00f3 del cloud correcte!",
-"message.specifiy.tag.key.value": "Please specify a tag key and value",
+"message.specify.tag.key.value": "Please specify a tag key and value",
 "message.specify.url": "Please specify URL",
 "message.step.1.desc": "Please select a template for your new virtual instance. You can also choose to select a blank template from which an ISO image can be installed onto.",
 "message.step.2.continue": "Please select a service offering to continue",

diff --git a/ui/public/locales/de_DE.json b/ui/public/locales/de_DE.json
@@ -2962,9 +2962,9 @@
 "message.setup.physical.network.during.zone.creation": "Wenn Sie eine erweiterte Zone hinzufügen, müssen Sie ein oder mehrere physikalische Netzweke einrichten. Jedes Netzwerk entspricht einer NIC auf dem Hypervisor. Jedes physikalische Netzwerk kann eine oder mehere Arten von Datenverkehr behandeln, mit gewissen Beschränkungen wie diese kombiniert werden können. <br/><br/><strong>Durch Ziehen und Loslassen eines oder mehreren Datenverkehrsarten auf jedes einzelne physikalische Netzwerk.",
 "message.setup.physical.network.during.zone.creation.basic": "Wenn Sie eine Basiszone hinzufügen, können Sie ein einzelnes physikalisches Netzwerk einrichten, welches einer NIC auf dem Hypervisor entspricht. Das Netzwerk behandelt mehrere Arten von Datenverkehr.<br/><br/>Sie können auch weitere Datenverkehrsarten zum pysikalische Netzwerk hinzufügen, durch <strong>Ziehen und Loslassen</strong>.",
 "message.setup.successful": "Cloud setup erfolgreich",
-"message.specifiy.tag.key": "Bitte spezifizieren Sie einen Schlüssel für den Tag",
-"message.specifiy.tag.key.value": "Bitte geben Sie einen Ettikettnamen und -wert an",
-"message.specifiy.tag.value": "Bitte spezifizieren Sie einen Wert für den Tag",
+"message.specify.tag.key": "Bitte spezifizieren Sie einen Schlüssel für den Tag",
+"message.specify.tag.key.value": "Bitte geben Sie einen Ettikettnamen und -wert an",
+"message.specify.tag.value": "Bitte spezifizieren Sie einen Wert für den Tag",
 "message.specify.url": "Bitte geben Sie eine URL an",
 "message.step.1.desc": "Bitte wählen Sie eine Vorlage für Ihre neue virtuelle Instanz aus. Sie können auch ein leeres Template auswählen, von welchen aus dann ein ISO-Abbild instaliert werden kann.",
 "message.step.2.continue": "Bitte wählen Sie ein Dienstangebot zum Fortfahren aus",

diff --git a/ui/public/locales/el_GR.json b/ui/public/locales/el_GR.json
@@ -3101,9 +3101,9 @@
 "message.setup.physical.network.during.zone.creation" : "Όταν προσθέτετε μια ζώνη, πρέπει να ρυθμίσετε ένα ή περισσότερα φυσικά δίκτυα. Κάθε δίκτυο αντιστοιχεί σε ένα NIC στον Hypervisor. Κάθε φυσικό δίκτυο μπορεί να μεταφέρει έναν ή περισσότερους τύπους κίνησης, με ορισμένους περιορισμούς στον τρόπο με τον οποίο μπορούν να συνδυαστούν. Προσθέστε ή καταργήστε έναν ή περισσότερους τύπους κίνησης σε κάθε φυσικό δίκτυο.",
 "message.setup.physical.network.during.zone.creation.basic" : "Όταν προσθέτετε μια βασική ζώνη, μπορείτε να ρυθμίσετε ένα φυσικό δίκτυο, το οποίο αντιστοιχεί σε ένα NIC στον Hypervisor. Το δίκτυο μεταφέρει διάφορους τύπους κίνησης.<br/><br/>Μπορείτε επίσης να <strong>προσθέσετε</strong> άλλους τύπους κίνησης στο φυσικό δίκτυο.",
 "message.setup.successful" : "Cloud setup επιτυχής!",
-"message.specifiy.tag.key" : "Καθορίστε ένα κλειδί ετικέτας",
-"message.specifiy.tag.key.value" : "Καθορίστε ένα κλειδί ετικέτας και μια τιμή",
-"message.specifiy.tag.value" : "Καθορίστε μια τιμή ετικέτας",
+"message.specify.tag.key" : "Καθορίστε ένα κλειδί ετικέτας",
+"message.specify.tag.key.value" : "Καθορίστε ένα κλειδί ετικέτας και μια τιμή",
+"message.specify.tag.value" : "Καθορίστε μια τιμή ετικέτας",
 "message.specify.url" : "Καθορίστε τη διεύθυνση URL",
 "message.step.1.desc" : "Επιλέξτε ένα πρότυπο για τη νέα εικονική εικονική μηχανή σας. Μπορείτε επίσης να επιλέξετε ένα κενό πρότυπο από το οποίο μπορεί να εγκατασταθεί μια εικόνα ISO.",
 "message.step.2.continue" : "Επιλέξτε μια προσφορά υπηρεσιών για να συνεχίσετε",

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
@@ -3284,9 +3284,9 @@
 "message.setup.physical.network.during.zone.creation": "When adding a zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the hypervisor. Each physical network can carry one or more types of traffic, with certain restrictions on how they may be combined. Add or remove one or more traffic types onto each physical network.",
 "message.setup.physical.network.during.zone.creation.basic": "When adding a basic zone, you can set up one physical network, which corresponds to a NIC on the hypervisor. The network carries several types of traffic.<br/><br/>You may also <strong>add</strong> other traffic types onto the physical network.",
 "message.setup.successful": "Cloud setup successful!",
-"message.specifiy.tag.key": "Please specify a tag key",
-"message.specifiy.tag.key.value": "Please specify a tag key and value",
-"message.specifiy.tag.value": "Please specify a tag value",
+"message.specify.tag.key": "Please specify a tag key",
+"message.specify.tag.key.value": "Please specify a tag key and value",
+"message.specify.tag.value": "Please specify a tag value",
 "message.specify.url": "Please specify URL",
 "message.step.1.desc": "Please select a template for your new virtual instance. You can also choose to select a blank template from which an ISO image can be installed onto.",
 "message.step.2.continue": "Please select a service offering to continue",

diff --git a/ui/public/locales/es.json b/ui/public/locales/es.json
@@ -2305,7 +2305,7 @@
 "message.setup.physical.network.during.zone.creation": "Cuando se esta agregando una zona avanzada, se necesita setear una o m\u00e1s redes f\u00edsicas. Cada red se corresponder\u00e1 con una NIC del hipervisor. Cada red f\u00edsica puede transportar uno o m\u00e1s tipos de tr\u00e1fico, con ciertas restricciones en como ellos se combinan.<br/><br/><strong>Arrastre y suelte uno o m\u00e1s tipos de tr\u00e1fico</strong> sobre cada red f\u00edsica.",
 "message.setup.physical.network.during.zone.creation.basic": "Cuando se esta agregando un zona b\u00e1sica, puedes configurar un red f\u00edsica que se corresponda a una NIC del hipervisor. La red transporta varios tipos de tr\u00e1fico.<br/><br/>Puedes tambi\u00e9n <strong>arrastrar y soltar</strong> otro tipos de tr\u00e1fico en la interfaz f\u00edsica.",
 "message.setup.successful": "La configuraci\u00f3n del cloud finalizo satisfactoriamente.",
-"message.specifiy.tag.key.value": "Por favor especifique una etiqueta con clave y valor",
+"message.specify.tag.key.value": "Por favor especifique una etiqueta con clave y valor",
 "message.specify.url": "Por favor especifique la URL",
 "message.step.1.desc": "Por favor seleccione una plantilla para su nueva instancia virtual. Tambi\u00e9n puede escoger  seleccionar una plantilla en blanco en la que instalar una im\u00e1gen ISO.",
 "message.step.2.continue": "Por favor seleccione una oferta de servicio para continuar",

diff --git a/ui/public/locales/fr_FR.json b/ui/public/locales/fr_FR.json
@@ -2275,7 +2275,7 @@
 "message.setup.physical.network.during.zone.creation": "Lorsque vous ajoutez une zone avanc\u00e9e, vous avez besoin de d\u00e9finir un ou plusieurs r\u00e9seaux physiques. Chaque r\u00e9seau correspond \u00e0 une carte r\u00e9seau sur l'hyperviseur. Chaque r\u00e9seau physique peut supporter un ou plusieurs types de trafic, avec certaines restrictions sur la fa\u00e7on dont ils peuvent \u00eatre combin\u00e9s.<br/><br/><strong>Glisser et d\u00e9poser un ou plusieurs types de trafic</strong> sur chaque r\u00e9seau physique.",
 "message.setup.physical.network.during.zone.creation.basic": "Quand vous ajoutez une zone basique, vous pouvez param\u00e9trer un seul r\u00e9seau physique, correspondant \u00e0 une carte r\u00e9seau sur l'hyperviseur. Ce r\u00e9seau comportera plusieurs types de trafic.<br/><br/>Vous pouvez \u00e9galement <strong>glisser et d\u00e9poser</strong> d'autres types de trafic sur le r\u00e9seau physique.",
 "message.setup.successful": "Installation du Cloud r\u00e9ussie !",
-"message.specifiy.tag.key.value": "Sp\u00e9cifier une cl\u00e9 et valeur de tag",
+"message.specify.tag.key.value": "Sp\u00e9cifier une cl\u00e9 et valeur de tag",
 "message.specify.url": "Renseigner l'URL",
 "message.step.1.desc": "S\u00e9lectionnez un mod\u00e8le pour votre nouvelle instance virtuelle. Vous pouvez \u00e9galement choisir un mod\u00e8le vierge sur lequel une image ISO pourra \u00eatre install\u00e9e.",
 "message.step.2.continue": "S\u00e9lectionnez une offre de service pour continuer",