Fixed few indentation errors and removed unwanted imports

This commit is contained in:
Santhosh Edukulla 2013-11-11 10:32:01 +05:30 committed by Girish Shilamkar
parent 175ead4ea9
commit 4473bb2185
11 changed files with 15 additions and 29 deletions

View File

@ -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

View File

@ -807,9 +807,7 @@ class TestAssociatePublicIp(cloudstackTestCase):
try:
self.debug("Trying to SSH to ip: %s" % portableip.ipaddress.ipaddress)
SshClient(
portableip.ipaddress.ipaddress,
SshClient(portableip.ipaddress.ipaddress,
self.services['natrule']["publicport"],
self.virtual_machine.username,
self.virtual_machine.password
@ -1532,9 +1530,7 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
try:
self.debug("Trying to SSH to ip: %s" % portableip.ipaddress.ipaddress)
SshClient(
portableip.ipaddress.ipaddress,
SshClient(portableip.ipaddress.ipaddress,
self.services['natrule']["publicport"],
self.virtual_machine2.username,
self.virtual_machine2.password

View File

@ -656,8 +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(
self.virtual_machine.ssh_ip,
SshClient(self.virtual_machine.ssh_ip,
self.virtual_machine.ssh_port,
self.virtual_machine.username,
self.virtual_machine.password

View File

@ -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

View File

@ -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 *

View File

@ -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 *

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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