You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/02 15:52:48 UTC
[1/4] git commit: updated refs/heads/4.2 to e950b3a
Updated Branches:
refs/heads/4.2 154618b75 -> e950b3a9f
CLOUDSTACK-3168: Resolved 'Object NoneType' issue.
Replaces ipaddress by ipaddress.ipaddress wherever required
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit b8d876fff806e33e859016c252bd208c1ea28c2d)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3b275697
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3b275697
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3b275697
Branch: refs/heads/4.2
Commit: 3b2756974a5028810528f22f8ea2f86067cfbcb7
Parents: 8a41322
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Mon Jul 1 22:54:55 2013 -0400
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jul 2 19:21:14 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_network.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3b275697/test/integration/smoke/test_network.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py
index 6788dca..ca67121 100644
--- a/test/integration/smoke/test_network.py
+++ b/test/integration/smoke/test_network.py
@@ -551,9 +551,9 @@ class TestPortForwarding(cloudstackTestCase):
self.debug("SSHing into VM with IP address %s with NAT IP %s" %
(
self.virtual_machine.ipaddress,
- ip_address.ipaddress
+ ip_address.ipaddress.ipaddress
))
- self.virtual_machine.get_ssh_client(ip_address.ipaddress)
+ self.virtual_machine.get_ssh_client(ip_address.ipaddress.ipaddress)
except Exception as e:
self.fail(
"SSH Access failed for %s: %s" % \
@@ -577,7 +577,7 @@ class TestPortForwarding(cloudstackTestCase):
self.virtual_machine.ipaddress)
remoteSSHClient(
- ip_address.ipaddress,
+ ip_address.ipaddress.ipaddress,
self.virtual_machine.ssh_port,
self.virtual_machine.username,
self.virtual_machine.password
@@ -956,11 +956,11 @@ class TestLoadBalancingRule(cloudstackTestCase):
)
try:
hostnames = []
- self.try_ssh(self.non_src_nat_ip, hostnames)
- self.try_ssh(self.non_src_nat_ip, hostnames)
- self.try_ssh(self.non_src_nat_ip, hostnames)
- self.try_ssh(self.non_src_nat_ip, hostnames)
- self.try_ssh(self.non_src_nat_ip, hostnames)
+ self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames)
+ self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames)
+ self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames)
+ self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames)
+ self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames)
self.debug("Hostnames: %s" % str(hostnames))
self.assertIn(
@@ -985,7 +985,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
# Making host list empty
hostnames[:] = []
- self.try_ssh(self.non_src_nat_ip, hostnames)
+ self.try_ssh(self.non_src_nat_ip.ipaddress, hostnames)
self.assertIn(
self.vm_1.name,
hostnames,
[4/4] git commit: updated refs/heads/4.2 to e950b3a
Posted by ts...@apache.org.
Only print debug message when the planner fails to disperse
User Dispersion is a best effort of deployment planning and cannot
always guarantee the dispersion logic will work. However this does not
fail the deployment. Adjust the test so as to print a debug and exit
instead of fail.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 43f31dcc660920da231b2eaf06eb4c599fd6a366)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e950b3a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e950b3a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e950b3a9
Branch: refs/heads/4.2
Commit: e950b3a9fa6a3c35b7bfe55636016f234ecfa073
Parents: 6e399cc
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Jul 2 19:12:53 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jul 2 19:21:15 2013 +0530
----------------------------------------------------------------------
.../smoke/test_deploy_vms_with_varied_deploymentplanners.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e950b3a9/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
index ab44a2b..a08537e 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -181,11 +181,9 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
)
vm1clusterid = filter(lambda c: c.id == vm1.hostid, self.hosts)[0].clusterid
vm2clusterid = filter(lambda c: c.id == vm2.hostid, self.hosts)[0].clusterid
- self.assertNotEqual(
- vm1clusterid,
- vm2clusterid,
- msg="VMs (%s, %s) meant to be dispersed are deployed in the same cluster %s" % (vm1.id, vm2.id, vm1clusterid)
- )
+ if vm1clusterid == vm2clusterid:
+ self.debug("VMs (%s, %s) meant to be dispersed are deployed in the same cluster %s" % (
+ vm1.id, vm2.id, vm1clusterid))
@attr(tags=["simulator", "advanced", "basic", "sg"])
def test_deployvm_userconcentrated(self):
[2/4] git commit: updated refs/heads/4.2 to e950b3a
Posted by ts...@apache.org.
assertion fails because cluster could be None
Object is being used in one of the Assert statements however it is not
callable. Fixed it.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 479f89ca3c43bef2ee3258cf3e78f7843a7d53cb)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8a413224
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8a413224
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8a413224
Branch: refs/heads/4.2
Commit: 8a413224548070bacaa79d98fc319d277d51ef71
Parents: 154618b
Author: sanjeevneelarapu <sa...@citrix.com>
Authored: Tue Jul 2 20:25:34 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jul 2 19:21:14 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_primary_storage.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8a413224/test/integration/smoke/test_primary_storage.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_primary_storage.py b/test/integration/smoke/test_primary_storage.py
index 598654d..5cf31b1 100644
--- a/test/integration/smoke/test_primary_storage.py
+++ b/test/integration/smoke/test_primary_storage.py
@@ -196,7 +196,7 @@ class TestPrimaryStorageServices(cloudstackTestCase):
self.assertNotEqual(
len(list_hosts_response),
0,
- "Check list Hosts in the cluster: " + cluster
+ "Check list Hosts in the cluster: " + cluster.name
)
[3/4] git commit: updated refs/heads/4.2 to e950b3a
Posted by ts...@apache.org.
Cleanup list corrected
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit 46bd2f8a28210e0036023efaca6295df9d4b4058)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e399cc9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e399cc9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e399cc9
Branch: refs/heads/4.2
Commit: 6e399cc906a49060257c2318726bb0a48d31b291
Parents: 3b27569
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Tue Jul 2 17:00:55 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Tue Jul 2 19:21:15 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_affinity_groups.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e399cc9/test/integration/smoke/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py
index e0e1a17..e63b916 100644
--- a/test/integration/smoke/test_affinity_groups.py
+++ b/test/integration/smoke/test_affinity_groups.py
@@ -189,6 +189,6 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
try:
#cls.api_client = super(TestDeployVmWithAffinityGroup, cls).getClsTestClient().getApiClient()
#Clean up, terminate the created templates
- cleanup_resources(cls.api_client, cls.cleanup)
+ cleanup_resources(cls.api_client, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)