From 78a6d557f86db354a073090fc92ea693ee235e1f Mon Sep 17 00:00:00 2001
From: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Date: Thu, 24 Jul 2014 01:03:45 -0400
Subject: [PATCH] CLOUDSTACK-7178: Correcting imports in test_escalations* test
 cases

---
 .../component/test_escalations_ipaddresses.py | 38 +++++++++++++------
 .../component/test_escalations_snapshots.py   | 26 +++++++------
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/test/integration/component/test_escalations_ipaddresses.py b/test/integration/component/test_escalations_ipaddresses.py
index 0b31d2edf8b..411dae0d19b 100644
--- a/test/integration/component/test_escalations_ipaddresses.py
+++ b/test/integration/component/test_escalations_ipaddresses.py
@@ -16,18 +16,32 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackException import *
-from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.lib.utils import checkVolumeSize
-from marvin.codes import SUCCESS
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.lib.base import (PublicIPAddress,
+                             NetworkOffering,
+                             Autoscale,
+                             Network,
+                             NetworkServiceProvider,
+                             Template,
+                             VirtualMachine,
+                             VPC,
+                             VpcOffering,
+                             StaticNATRule,
+                             FireWallRule,
+                             NATRule,
+                             Vpn,
+                             VpnUser,
+                             LoadBalancerRule,
+                             Account,
+                             ServiceOffering,
+                             PhysicalNetwork,
+                             User)
+from marvin.lib.common import (get_domain,
+                               get_zone,
+                               get_template)
+from marvin.lib.utils import validateList, cleanup_resources
+from marvin.codes import PASS
 from nose.plugins.attrib import attr
-from time import sleep
-from ctypes.wintypes import BOOLEAN
 
 class TestIpAddresses(cloudstackTestCase):
 
@@ -1730,7 +1744,7 @@ class TestIpAddresses(cloudstackTestCase):
                          "Load Balancer Sticky Policy creation Failed"
                          )
         # Deleting the Sticky Policy
-        deleted = LoadBalancerRule.deleteSticky(
+        LoadBalancerRule.deleteSticky(
                                                 lb_rule,
                                                 self.userapiclient,
                                                 id=sticky_policy.stickinesspolicy[0].id
diff --git a/test/integration/component/test_escalations_snapshots.py b/test/integration/component/test_escalations_snapshots.py
index 0aa36c3cf15..9bb3b5051c1 100644
--- a/test/integration/component/test_escalations_snapshots.py
+++ b/test/integration/component/test_escalations_snapshots.py
@@ -16,18 +16,20 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackException import *
-from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
-from marvin.lib.utils import checkVolumeSize
-from marvin.codes import SUCCESS
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.lib.base import (VmSnapshot,
+                             Snapshot,
+                             DiskOffering,
+                             ServiceOffering,
+                             VirtualMachine,
+                             Account,
+                             Volume)
+from marvin.lib.common import (get_domain,
+                               get_zone,
+                               get_template)
+from marvin.lib.utils import validateList, cleanup_resources
+from marvin.codes import PASS
 from nose.plugins.attrib import attr
-from time import sleep
-from ctypes.wintypes import BOOLEAN
 
 class TestSnapshots(cloudstackTestCase):
 
@@ -626,4 +628,4 @@ class TestSnapshots(cloudstackTestCase):
                          vm_snapshot_status,
                          "Listed VM Snapshot details are not as expected"
                          )
-        return
\ No newline at end of file
+        return