marvin bvt: getting rid of unused keys in the test 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/943aef76 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/943aef76 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/943aef76 Branch: refs/heads/marvin_refactor Commit: 943aef76f1c7339cd31613b7780fb0e93c6a7a90 Parents: 79812c2 Author: Prasanna Santhanam <[email protected]> Authored: Mon Apr 8 23:25:06 2013 +0530 Committer: Prachi Damle <[email protected]> Committed: Thu Apr 11 13:23:34 2013 -0700 ---------------------------------------------------------------------- test/integration/smoke/test_affinity_groups.py | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/943aef76/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 83fccf5..0d06e64 100644 --- a/test/integration/smoke/test_affinity_groups.py +++ b/test/integration/smoke/test_affinity_groups.py @@ -53,9 +53,11 @@ class Services: }, "ostype": 'CentOS 5.3 (64-bit)', "mode": 'advanced', - "affinity": { - "name": "webvms", - "type": "host anti-affinity", + "virtual_machine" : { + "affinity": { + "name": "webvms", + "type": "host anti-affinity", + } } } @@ -73,17 +75,12 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) - cls.disk_offering = DiskOffering.create( - cls.api_client, - cls.services["disk_offering"] - ) cls.template = get_template( cls.api_client, cls.zone.id, cls.services["ostype"] ) cls.services["virtual_machine"]["zoneid"] = cls.zone.id - cls.services["volume"]["zoneid"] = cls.zone.id cls.services["template"] = cls.template.id cls.services["zoneid"] = cls.zone.id @@ -101,7 +98,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase): cls.services["service_offering"] ) - cls.ag = AffinityGroup.create(cls.api_client, cls.services["affinity"], domainid=cls.domain.id) + cls.ag = AffinityGroup.create(cls.api_client, cls.services["virtual_machine"]["affinity"], domainid=cls.domain.id) cls._cleanup = [ cls.service_offering,
