Merge "Backporting nova host manager changes into ironic"

3 files changed, 11 insertions, 15 deletions

diff --git a/ironic/nova/scheduler/baremetal_host_manager.py b/ironic/nova/scheduler/baremetal_host_manager.py
index 6d23ef18d..8aa3c643a 100644
--- a/ironic/nova/scheduler/baremetal_host_manager.py
+++ b/ironic/nova/scheduler/baremetal_host_manager.py
@@ -19,8 +19,6 @@ Manage hosts in the current zone.
 """
 
 import ironic.nova.scheduler.base_baremetal_host_manager as bbhm
-
-from nova.openstack.common import jsonutils
 from nova.scheduler import host_manager
 
 
@@ -36,7 +34,7 @@ class BaremetalHostManager(bbhm.BaseBaremetalHostManager):
     """Bare-Metal HostManager class."""
 
     def host_state_cls(self, host, node, **kwargs):
-        """Factory function/property to create a new HostState"""
+        """Factory function/property to create a new HostState."""
         compute = kwargs.get('compute')
         if compute and compute.get('cpu_info') == 'baremetal cpu':
             return BaremetalNodeState(host, node, **kwargs)
diff --git a/ironic/nova/scheduler/ironic_host_manager.py b/ironic/nova/scheduler/ironic_host_manager.py
index 89c7d6b66..562660be1 100644
--- a/ironic/nova/scheduler/ironic_host_manager.py
+++ b/ironic/nova/scheduler/ironic_host_manager.py
@@ -23,11 +23,9 @@ subdivided into multiple instances.
 """
 from oslo.config import cfg
 
-import ironic.nova.scheduler.base_baremetal_host_manager as bbhm
-
-from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
+from ironic.nova.scheduler import base_baremetal_host_manager as bbhm
 from nova.scheduler import host_manager
 
 host_manager_opts = [
@@ -87,7 +85,7 @@ class IronicHostManager(bbhm.BaseBaremetalHostManager):
             CONF.scheduler_default_filters = baremetal_default
 
     def host_state_cls(self, host, node, **kwargs):
-        """Factory function/property to create a new HostState"""
+        """Factory function/property to create a new HostState."""
         compute = kwargs.get('compute')
         if compute and compute.get('cpu_info') == 'baremetal cpu':
             return IronicNodeState(host, node, **kwargs)
diff --git a/ironic/nova/tests/scheduler/test_ironic_host_manager.py b/ironic/nova/tests/scheduler/test_ironic_host_manager.py
index 23c99a6fb..52b643333 100644
--- a/ironic/nova/tests/scheduler/test_ironic_host_manager.py
+++ b/ironic/nova/tests/scheduler/test_ironic_host_manager.py
@@ -19,15 +19,14 @@ Tests For IronicHostManager
 
 import mock
 
-from ironic.nova.scheduler import ironic_host_manager
-from ironic.nova.tests.scheduler import ironic_fakes
-
 from nova import db
 from nova import exception
 from nova.openstack.common import jsonutils
 from nova.scheduler import filters
 from nova.scheduler import host_manager
+from ironic.nova.scheduler import ironic_host_manager
 from nova import test
+from ironic.nova.tests.scheduler import ironic_fakes
 
 
 class FakeFilterClass1(filters.BaseHostFilter):
@@ -80,14 +79,15 @@ class IronicHostManagerChangedNodesTestCase(test.NoDBTestCase):
     def setUp(self):
         super(IronicHostManagerChangedNodesTestCase, self).setUp()
         self.host_manager = ironic_host_manager.IronicHostManager()
+        ironic_driver = "nova.virt.ironic.driver.IronicDriver"
+        supported_instances = '[["i386", "baremetal", "baremetal"]]'
         self.compute_node = dict(id=1, local_gb=10, memory_mb=1024, vcpus=1,
                             vcpus_used=0, local_gb_used=0, memory_mb_used=0,
                             updated_at=None, cpu_info='baremetal cpu',
-                            stats=jsonutils.dumps(dict(ironic_driver=
-                                       "nova.virt.ironic.driver.IronicDriver",
-                                       cpu_arch='i386')),
-                            supported_instances=
-                                        '[["i386", "baremetal", "baremetal"]]',
+                                stats=jsonutils.dumps(dict(
+                                    ironic_driver=ironic_driver,
+                                    cpu_arch='i386')),
+                            supported_instances=supported_instances,
                             free_disk_gb=10, free_ram_mb=1024)
 
     @mock.patch.object(ironic_host_manager.IronicNodeState, '__init__')