CLOUDSTACK-7866: Passing type value to list_hosts method so as to avoid listing SSVM and CPVM
Correcting hostid attribute Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e00f99c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e00f99c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e00f99c Branch: refs/heads/master Commit: 3e00f99c535e318faab4c09ac943fd8540f81d17 Parents: 0bd34d3 Author: Gaurav Aradhye <gaurav.arad...@clogeny.com> Authored: Mon Nov 10 11:58:18 2014 +0530 Committer: SrikanteswaraRao Talluri <tall...@apache.org> Committed: Mon Nov 10 16:29:39 2014 +0530 ---------------------------------------------------------------------- .../maint/test_host_high_availability.py | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e00f99c/test/integration/component/maint/test_host_high_availability.py ---------------------------------------------------------------------- diff --git a/test/integration/component/maint/test_host_high_availability.py b/test/integration/component/maint/test_host_high_availability.py index ecc23f7..0d76f81 100644 --- a/test/integration/component/maint/test_host_high_availability.py +++ b/test/integration/component/maint/test_host_high_availability.py @@ -19,11 +19,20 @@ """ #Import Local Modules from nose.plugins.attrib import attr -from marvin.cloudstackTestCase import * -from marvin.cloudstackAPI import * -from marvin.lib.utils import * -from marvin.lib.base import * -from marvin.lib.common import * +from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.cloudstackAPI import (migrateVirtualMachine, + prepareHostForMaintenance, + cancelHostMaintenance) +from marvin.lib.utils import cleanup_resources +from marvin.lib.base import (Account, + VirtualMachine, + ServiceOffering) +from marvin.lib.common import (get_zone, + get_domain, + get_template, + list_hosts, + list_virtual_machines, + list_service_offering) import time @@ -490,6 +499,7 @@ class TestHostHighAvailability(cloudstackTestCase): #Find out Non-Suitable host for VM migration list_hosts_response = list_hosts( self.apiclient, + type="Routing" ) self.assertEqual( isinstance(list_hosts_response, list), @@ -505,7 +515,7 @@ class TestHostHighAvailability(cloudstackTestCase): notSuitableHost = None for host in list_hosts_response: - if not host.suitableformigration and host.hostid != vm.hostid: + if not host.suitableformigration and host.id != vm.hostid: notSuitableHost = host break
