marvin bvt: getting rid of unused keys in the test

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam 2013-04-08 23:25:06 +05:30 committed by Prachi Damle
parent 79812c253f
commit 943aef76f1

View File

@ -53,11 +53,13 @@ class Services:
}, },
"ostype": 'CentOS 5.3 (64-bit)', "ostype": 'CentOS 5.3 (64-bit)',
"mode": 'advanced', "mode": 'advanced',
"virtual_machine" : {
"affinity": { "affinity": {
"name": "webvms", "name": "webvms",
"type": "host anti-affinity", "type": "host anti-affinity",
} }
} }
}
class TestDeployVmWithAffinityGroup(cloudstackTestCase): class TestDeployVmWithAffinityGroup(cloudstackTestCase):
@ -73,17 +75,12 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.api_client, cls.services) cls.domain = get_domain(cls.api_client, cls.services)
cls.zone = get_zone(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.template = get_template(
cls.api_client, cls.api_client,
cls.zone.id, cls.zone.id,
cls.services["ostype"] cls.services["ostype"]
) )
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.services["volume"]["zoneid"] = cls.zone.id
cls.services["template"] = cls.template.id cls.services["template"] = cls.template.id
cls.services["zoneid"] = cls.zone.id cls.services["zoneid"] = cls.zone.id
@ -101,7 +98,7 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
cls.services["service_offering"] 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._cleanup = [
cls.service_offering, cls.service_offering,