From cbe93be2e9a84e6f523f8514455f31f91e0345a7 Mon Sep 17 00:00:00 2001
From: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Date: Mon, 30 Dec 2013 14:37:40 +0530
Subject: [PATCH] CLOUDSTACK-5640: Correcting imports in test cases

---
 test/integration/component/test_memory_limits.py         | 4 ++--
 test/integration/component/test_security_groups.py       | 2 +-
 test/integration/component/test_snapshots_improvement.py | 7 +++----
 test/integration/component/test_vmware_drs.py            | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/test/integration/component/test_memory_limits.py b/test/integration/component/test_memory_limits.py
index 7da85a5854f..7921e4be9ed 100644
--- a/test/integration/component/test_memory_limits.py
+++ b/test/integration/component/test_memory_limits.py
@@ -29,11 +29,11 @@ from marvin.integration.lib.base import (
 from marvin.integration.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
-                                        cleanup_resources,
-					wait_for_cleanup,
+                                        wait_for_cleanup,
                                         find_suitable_host,
                                         get_resource_type
                                         )
+from marvin.integration.lib.utils import cleanup_resources
 
 class Services:
     """Test memory resource limit services
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index c90ccf6ee28..bdd5a3ae429 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -656,7 +656,7 @@ class TestRevokeIngressRule(cloudstackTestCase):
         # SSH Attempt to VM should fail
         with self.assertRaises(Exception):
             self.debug("SSH into VM: %s" % self.virtual_machine.id)
-           SshClient(
+            SshClient(
                                         self.virtual_machine.ssh_ip,
                                         self.virtual_machine.ssh_port,
                                         self.virtual_machine.username,
diff --git a/test/integration/component/test_snapshots_improvement.py b/test/integration/component/test_snapshots_improvement.py
index 190db556c1c..77c240d34f1 100644
--- a/test/integration/component/test_snapshots_improvement.py
+++ b/test/integration/component/test_snapshots_improvement.py
@@ -20,7 +20,9 @@
 # Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
-from marvin.integration.lib.utils import (random_gen)
+from marvin.integration.lib.utils import (random_gen,
+                                          is_snapshot_on_nfs,
+                                          cleanup_resources)
 from marvin.integration.lib.base import (
                                         Account,
                                         ServiceOffering,
@@ -33,7 +35,6 @@ from marvin.integration.lib.base import (
 from marvin.integration.lib.common import (get_domain,
                                         get_zone,
                                         get_template,
-                                        cleanup_resources,
                                         list_snapshots
                                         )
 from marvin.cloudstackAPI import (createSnapshot,
@@ -42,8 +43,6 @@ from marvin.cloudstackAPI import (createSnapshot,
                                   listOsTypes,
                                   stopVirtualMachine
                                   )
-from marvin.integration.lib.utils import is_snapshot_on_nfs
-
 
 class Services:
     def __init__(self):
diff --git a/test/integration/component/test_vmware_drs.py b/test/integration/component/test_vmware_drs.py
index 8eeb2c322a9..6a999111843 100644
--- a/test/integration/component/test_vmware_drs.py
+++ b/test/integration/component/test_vmware_drs.py
@@ -29,7 +29,7 @@ from marvin.integration.lib.base import (Account,
                                          VirtualMachine,
                                          ServiceOffering)
 
-from marvin.integration.lib.commom import (get_zone,
+from marvin.integration.lib.common import (get_zone,
                                            get_template,
                                            get_domain,
                                            get_pod