openstack/nova
Code Issues Proposed changes

XenAPI: Correct hypervisor type in Horizon's admin view

Browse Source 
Currently hypervisor_type of xen shown in nova api is 'xen', while
'XenServer' could be more accurate.

Change-Id: Ia406e6762312367c0a12db491623766951d49dc6
Closes-Bug: #1507424
UpgradeImpact: hypervisor_type renamed in Nova API
This commit is contained in:
John Hua
2015-10-20 10:42:04 +08:00
committed by Bob Ball
parent 150406679c
commit 6a95ed1057
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/xenapi/test_driver.py
View File

@@ -82,7 +82,7 @@ class XenAPIDriverTestCase(stubs.XenAPITestBaseNoDB):
self.assertEqual(10, resources['vcpus_used']) self.assertEqual(10, resources['vcpus_used'])
self.assertEqual(3 - 2, resources['memory_mb_used']) self.assertEqual(3 - 2, resources['memory_mb_used'])
self.assertEqual(2, resources['local_gb_used']) self.assertEqual(2, resources['local_gb_used'])
self.assertEqual('xen', resources['hypervisor_type']) self.assertEqual('XenServer', resources['hypervisor_type'])
self.assertEqual('somename', resources['hypervisor_hostname']) self.assertEqual('somename', resources['hypervisor_hostname'])
self.assertEqual(1, resources['disk_available_least']) self.assertEqual(1, resources['disk_available_least'])

2
nova/virt/xenapi/driver.py
View File

@@ -453,7 +453,7 @@ class XenAPIDriver(driver.ComputeDriver):
'vcpus_used': host_stats['vcpus_used'], 'vcpus_used': host_stats['vcpus_used'],
'memory_mb_used': total_ram_mb - free_ram_mb, 'memory_mb_used': total_ram_mb - free_ram_mb,
'local_gb_used': used_disk_gb, 'local_gb_used': used_disk_gb,
'hypervisor_type': 'xen', 'hypervisor_type': 'XenServer',
'hypervisor_version': hyper_ver, 'hypervisor_version': hyper_ver,
'hypervisor_hostname': host_stats['host_hostname'], 'hypervisor_hostname': host_stats['host_hostname'],
'cpu_info': jsonutils.dumps(host_stats['cpu_model']), 'cpu_info': jsonutils.dumps(host_stats['cpu_model']),