summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-05-05 03:01:26 +0000
committerGerrit Code Review <review@openstack.org>2013-05-05 03:01:26 +0000
commit9fda1e3d27e9f6c499a43396dfc71a47cb88e047 (patch)
tree23d1d0f71451611980c1c7b735e1a0d36cffce8d /nova/tests
parent685dc4895d0a0d1df6d29b53bf7db60839a6bf41 (diff)
parent7e86ab000e5b897d3b7fac6aca0c11f4db51ef7d (diff)
Merge "vmwareapi: Add supported_instances to host state"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/test_vmwareapi.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index bbd5a2caa..f63e403d6 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -406,6 +406,9 @@ class VMwareAPIHostTestCase(test.TestCase):
self.assertEquals(stats['disk_used'], 1024 - 500)
self.assertEquals(stats['host_memory_total'], 1024)
self.assertEquals(stats['host_memory_free'], 1024 - 500)
+ supported_instances = [('i686', 'vmware', 'hvm'),
+ ('x86_64', 'vmware', 'hvm')]
+ self.assertEquals(stats['supported_instances'], supported_instances)
def _test_host_action(self, method, action, expected=None):
result = method('host', action)