From 560987f920c7080050e5291206559a57885819be Mon Sep 17 00:00:00 2001 From: jichenjc Date: Mon, 10 Feb 2020 03:31:38 +0000 Subject: [PATCH] set default value to 0 instead of '' hypervisor_version of z/VM driver returned '' but in fact it is defined as fields.IntegerField() which means it should be int value by default. Closes-Bug: 1862750 Change-Id: Ib4f2ecbbb731943eda996d525ddaafd2260fd1a3 --- nova/tests/unit/virt/zvm/test_driver.py | 1 + nova/virt/zvm/driver.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nova/tests/unit/virt/zvm/test_driver.py b/nova/tests/unit/virt/zvm/test_driver.py index 022816df7d..1a0312d0c5 100644 --- a/nova/tests/unit/virt/zvm/test_driver.py +++ b/nova/tests/unit/virt/zvm/test_driver.py @@ -136,6 +136,7 @@ class TestZVMDriver(test.NoDBTestCase): self.assertEqual(0, results['vcpus']) self.assertEqual(0, results['memory_mb_used']) self.assertEqual(0, results['disk_available_least']) + self.assertEqual(0, results['hypervisor_version']) self.assertEqual('TESTHOST', results['hypervisor_hostname']) def test_driver_template_validation(self): diff --git a/nova/virt/zvm/driver.py b/nova/virt/zvm/driver.py index 02d83f8a6b..c743933386 100644 --- a/nova/virt/zvm/driver.py +++ b/nova/virt/zvm/driver.py @@ -119,7 +119,7 @@ class ZVMDriver(driver.ComputeDriver): 'local_gb_used': host_stats.get('disk_used', 0), 'hypervisor_type': host_stats.get('hypervisor_type', obj_fields.HVType.ZVM), - 'hypervisor_version': host_stats.get('hypervisor_version', ''), + 'hypervisor_version': host_stats.get('hypervisor_version', 0), 'hypervisor_hostname': host_stats.get('hypervisor_hostname', hypervisor_hostname), 'cpu_info': jsonutils.dumps(host_stats.get('cpu_info', {})),