cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [46/50] [abbrv] git commit: updated refs/heads/disk_io_throttling to 8b8a0d3
Date Mon, 10 Jun 2013 17:27:40 GMT
deployment planners plan per clusters not hosts

Concentration or Dispersion granularity is at the Cluster level and not
at the host level. So correcting the test to ensure

a. concentrated planner puts the VMs in same cluster
b. dispersed planner puts the Vms in diff't clusters

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef0e0f36
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef0e0f36
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef0e0f36

Branch: refs/heads/disk_io_throttling
Commit: ef0e0f36b2e33eb65c2f0a2e99aa02eabf872b85
Parents: 5b48ec2
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Mon Jun 10 20:38:37 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Mon Jun 10 20:40:07 2013 +0530

----------------------------------------------------------------------
 setup/dev/advanced.cfg                          | 18 +++++++++++++++++
 ...deploy_vms_with_varied_deploymentplanners.py | 21 ++++++++++++--------
 2 files changed, 31 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef0e0f36/setup/dev/advanced.cfg
----------------------------------------------------------------------
diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg
index 8335786..3020165 100644
--- a/setup/dev/advanced.cfg
+++ b/setup/dev/advanced.cfg
@@ -99,6 +99,24 @@
                                     "name": "PS1"
                                 }
                             ]
+                        },
+                        {
+                            "clustername": "C1",
+                            "hypervisor": "simulator",
+                            "hosts": [
+                                {
+                                    "username": "root",
+                                    "url": "http://sim/c1/h0",
+                                    "password": "password"
+                                }
+                            ],
+                            "clustertype": "CloudManaged",
+                            "primaryStorages": [
+                                {
+                                    "url": "nfs://10.147.28.6:/export/home/sandbox/primary2",
+                                    "name": "PS2"
+                                }
+                            ]
                         }
                     ],
                     "gateway": "172.16.15.1"

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef0e0f36/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 67532c7..f1b3043 100644
--- a/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
+++ b/test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
@@ -16,7 +16,7 @@
 # under the License.
 
 from marvin.cloudstackTestCase import cloudstackTestCase
-from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering
+from marvin.integration.lib.base import Account, VirtualMachine, ServiceOffering, Host
 from marvin.integration.lib.common import get_zone, get_domain, get_template, cleanup_resources
 
 from nose.plugins.attrib import attr
@@ -76,6 +76,7 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
             domainid=cls.domain.id
         )
         cls.services["account"] = cls.account.name
+        cls.hosts = Host.list(cls.apiclient, hypervisortype='Simulator')
         cls.cleanup = [
             cls.account
         ]
@@ -177,10 +178,12 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
             "Running",
             msg="VM is not in Running state"
         )
+        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(
-            vm1.hostid,
-            vm2.hostid,
-            msg="VMs meant to be dispersed are deployed on the same host"
+            vm1clusterid,
+            vm2clusterid,
+            msg="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"])
@@ -236,10 +239,12 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
             "Running",
             msg="VM is not in Running state"
         )
-        self.assertNotEqual(
-            vm1.hostid,
-            vm2.hostid,
-            msg="VMs meant to be concentrated are deployed on the different hosts"
+        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.assertEqual(
+            vm1clusterid,
+            vm2clusterid,
+            msg="VMs (%s, %s) meant to be concentrated are deployed on different clusters
(%s, %s)" % (vm1.id, vm2.id, vm1clusterid, vm2clusterid)
         )
 
     @classmethod


Mime
View raw message