diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-05 03:01:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-05 03:01:26 +0000 |
| commit | 9fda1e3d27e9f6c499a43396dfc71a47cb88e047 (patch) | |
| tree | 23d1d0f71451611980c1c7b735e1a0d36cffce8d | |
| parent | 685dc4895d0a0d1df6d29b53bf7db60839a6bf41 (diff) | |
| parent | 7e86ab000e5b897d3b7fac6aca0c11f4db51ef7d (diff) | |
| download | nova-9fda1e3d27e9f6c499a43396dfc71a47cb88e047.tar.gz nova-9fda1e3d27e9f6c499a43396dfc71a47cb88e047.tar.xz nova-9fda1e3d27e9f6c499a43396dfc71a47cb88e047.zip | |
Merge "vmwareapi: Add supported_instances to host state"
| -rw-r--r-- | nova/tests/test_vmwareapi.py | 3 | ||||
| -rw-r--r-- | nova/virt/vmwareapi/host.py | 2 |
2 files changed, 5 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) diff --git a/nova/virt/vmwareapi/host.py b/nova/virt/vmwareapi/host.py index 95d86311c..8c62c5ce9 100644 --- a/nova/virt/vmwareapi/host.py +++ b/nova/virt/vmwareapi/host.py @@ -202,6 +202,8 @@ class VCState(object): data["hypervisor_type"] = summary.config.product.name data["hypervisor_version"] = summary.config.product.version data["hypervisor_hostname"] = self._host_name + data["supported_instances"] = [('i686', 'vmware', 'hvm'), + ('x86_64', 'vmware', 'hvm')] self._stats = data return data |