Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,19 +175,19 @@ def test_egress_after_host_maintenance(self):
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"
)
Expand Down
60 changes: 30 additions & 30 deletions test/integration/component/test_egress_rules.py
Original file line number Diff line number Diff line change
Expand Up @@ -375,19 +375,19 @@ def test_authorizeIngressRule(self):
)
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"
)
Expand Down Expand Up @@ -533,19 +533,19 @@ def test_01_default_group_with_egress(self):
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"
)
Expand Down Expand Up @@ -730,19 +730,19 @@ def test_01_default_group_with_egress(self):
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"
)
Expand Down Expand Up @@ -910,19 +910,19 @@ def test_revoke_egress_rule(self):
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"
)
Expand Down Expand Up @@ -1188,19 +1188,19 @@ def test_invalid_account_authroize(self):
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"
)
Expand Down Expand Up @@ -1320,19 +1320,19 @@ def test_multiple_account_egress_rule_negative(self):
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"
)
Expand Down Expand Up @@ -1568,19 +1568,19 @@ def test_multiple_account_egress_rule_positive(self):
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"
)
Expand All @@ -1594,19 +1594,19 @@ def test_multiple_account_egress_rule_positive(self):
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"
)
Expand Down Expand Up @@ -1847,19 +1847,19 @@ def test_start_stop_vm_egress(self):
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"
)
Expand Down Expand Up @@ -2037,19 +2037,19 @@ def test_invalid_parameters(self):
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"
)
Expand Down
6 changes: 3 additions & 3 deletions test/integration/component/test_project_resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -1283,18 +1283,18 @@ def test_08_security_group(self):
)
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"
)
Expand Down
Loading
Loading