Affinity Groups requires multiple storage pools Fixing the affinity group test which would fail to find the appropriate storage pool to satisfy the anti-affinity group of the second VM
Signed-off-by: Prasanna Santhanam <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c388f7f1 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c388f7f1 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c388f7f1 Branch: refs/heads/ui-cisco-asa1000v-support Commit: c388f7f180bb98f6753944392e5ff7e6dad824e7 Parents: 71771c1 Author: Prasanna Santhanam <[email protected]> Authored: Mon May 6 19:53:42 2013 +0530 Committer: Prasanna Santhanam <[email protected]> Committed: Mon May 6 19:53:42 2013 +0530 ---------------------------------------------------------------------- setup/dev/advanced.cfg | 6 +++++- test/integration/smoke/test_affinity_groups.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c388f7f1/setup/dev/advanced.cfg ---------------------------------------------------------------------- diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg index c031c2a..4315989 100644 --- a/setup/dev/advanced.cfg +++ b/setup/dev/advanced.cfg @@ -84,8 +84,12 @@ "clustertype": "CloudManaged", "primaryStorages": [ { - "url": "nfs://10.147.28.6:/export/home/sandbox/primary", + "url": "nfs://10.147.28.6:/export/home/sandbox/primary0", "name": "PS0" + }, + { + "url": "nfs://10.147.28.6:/export/home/sandbox/primary1", + "name": "PS1" } ] } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c388f7f1/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 3ed3115..6ccd478 100644 --- a/test/integration/smoke/test_affinity_groups.py +++ b/test/integration/smoke/test_affinity_groups.py @@ -187,7 +187,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase): @classmethod def tearDown(cls): try: - cls.api_client = super(TestDeployVmWithAffinityGroup, cls).getClsTestClient().getApiClient() + #cls.api_client = super(TestDeployVmWithAffinityGroup, cls).getClsTestClient().getApiClient() #Clean up, terminate the created templates cleanup_resources(cls.api_client, cls.cleanup) except Exception as e:
