This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 7342fbd8e1a docs: fix spelling in code comments (#8690)
7342fbd8e1a is described below
commit 7342fbd8e1a80c498ad8e5655d35802a2122930d
Author: John Bampton <[email protected]>
AuthorDate: Mon Feb 26 23:16:35 2024 +1000
docs: fix spelling in code comments (#8690)
---
scripts/storage/secondary/swift | 2 +-
scripts/vm/hypervisor/xenserver/swift | 2 +-
server/src/main/java/com/cloud/network/NetworkServiceImpl.java | 2 +-
systemvm/debian/etc/vpcdnsmasq.conf | 2 +-
test/integration/component/test_deploy_vm_userdata_multi_nic.py | 2 +-
test/integration/smoke/test_migration.py | 2 +-
test/metadata/func/loadbalancers.xml | 2 +-
tools/marvin/marvin/lib/base.py | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/storage/secondary/swift b/scripts/storage/secondary/swift
index b6a17159c66..b2aaa55abe6 100755
--- a/scripts/storage/secondary/swift
+++ b/scripts/storage/secondary/swift
@@ -335,7 +335,7 @@ def get_container(url, token, container, marker=None,
limit=None,
:param marker: marker query
:param limit: limit query
:param prefix: prefix query
- :param delimeter: string to delimit the queries on
+ :param delimiter: string to delimit the queries on
:param http_conn: HTTP connection object (If None, it will create the
conn object)
:param full_listing: if True, return a full listing, else returns a max
diff --git a/scripts/vm/hypervisor/xenserver/swift
b/scripts/vm/hypervisor/xenserver/swift
index a9a5b0a88ce..f1eb89370ba 100755
--- a/scripts/vm/hypervisor/xenserver/swift
+++ b/scripts/vm/hypervisor/xenserver/swift
@@ -337,7 +337,7 @@ def get_container(url, token, container, marker=None,
limit=None,
:param marker: marker query
:param limit: limit query
:param prefix: prefix query
- :param delimeter: string to delimit the queries on
+ :param delimiter: string to delimit the queries on
:param http_conn: HTTP connection object (If None, it will create the
conn object)
:param full_listing: if True, return a full listing, else returns a max
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
index 9705f231e8b..2b7e0450935 100644
--- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -3248,7 +3248,7 @@ public class NetworkServiceImpl extends ManagerBase
implements NetworkService, C
if
(NetUtils.isNetworkAWithinNetworkB(network.getCidr(),
network.getNetworkCidr())) {
logger.warn(
"Existing IP reservation will become
ineffective for the network with id = " + networkId + " You need to reapply
reservation after network reimplementation.");
- //set cidr to the newtork cidr
+ //set cidr to the network cidr
network.setCidr(network.getNetworkCidr());
//set networkCidr to null to bring network
back to no IP reservation state
network.setNetworkCidr(null);
diff --git a/systemvm/debian/etc/vpcdnsmasq.conf
b/systemvm/debian/etc/vpcdnsmasq.conf
index 0850167a297..c1fc18ce1a6 100644
--- a/systemvm/debian/etc/vpcdnsmasq.conf
+++ b/systemvm/debian/etc/vpcdnsmasq.conf
@@ -135,7 +135,7 @@ expand-hosts
# of valid alternatives, so we will give examples of each. Note that
# IP addresses DO NOT have to be in the range given above, they just
# need to be on the same network. The order of the parameters in these
-# do not matter, it's permissble to give name,adddress and MAC in any order
+# do not matter, it's permissble to give name,address and MAC in any order
# Always allocate the host with ethernet address 11:22:33:44:55:66
# The IP address 192.168.0.60
diff --git a/test/integration/component/test_deploy_vm_userdata_multi_nic.py
b/test/integration/component/test_deploy_vm_userdata_multi_nic.py
index 766c96ac119..8743e9972f1 100644
--- a/test/integration/component/test_deploy_vm_userdata_multi_nic.py
+++ b/test/integration/component/test_deploy_vm_userdata_multi_nic.py
@@ -79,7 +79,7 @@ class TestDeployVmWithUserDataMultiNic(cloudstackTestCase):
# Enable Network offering
cls.network_offering_nouserdata.update(cls.api_client, state='Enabled')
- # Create Network Offering with all the serices
+ # Create Network Offering with all the services
cls.network_offering_all = NetworkOffering.create(
cls.api_client,
cls.test_data["isolated_network_offering"]
diff --git a/test/integration/smoke/test_migration.py
b/test/integration/smoke/test_migration.py
index 3b21a0b3936..cadb50692a9 100644
--- a/test/integration/smoke/test_migration.py
+++ b/test/integration/smoke/test_migration.py
@@ -119,7 +119,7 @@ class TestNetworkMigration(cloudstackTestCase):
cls.network_offering_nouserdata.update(cls.api_client,
state='Enabled')
- # Create Network Offering with all the serices
+ # Create Network Offering with all the services
cls.network_offering_all = NetworkOffering.create(
cls.api_client,
cls.test_data["isolated_network_offering"]
diff --git a/test/metadata/func/loadbalancers.xml
b/test/metadata/func/loadbalancers.xml
index 781d30eab9d..cd983148c8f 100644
--- a/test/metadata/func/loadbalancers.xml
+++ b/test/metadata/func/loadbalancers.xml
@@ -1660,7 +1660,7 @@ under the License.
</parameters>
</command>
-<!-- Test case 939 - verify that you can assign a load balancer to multipe
vms -->
+<!-- Test case 939 - verify that you can assign a load balancer to multiple
vms -->
<command>
<name>deployVirtualMachine</name>
<testcase> [Deploy a Virtual Machine-1 to check multiple VMs -
LB assignment]</testcase>
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 98923775fe6..04d4e6810c4 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -4877,7 +4877,7 @@ class NiciraNvp:
class NetworkServiceProvider:
- """Manage network serivce providers for CloudStack"""
+ """Manage network service providers for CloudStack"""
def __init__(self, items):
self.__dict__.update(items)
