Merge "set default value to 0 instead of ''"

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):

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', {})),