etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7137: Resolving cleanup issue in test_escalations_securitygroups.py 

(cherry picked from commit 8d8190ea4e)
This commit is contained in:
Ashutosh K 2014-07-21 03:15:07 -04:00 committed by Daan Hoogland
parent f055ec52d9
commit 1ca9abd6dc
1 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
test/integration/component/test_escalations_securitygroups.py
View File

@ -17,40 +17,15 @@
#Import Local Modules
from marvin.cloudstackTestCase import cloudstackTestCase
from marvin.cloudstackAPI import (createVolume,
createTemplate)
from marvin.lib.base import (Volume,
Iso,
VirtualMachine,
Template,
Snapshot,
SecurityGroup,
Account,
Zone,
Network,
NetworkOffering,
DiskOffering,
ServiceOffering,
VmSnapshot,
SnapshotPolicy,
SSHKeyPair,
Resources,
Configurations,
VpnCustomerGateway,
Hypervisor,
VpcOffering,
VPC,
NetworkACL)
from marvin.lib.base import (SecurityGroup,
Account)
from marvin.lib.common import (get_zone,
get_domain,
get_template,
list_os_types)
get_template)
from marvin.lib.utils import (validateList,
cleanup_resources,
random_gen)
from marvin.codes import (PASS, FAIL, EMPTY_LIST)
cleanup_resources)
from marvin.codes import (PASS, EMPTY_LIST)
from nose.plugins.attrib import attr
import time
class TestSecurityGroups(cloudstackTestCase):
@ -245,6 +220,7 @@ class TestSecurityGroups(cloudstackTestCase):
SecurityGroup.delete(
securitygroup_created,
self.userapiclient)
self.cleanup.remove(securitygroup_created)
# Listing all the security groups in page 2 again
list_securitygroups_page2 = SecurityGroup.list(
self.userapiclient,
@ -585,4 +561,4 @@ class TestSecurityGroups(cloudstackTestCase):
status[2],
"Security Groups Egress rule is not revoked"
)
return
return