apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed few indentation errors and removed unwanted imports

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/integration/component/test_network_offering.py
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

24
test/integration/component/test_portable_ip.py
View File

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

11
test/integration/component/test_security_groups.py
View File

@ -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(
self.virtual_machine.ssh_ip,
self.virtual_machine.ssh_port,
self.virtual_machine.username,
self.virtual_machine.password
)
SshClient(self.virtual_machine.ssh_ip,
self.virtual_machine.ssh_port,
self.virtual_machine.username,
self.virtual_machine.password
)
return

1
test/integration/component/test_snapshot_limits.py
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

1
test/integration/component/test_stopped_vm.py
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 *

1
test/integration/component/test_storage_motion.py
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 *

1
test/integration/component/test_templates.py
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

1
test/integration/component/test_vpc_network.py
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

1
test/integration/component/test_vpc_routers.py
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

1
test/integration/component/test_vpc_vm_life_cycle.py
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

1
test/integration/component/test_vpc_vms_deployment.py
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