Merge "Minor tweaks to hypervisor_version to int"

openstack · Jul 22, 2014 · a905cf2 · a905cf2
2 parents adfccd1 + d902596
commit a905cf2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/nova/tests/integrated/v3/test_migrate_server.py b/nova/tests/integrated/v3/test_migrate_server.py
@@ -18,6 +18,7 @@
 from nova.conductor import manager as conductor_manager
 from nova import db
 from nova.tests.integrated.v3 import test_servers
+from nova import utils
 
 
 class MigrateServerSamplesJsonTest(test_servers.ServersSampleBase):
@@ -58,7 +59,8 @@ def fake_get_compute(context, host):
                            report_count=1,
                            updated_at='foo',
                            hypervisor_type='bar',
-                           hypervisor_version='1000',
+                           hypervisor_version=utils.convert_version_to_int(
+                               '1.0'),
                            disabled=False)
             return {'compute_node': [service]}
         self.stubs.Set(db, "service_get_by_compute_host", fake_get_compute)

diff --git a/nova/tests/virt/test_virt_drivers.py b/nova/tests/virt/test_virt_drivers.py
@@ -609,7 +609,6 @@ def _check_available_resource_fields(self, host_status):
     def test_get_host_stats(self):
         host_status = self.connection.get_host_stats()
         self._check_available_resource_fields(host_status)
-        self.assertIsInstance(host_status['hypervisor_version'], int)
 
     @catch_notimplementederror
     def test_get_available_resource(self):