Updated Branches:
refs/heads/4.2 e82fe0169 -> 6a92f7546
Fixed few indentation errors and removed unwanted imports
Conflicts:
test/integration/component/test_portable_ip.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6a92f754
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6a92f754
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6a92f754
Branch: refs/heads/4.2
Commit: 6a92f75465d07e78d8b8bd58f39e0f3591337a01
Parents: e82fe01
Author: Santhosh Edukulla <santhosh.eduku...@citrix.com>
Authored: Mon Nov 11 10:32:01 2013 +0530
Committer: Gaurav Aradhye <gaurav.arad...@clogeny.com>
Committed: Sun Nov 10 17:34:46 2013 -0500
----------------------------------------------------------------------
.../component/test_network_offering.py | 1 -
test/integration/component/test_portable_ip.py | 24 ++++++++------------
.../component/test_security_groups.py | 11 ++++-----
.../component/test_snapshot_limits.py | 1 -
test/integration/component/test_stopped_vm.py | 1 -
.../component/test_storage_motion.py | 1 -
test/integration/component/test_templates.py | 1 -
test/integration/component/test_vpc_network.py | 1 -
test/integration/component/test_vpc_routers.py | 1 -
.../component/test_vpc_vm_life_cycle.py | 1 -
.../component/test_vpc_vms_deployment.py | 1 -
11 files changed, 15 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_network_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_network_offering.py
b/test/integration/component/test_network_offering.py
index 04777b0..33c4305 100644
--- a/test/integration/component/test_network_offering.py
+++ b/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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_portable_ip.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_portable_ip.py
b/test/integration/component/test_portable_ip.py
index 499fa37..14b6dac 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/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,
- 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)
-
- remoteSSHClient(
- 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)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py
b/test/integration/component/test_security_groups.py
index c90ccf6..8e07396 100644
--- a/test/integration/component/test_security_groups.py
+++ b/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(
- 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_snapshot_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshot_limits.py
b/test/integration/component/test_snapshot_limits.py
index e52a893..a1bf1ba 100644
--- a/test/integration/component/test_snapshot_limits.py
+++ b/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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_stopped_vm.py
b/test/integration/component/test_stopped_vm.py
index 5a5c298..2586c0b 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/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 *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_storage_motion.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_storage_motion.py
b/test/integration/component/test_storage_motion.py
index bae5acf..194ba97 100644
--- a/test/integration/component/test_storage_motion.py
+++ b/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 *
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py
b/test/integration/component/test_templates.py
index af86d32..91de9b3 100644
--- a/test/integration/component/test_templates.py
+++ b/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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py
b/test/integration/component/test_vpc_network.py
index 9f5e6f6..c918f54 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py
b/test/integration/component/test_vpc_routers.py
index 8ed99ca..a836627 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py
b/test/integration/component/test_vpc_vm_life_cycle.py
index cc65eed..3690514 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a92f754/test/integration/component/test_vpc_vms_deployment.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vms_deployment.py
b/test/integration/component/test_vpc_vms_deployment.py
index ebf3b31..c4811ed 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/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
