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 7da5f9002b2 misc: fix typo `sercurity` -> `security` (#10966)
7da5f9002b2 is described below
commit 7da5f9002b24728801f41b6ea50fa787bfa8a23c
Author: John Bampton <[email protected]>
AuthorDate: Thu Jul 24 17:46:16 2025 +1000
misc: fix typo `sercurity` -> `security` (#10966)
---
.../main/resources/security_group_agent/cs-sgagent | 2 +-
.../maint/test_egress_rules_host_maintenance.py | 6 +-
test/integration/component/test_egress_rules.py | 60 +++++++++---------
.../component/test_project_resources.py | 6 +-
test/integration/component/test_security_groups.py | 72 +++++++++++-----------
5 files changed, 73 insertions(+), 73 deletions(-)
diff --git
a/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent
b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent
index f8a5d7d2c9d..3b3a52561b6 100755
---
a/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent
+++
b/plugins/hypervisors/baremetal/src/main/resources/security_group_agent/cs-sgagent
@@ -1,7 +1,7 @@
#!/bin/sh
# the following is chkconfig init header
#
-# cs-sgagent: cloudStack baremetal sercurity group agent
+# cs-sgagent: cloudStack baremetal security group agent
#
# chkconfig: 345 97 03
# description: This is a daemon instructed by CloudStack management server \
diff --git
a/test/integration/component/maint/test_egress_rules_host_maintenance.py
b/test/integration/component/maint/test_egress_rules_host_maintenance.py
index 40a3913642f..820d4d14550 100644
--- a/test/integration/component/maint/test_egress_rules_host_maintenance.py
+++ b/test/integration/component/maint/test_egress_rules_host_maintenance.py
@@ -175,19 +175,19 @@ class TestEgressAfterHostMaintenance(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
diff --git a/test/integration/component/test_egress_rules.py
b/test/integration/component/test_egress_rules.py
index c1d12d11c01..32f1dca5f9f 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -375,19 +375,19 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
)
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -533,19 +533,19 @@ class TestDefaultGroupEgress(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -730,19 +730,19 @@ class
TestDefaultGroupEgressAfterDeploy(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -910,19 +910,19 @@ class TestRevokeEgressRule(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1188,19 +1188,19 @@ class TestInvalidAccountAuthroize(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1320,19 +1320,19 @@ class
TestMultipleAccountsEgressRuleNeg(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.accountA.name,
domainid=self.accountA.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1568,19 +1568,19 @@ class
TestMultipleAccountsEgressRule(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_groupA.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.accountA.name,
domainid=self.accountA.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1594,19 +1594,19 @@ class
TestMultipleAccountsEgressRule(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_groupB.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.accountB.name,
domainid=self.accountB.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1847,19 +1847,19 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -2037,19 +2037,19 @@ class
TestInvalidParametersForEgress(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
diff --git a/test/integration/component/test_project_resources.py
b/test/integration/component/test_project_resources.py
index 16d21dfd7cb..37973eb3422 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -1283,18 +1283,18 @@ class TestSecurityGroup(cloudstackTestCase):
)
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
projectid=self.project.id
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertNotEqual(
- len(sercurity_groups),
+ len(security_groups),
0,
"Check List Security groups response"
)
diff --git a/test/integration/component/test_security_groups.py
b/test/integration/component/test_security_groups.py
index 449fe10cb28..04d4f0713fb 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -227,25 +227,25 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
# for the admin account
# 3. No Ingress Rules should be part of the default security group
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertNotEqual(
- len(sercurity_groups),
+ len(security_groups),
0,
"Check List Security groups response"
)
self.debug("List Security groups response: %s" %
- str(sercurity_groups))
+ str(security_groups))
self.assertEqual(
- hasattr(sercurity_groups, 'ingressrule'),
+ hasattr(security_groups, 'ingressrule'),
False,
"Check ingress rule attribute for default security group"
)
@@ -306,26 +306,26 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
"Check virtual machine displayname in listVirtualMachines"
)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.debug("List Security groups response: %s" %
- str(sercurity_groups))
+ str(security_groups))
self.assertNotEqual(
- len(sercurity_groups),
+ len(security_groups),
0,
"Check List Security groups response"
)
self.assertEqual(
- hasattr(sercurity_groups, 'ingressrule'),
+ hasattr(security_groups, 'ingressrule'),
False,
"Check ingress rule attribute for default security group"
)
@@ -432,19 +432,19 @@ class TestAuthorizeIngressRule(cloudstackTestCase):
)
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -580,19 +580,19 @@ class TestRevokeIngressRule(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -909,18 +909,18 @@ class TestdeployVMWithUserData(cloudstackTestCase):
)
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1072,19 +1072,19 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
)
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1126,12 +1126,12 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
time.sleep(self.testdata["sleep"])
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
id=security_group.id
)
self.assertNotEqual(
- sercurity_groups,
+ security_groups,
None,
"Check List Security groups response"
)
@@ -1156,18 +1156,18 @@ class TestDeleteSecurityGroup(cloudstackTestCase):
)
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1303,18 +1303,18 @@ class TestIngressRule(cloudstackTestCase):
)
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1425,18 +1425,18 @@ class TestIngressRule(cloudstackTestCase):
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
@@ -1594,19 +1594,19 @@ class TestIngressRule(cloudstackTestCase):
)
self.debug("Created security group with ID: %s" % security_group.id)
# Default Security group should not have any ingress rule
- sercurity_groups = SecurityGroup.list(
+ security_groups = SecurityGroup.list(
self.apiclient,
account=self.account.name,
domainid=self.account.domainid
)
self.assertEqual(
- isinstance(sercurity_groups, list),
+ isinstance(security_groups, list),
True,
"Check for list security groups response"
)
self.assertEqual(
- len(sercurity_groups),
+ len(security_groups),
2,
"Check List Security groups response"
)
