From 45888e214c949d1e48d800339b366c42a7990641 Mon Sep 17 00:00:00 2001
From: Ashutosh K <ashutosh@clogeny.com>
Date: Mon, 21 Jul 2014 03:15:07 -0400
Subject: [PATCH] CLOUDSTACK-7137: Resolving cleanup issue in
 test_escalations_securitygroups.py

---
 .../test_escalations_securitygroups.py        | 38 ++++---------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/test/integration/component/test_escalations_securitygroups.py b/test/integration/component/test_escalations_securitygroups.py
index 89340887749..076477ed1f7 100644
--- a/test/integration/component/test_escalations_securitygroups.py
+++ b/test/integration/component/test_escalations_securitygroups.py
@@ -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
\ No newline at end of file
+        return