Fixed few indentation errors and removed unwanted imports

test/integration/component/test_network_offering.py

@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import datetime
 
 

test/integration/component/test_portable_ip.py

@@ -807,13 +807,11 @@ class TestAssociatePublicIp(cloudstackTestCase):
         try:
 
             self.debug("Trying to SSH to ip: %s" % portableip.ipaddress.ipaddress)
-
+            SshClient(portableip.ipaddress.ipaddress,
-           SshClient(
+                      self.services['natrule']["publicport"],
-                        portableip.ipaddress.ipaddress,
+                      self.virtual_machine.username,
-                        self.services['natrule']["publicport"],
+                      self.virtual_machine.password
-                        self.virtual_machine.username,
+                      )
-                        self.virtual_machine.password
-                        )
         except Exception as e:
             self.fail("Exception while SSHing : %s" % e)
 
@@ -1532,13 +1530,11 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
         try:
 
             self.debug("Trying to SSH to ip: %s" % portableip.ipaddress.ipaddress)
-
+            SshClient(portableip.ipaddress.ipaddress,
-           SshClient(
+                      self.services['natrule']["publicport"],
-                        portableip.ipaddress.ipaddress,
+                      self.virtual_machine2.username,
-                        self.services['natrule']["publicport"],
+                      self.virtual_machine2.password
-                        self.virtual_machine2.username,
+                      )
-                        self.virtual_machine2.password
-                        )
         except Exception as e:
             self.fail("Exception while SSHing : %s" % e)
 

test/integration/component/test_security_groups.py

@@ -656,12 +656,11 @@ 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_ip,
+                      self.virtual_machine.ssh_port,
-                                        self.virtual_machine.ssh_port,
+                      self.virtual_machine.username,
-                                        self.virtual_machine.username,
+                      self.virtual_machine.password
-                                        self.virtual_machine.password
+                    )
-                                        )
         return
 
 

test/integration/component/test_snapshot_limits.py

@@ -21,7 +21,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import is_snapshot_on_nfs
 import os
 

test/integration/component/test_stopped_vm.py

@@ -22,7 +22,6 @@ import marvin
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

test/integration/component/test_storage_motion.py

@@ -20,7 +20,6 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

test/integration/component/test_templates.py

@@ -24,7 +24,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import urllib
 from random import random
 #Import System modules

test/integration/component/test_vpc_network.py

@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import datetime
 # For more info on ddt refer to http://ddt.readthedocs.org/en/latest/api.html#module-ddt
 from ddt import ddt, data

test/integration/component/test_vpc_routers.py

@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import datetime
 
 

test/integration/component/test_vpc_vm_life_cycle.py

@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 from marvin.codes import PASS
 
 import time

test/integration/component/test_vpc_vms_deployment.py

@@ -25,7 +25,6 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.sshClient import SshClient
 import datetime