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 2ca3be41f7d Fix spelling in code comments (#8866)
2ca3be41f7d is described below
commit 2ca3be41f7d7aa8422eca354f2dd9422f71e2d52
Author: John Bampton <[email protected]>
AuthorDate: Tue Apr 23 20:11:56 2024 +1000
Fix spelling in code comments (#8866)
---
.../ldap/LdapDirectoryServerConnectionTest.java | 4 +-
.../component/test_multiple_nic_support.py | 44 +++++++++++-----------
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java
b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java
index 2d2690f8e3a..a216084aa3a 100644
---
a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java
+++
b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java
@@ -88,7 +88,7 @@ public class LdapDirectoryServerConnectionTest {
ldapTestConfigTool.overrideConfigValue(configuration,
"ldapBindPrincipal", "uid=admin,ou=system");
ldapTestConfigTool.overrideConfigValue(configuration,
"ldapMemberOfAttribute", "memberOf");
lenient().when(userManagerFactory.getInstance(LdapUserManager.Provider.OPENLDAP)).thenReturn(new
OpenLdapUserManagerImpl(configuration));
- // construct an ellaborate structure around a single object
+ // construct an elaborate structure around a single object
Pair<List<LdapConfigurationVO>, Integer> vos = new
Pair<List<LdapConfigurationVO>, Integer>(
Collections.singletonList(configurationVO),1);
lenient().when(configurationDao.searchConfigurations(null, 0,
1L)).thenReturn(vos);
@@ -149,7 +149,7 @@ public class LdapDirectoryServerConnectionTest {
public void testSchemaLoading() {
try {
assertTrue("standard not loaded",
embeddedLdapServer.addSchemaFromClasspath("other"));
-// we need member of in ACS nowadays (backwards comptability broken):
+// we need member of in ACS nowadays (backwards compatibility broken):
// assertTrue("memberOf schema not loaded",
embeddedLdapServer.addSchemaFromPath(new File("src/test/resources/memberOf"),
"microsoft"));
} catch (LdapException | IOException e) {
fail(e.getLocalizedMessage());
diff --git a/test/integration/component/test_multiple_nic_support.py
b/test/integration/component/test_multiple_nic_support.py
index cba1c4e24dc..7eb18ed59b7 100644
--- a/test/integration/component/test_multiple_nic_support.py
+++ b/test/integration/component/test_multiple_nic_support.py
@@ -14,7 +14,7 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-""" tests for supporting multiple NIC's in advanced zone with security groups
in cloudstack 4.14.0.0
+"""tests for supporting multiple NIC's in advanced zone with security groups
in cloudstack 4.14.0.0
"""
# Import Local Modules
@@ -117,7 +117,7 @@ class TestMultipleNicSupport(cloudstackTestCase):
cls.testdata["virtual_machine"]["template"] = cls.template.id
if cls.zone.securitygroupsenabled:
- # Enable networking for reaching to VM thorugh SSH
+ # Enable networking for reaching to VM through SSH
security_group = SecurityGroup.create(
cls.apiclient,
cls.testdata["security_group"],
@@ -302,9 +302,9 @@ class TestMultipleNicSupport(cloudstackTestCase):
Steps:
# 1. Create more than 1 isolated or shared network
- # 2. Create a vm and select more than 1 network while deploying
- # 3. Vm is deployed successfully with 1 nic from each network
- # 4. All the vm's should be pingable
+ # 2. Create a VM and select more than 1 network while deploying
+ # 3. VM is deployed successfully with 1 NIC from each network
+ # 4. All the VM's should be pingable
:return:
"""
virtual_machine = VirtualMachine.list(
@@ -330,8 +330,8 @@ class TestMultipleNicSupport(cloudstackTestCase):
Steps:
# 1. Create a VM by selecting one default NIC
# 2. Create few more isolated or shared networks
- # 3. Add extra NIC's to the vm from the newly created networks
- # 4. The deployed VM should have extra nic's added in the above
+ # 3. Add extra NIC's to the VM from the newly created networks
+ # 4. The deployed VM should have extra NIC's added in the above
# step without any fail
# 5. The IP's of the extra NIC's should be pingable
:return:
@@ -355,8 +355,8 @@ class TestMultipleNicSupport(cloudstackTestCase):
Steps:
# 1. Create a VM with more than 1 NIC
# 2) Navigate to Instances->NIC->Edit Secondary IP's
- # ->Aquire new Secondary IP"
- # 3) Add as many secondary Ip as possible to the VM
+ # ->Acquire new Secondary IP"
+ # 3) Add as many secondary IP as possible to the VM
# 4) Configure the secondary IP's by referring to "Configure
# the secondary IP's" in the "Action Item" section
:return:
@@ -381,7 +381,7 @@ class TestMultipleNicSupport(cloudstackTestCase):
# 2)Navigate to Instances-NIC's->Edit Secondary IP's
# ->Acquire new Secondary IP
# 3) Add secondary IP to all the NIC's of the VM
- # 4) Confiugre the secondary IP's by referring to "Configure the
+ # 4) Configure the secondary IP's by referring to "Configure the
# secondary IP's" in the "Action Item" section
:return:
"""
@@ -441,10 +441,10 @@ class TestMultipleNicSupport(cloudstackTestCase):
""" Stop and Start a VM with Multple NIC
Steps:
- # 1) Create a Vm with multiple NIC's
+ # 1) Create a VM with multiple NIC's
# 2) Configure secondary IP's on the VM
# 3) Try to stop/start the VM
- # 4) Ping the IP's of the vm
+ # 4) Ping the IP's of the VM
# 5) Remove Secondary IP from one of the NIC
:return:
"""
@@ -484,16 +484,16 @@ class TestMultipleNicSupport(cloudstackTestCase):
@attr(tags=["advancedsg"], required_hardware="false")
def test_06_migrate_vm_with_multiple_nic(self):
- """ Migrate a VM with Multple NIC
+ """ Migrate a VM with Multiple NIC
Steps:
- # 1) Create a Vm with multiple NIC's
+ # 1) Create a VM with multiple NIC's
# 2) Configure secondary IP's on the VM
# 3) Try to stop/start the VM
- # 4) Ping the IP's of the vm
+ # 4) Ping the IP's of the VM
:return:
"""
- # Skipping adding Secondary IP to NIC since its already
+ # Skipping adding Secondary IP to NIC since it's already
# done in the previous test cases
virtual_machine = VirtualMachine.list(
@@ -543,7 +543,7 @@ class TestMultipleNicSupport(cloudstackTestCase):
""" Remove secondary IP from any NIC
Steps:
# 1) Navigate to Instances
- # 2) Select any vm
+ # 2) Select any VM
# 3) NIC's ->Edit secondary IP's->Release IP
# 4) The secondary IP should be successfully removed
"""
@@ -572,7 +572,7 @@ class TestMultipleNicSupport(cloudstackTestCase):
def test_08_remove_nic_from_vm(self):
""" Remove NIC from VM
Steps:
- # 1) Navigate to Instances->select any vm->NIC's->NIC 2
+ # 1) Navigate to Instances->select any VM->NIC's->NIC 2
# ->Click on "X" button to remove the second NIC
# 2) Remove other NIC's as well from the VM
# 3) All the NIC's should be successfully removed from the VM
@@ -599,16 +599,16 @@ class TestMultipleNicSupport(cloudstackTestCase):
@attr(tags=["advancedsg"], required_hardware="false")
def test_09_reboot_vm_with_multiple_nic(self):
- """ Reboot a VM with Multple NIC
+ """ Reboot a VM with Multiple NIC
Steps:
- # 1) Create a Vm with multiple NIC's
+ # 1) Create a VM with multiple NIC's
# 2) Configure secondary IP's on the VM
# 3) Try to reboot the VM
- # 4) Ping the IP's of the vm
+ # 4) Ping the IP's of the VM
:return:
"""
- # Skipping adding Secondary IP to NIC since its already
+ # Skipping adding Secondary IP to NIC since it's already
# done in the previous test cases
virtual_machine = VirtualMachine.list(