From c388f7f180bb98f6753944392e5ff7e6dad824e7 Mon Sep 17 00:00:00 2001 From: Prasanna Santhanam Date: Mon, 6 May 2013 19:53:42 +0530 Subject: [PATCH] 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 --- setup/dev/advanced.cfg | 6 +++++- test/integration/smoke/test_affinity_groups.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/setup/dev/advanced.cfg b/setup/dev/advanced.cfg index c031c2a4f84..431598947c6 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" } ] } diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py index 3ed31152643..6ccd478bf2d 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: