From 513c1cb7dba1be49f8f643c7d5694d0c485cf8f7 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Mon, 11 Mar 2024 22:03:32 +1000 Subject: [PATCH 1/2] lint: fix end of file --- .../src/main/resources/META-INF/db/schema-41900to42000.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41900to42000.sql b/engine/schema/src/main/resources/META-INF/db/schema-41900to42000.sql index e270583c9b1a..8fa577c14238 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41900to42000.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41900to42000.sql @@ -61,4 +61,3 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.network_offerings','for_nsx', 'int(1 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.network_offerings','nsx_mode', 'varchar(32) COMMENT "mode in which the network would route traffic"'); CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc_offerings','for_nsx', 'int(1) unsigned DEFAULT "0" COMMENT "is nsx enabled for the resource"'); CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.vpc_offerings','nsx_mode', 'varchar(32) COMMENT "mode in which the network would route traffic"'); - From 6fb5fecee6997ed6bc3a2e27669a61d38a3d6702 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Mon, 11 Mar 2024 22:04:38 +1000 Subject: [PATCH 2/2] Fix spelling in docs and code comments only --- .../ovm3/src/test/resources/scripts/create_pool_cluster.py | 6 +++--- server/src/main/java/com/cloud/api/ApiSessionListener.java | 2 +- .../java/com/cloud/network/vpc/NetworkACLManagerImpl.java | 2 +- .../main/java/com/cloud/resource/ResourceManagerImpl.java | 4 ++-- ui/README.md | 6 +++--- ui/docs/development.md | 6 +++--- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plugins/hypervisors/ovm3/src/test/resources/scripts/create_pool_cluster.py b/plugins/hypervisors/ovm3/src/test/resources/scripts/create_pool_cluster.py index bba41ab48e05..830dc90caede 100755 --- a/plugins/hypervisors/ovm3/src/test/resources/scripts/create_pool_cluster.py +++ b/plugins/hypervisors/ovm3/src/test/resources/scripts/create_pool_cluster.py @@ -30,7 +30,7 @@ try: if normalRepo: print "normal repo" - # this litterally throws EVERYTHING away on the repo + # this literally throws EVERYTHING away on the repo repoDom = parseString(server.discover_repository_db()) for node in repoDom.getElementsByTagName('Repository'): repoUuid = node.attributes['Uuid'] @@ -38,7 +38,7 @@ localMount = node.getElementsByTagName('Mount_point')[0].firstChild.nodeValue # there is a "strong" relation between repo's and VMs - # onfortunately there is no reference in the vm.cfg + # unfortunately there is no reference in the vm.cfg # or any known info in the configuration of the VM # in which repo it lives.... for dirname, dirnames, filenames in os.walk('%s/VirtualMachines/' % localMount): @@ -146,7 +146,7 @@ journalesize = "" # o2cb is the problem.... /etc/init.d/o2cb - # sets it's config in /etc/sysconfig/o2cb (can be removed) + # sets its config in /etc/sysconfig/o2cb (can be removed) # dmsetup requires the stopping of o2cb first, # then the removal of the config, after which dmsetup # can remove the device from /dev/mapper/ diff --git a/server/src/main/java/com/cloud/api/ApiSessionListener.java b/server/src/main/java/com/cloud/api/ApiSessionListener.java index 46ebb404a541..a82c043ee3b2 100644 --- a/server/src/main/java/com/cloud/api/ApiSessionListener.java +++ b/server/src/main/java/com/cloud/api/ApiSessionListener.java @@ -32,7 +32,7 @@ public class ApiSessionListener implements HttpSessionListener { private static Map sessions = new ConcurrentHashMap<>(); /** - * @return the internal adminstered session count + * @return the internal administered session count */ public static long getSessionCount() { return sessions.size(); diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java index 2f37bdda75a7..b20e1af4673f 100644 --- a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java @@ -169,7 +169,7 @@ public boolean replaceNetworkACLForPrivateGw(final NetworkACL acl, final Private final List aclItems = _networkACLItemDao.listByACL(acl.getId()); if (aclItems == null || aclItems.isEmpty()) { //Revoke ACL Items of the existing ACL if the new network acl is empty - //Other wise existing rules will not be removed on the router elelment + //Otherwise existing rules will not be removed on the router element logger.debug("New network ACL is empty. Revoke existing rules before applying ACL"); if (!revokeACLItemsForPrivateGw(gateway)) { throw new CloudRuntimeException("Failed to replace network ACL. Error while removing existing ACL " + "items for privatewa gateway: " + gateway.getId()); diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java index 8e8605874b4b..6c5433c851ac 100755 --- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java @@ -733,7 +733,7 @@ private List discoverHostsFull(final Long dcId, final Long podId, Long c // VMware only allows adding host to an existing cluster, as we // already have a lot of information // in cluster object, to simplify user input, we will construct - // neccessary information here + // necessary information here final Map clusterDetails = _clusterDetailsDao.findDetails(clusterId); username = clusterDetails.get("username"); assert username != null; @@ -2799,7 +2799,7 @@ public void deleteRoutingHost(final HostVO host, final boolean isForced, final b final StoragePoolVO storagePool = _storageMgr.findLocalStorageOnHost(host.getId()); if (forceDestroyStorage && storagePool != null) { - // put local storage into mainenance mode, will set all the VMs on + // put local storage into maintenance mode, will set all the VMs on // this local storage into stopped state if (storagePool.getStatus() == StoragePoolStatus.Up || storagePool.getStatus() == StoragePoolStatus.ErrorInMaintenance) { try { diff --git a/ui/README.md b/ui/README.md index 99b04a3e3aaf..ac69ca5b1b6e 100644 --- a/ui/README.md +++ b/ui/README.md @@ -1,6 +1,6 @@ # CloudStack UI -A modern role-based progressive CloudStack UI based on VueJS and Ant Design. +A modern role-based progressive CloudStack UI based on Vue.js and Ant Design. ![Screenshot](docs/screenshot-dashboard.png) @@ -142,7 +142,7 @@ docker container: ## Documentation -- VueJS Guide: https://vuejs.org/guide/ +- Vue.js Guide: https://vuejs.org/guide/ - Vue Ant Design: https://www.antdv.com/docs/vue/introduce/ - UI Developer [Docs](docs) - JavaScript ES6 Reference: https://www.tutorialspoint.com/es6/ @@ -152,7 +152,7 @@ docker container: The UI uses the following: -- [VueJS](https://vuejs.org/) +- [Vue.js](https://vuejs.org/) - [Ant Design Spec](https://ant.design/docs/spec/introduce) - [Ant Design Vue](https://vue.ant.design/) - [Ant Design Pro Vue](https://github.com/sendya/ant-design-pro-vue) diff --git a/ui/docs/development.md b/ui/docs/development.md index e984793bc708..dfee2b613316 100644 --- a/ui/docs/development.md +++ b/ui/docs/development.md @@ -1,8 +1,8 @@ # UI Development -The modern CloudStack UI is role-based progressive app that uses VueJS and Ant Design. +The modern CloudStack UI is role-based progressive app that uses Vue.js and Ant Design. -JavaScript, VueJS references: +JavaScript, Vue.js references: - https://www.w3schools.com/js/ - https://www.geeksforgeeks.org/javascript-tutorial/ - https://vuejs.org/v2/guide/ @@ -207,7 +207,7 @@ The Resource View has 2 sections: with the related entities - DetailsTab to the right which provide the basic details about the resource. -Custom tabs to render custom details, addtional information of the resource +Custom tabs to render custom details, additional information of the resource The list of fields to be displayed maybe defined as an array or a function in case we need to selectively (i.e., based on certain conditions) restrict the view of certain columns. The names specified in the