Merge "Fix how service objects are looked up for Cells"

8 files changed, 168 insertions, 58 deletions

diff --git a/nova/api/openstack/compute/contrib/hypervisors.py b/nova/api/openstack/compute/contrib/hypervisors.py
index 5acd01cdda..1a5c1fa75e 100644
--- a/nova/api/openstack/compute/contrib/hypervisors.py
+++ b/nova/api/openstack/compute/contrib/hypervisors.py
@@ -21,7 +21,6 @@ from nova.api.openstack import extensions
 from nova import compute
 from nova import exception
 from nova.i18n import _
-from nova import objects
 from nova import servicegroup
 
 
@@ -88,8 +87,8 @@ class HypervisorsController(object):
         req.cache_db_compute_nodes(compute_nodes)
         return dict(hypervisors=[self._view_hypervisor(
                                  hyp,
-                                 objects.Service.get_by_host_and_binary(
-                                     context, hyp.host, 'nova-compute'),
+                                 self.host_api.service_get_by_compute_host(
+                                     context, hyp.host),
                                  False)
                                  for hyp in compute_nodes])
 
@@ -100,8 +99,8 @@ class HypervisorsController(object):
         req.cache_db_compute_nodes(compute_nodes)
         return dict(hypervisors=[self._view_hypervisor(
                                  hyp,
-                                 objects.Service.get_by_host_and_binary(
-                                     context, hyp.host, 'nova-compute'),
+                                 self.host_api.service_get_by_compute_host(
+                                     context, hyp.host),
                                  True)
                                  for hyp in compute_nodes])
 
@@ -114,8 +113,7 @@ class HypervisorsController(object):
         except (ValueError, exception.ComputeHostNotFound):
             msg = _("Hypervisor with ID '%s' could not be found.") % id
             raise webob.exc.HTTPNotFound(explanation=msg)
-        service = objects.Service.get_by_host_and_binary(
-            context, hyp.host, 'nova-compute')
+        service = self.host_api.service_get_by_compute_host(context, hyp.host)
         return dict(hypervisor=self._view_hypervisor(hyp, service, True))
 
     def uptime(self, req, id):
@@ -136,8 +134,7 @@ class HypervisorsController(object):
             msg = _("Virt driver does not implement uptime function.")
             raise webob.exc.HTTPNotImplemented(explanation=msg)
 
-        service = objects.Service.get_by_host_and_binary(
-            context, host, 'nova-compute')
+        service = self.host_api.service_get_by_compute_host(context, host)
         return dict(hypervisor=self._view_hypervisor(hyp, service, False,
                                                      uptime=uptime))
 
@@ -149,9 +146,8 @@ class HypervisorsController(object):
         if hypervisors:
             return dict(hypervisors=[self._view_hypervisor(
                                      hyp,
-                                     objects.Service.get_by_host_and_binary(
-                                         context,
-                                         hyp.host, 'nova-compute'),
+                                     self.host_api.service_get_by_compute_host(
+                                         context, hyp.host),
                                      False)
                                      for hyp in hypervisors])
         else:
@@ -170,8 +166,8 @@ class HypervisorsController(object):
         for compute_node in compute_nodes:
             instances = self.host_api.instance_get_all_by_host(context,
                     compute_node.host)
-            service = objects.Service.get_by_host_and_binary(
-                context, compute_node.host, 'nova-compute')
+            service = self.host_api.service_get_by_compute_host(
+                context, compute_node.host)
             hyp = self._view_hypervisor(compute_node, service, False,
                                         instances)
             hypervisors.append(hyp)
diff --git a/nova/api/openstack/compute/plugins/v3/hypervisors.py b/nova/api/openstack/compute/plugins/v3/hypervisors.py
index 6cc2502bd7..e45f80a75a 100644
--- a/nova/api/openstack/compute/plugins/v3/hypervisors.py
+++ b/nova/api/openstack/compute/plugins/v3/hypervisors.py
@@ -22,7 +22,6 @@ from nova.api.openstack import wsgi
 from nova import compute
 from nova import exception
 from nova.i18n import _
-from nova import objects
 from nova import servicegroup
 
 
@@ -82,8 +81,8 @@ class HypervisorsController(wsgi.Controller):
         req.cache_db_compute_nodes(compute_nodes)
         return dict(hypervisors=[self._view_hypervisor(
                                  hyp,
-                                 objects.Service.get_by_host_and_binary(
-                                     context, hyp.host, 'nova-compute'),
+                                 self.host_api.service_get_by_compute_host(
+                                     context, hyp.host),
                                  False)
                                  for hyp in compute_nodes])
 
@@ -95,8 +94,8 @@ class HypervisorsController(wsgi.Controller):
         req.cache_db_compute_nodes(compute_nodes)
         return dict(hypervisors=[self._view_hypervisor(
                                  hyp,
-                                 objects.Service.get_by_host_and_binary(
-                                     context, hyp.host, 'nova-compute'),
+                                 self.host_api.service_get_by_compute_host(
+                                     context, hyp.host),
                                  True)
                                  for hyp in compute_nodes])
 
@@ -110,8 +109,7 @@ class HypervisorsController(wsgi.Controller):
         except (ValueError, exception.ComputeHostNotFound):
             msg = _("Hypervisor with ID '%s' could not be found.") % id
             raise webob.exc.HTTPNotFound(explanation=msg)
-        service = objects.Service.get_by_host_and_binary(
-            context, hyp.host, 'nova-compute')
+        service = self.host_api.service_get_by_compute_host(context, hyp.host)
         return dict(hypervisor=self._view_hypervisor(hyp, service, True))
 
     @extensions.expected_errors((404, 501))
@@ -133,8 +131,7 @@ class HypervisorsController(wsgi.Controller):
             msg = _("Virt driver does not implement uptime function.")
             raise webob.exc.HTTPNotImplemented(explanation=msg)
 
-        service = objects.Service.get_by_host_and_binary(
-            context, host, 'nova-compute')
+        service = self.host_api.service_get_by_compute_host(context, host)
         return dict(hypervisor=self._view_hypervisor(hyp, service, False,
                                                      uptime=uptime))
 
@@ -147,9 +144,8 @@ class HypervisorsController(wsgi.Controller):
         if hypervisors:
             return dict(hypervisors=[self._view_hypervisor(
                                      hyp,
-                                     objects.Service.get_by_host_and_binary(
-                                         context,
-                                         hyp.host, 'nova-compute'),
+                                     self.host_api.service_get_by_compute_host(
+                                         context, hyp.host),
                                      False)
                                      for hyp in hypervisors])
         else:
@@ -169,8 +165,8 @@ class HypervisorsController(wsgi.Controller):
         for compute_node in compute_nodes:
             instances = self.host_api.instance_get_all_by_host(context,
                     compute_node.host)
-            service = objects.Service.get_by_host_and_binary(
-                context, compute_node.host, 'nova-compute')
+            service = self.host_api.service_get_by_compute_host(
+                context, compute_node.host)
             hyp = self._view_hypervisor(compute_node, service, False,
                                         instances)
             hypervisors.append(hyp)
diff --git a/nova/cells/manager.py b/nova/cells/manager.py
index 266528895c..a7f1956bf6 100644
--- a/nova/cells/manager.py
+++ b/nova/cells/manager.py
@@ -366,6 +366,7 @@ class CellsManager(manager.Manager):
                 ret_task_logs.append(task_log)
         return ret_task_logs
 
+    @oslo_messaging.expected_exceptions(exception.CellRoutingInconsistency)
     def compute_node_get(self, ctxt, compute_id):
         """Get a compute node by ID in a specific cell."""
         cell_name, compute_id = cells_utils.split_cell_and_item(
diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py
index aa7eedc5cf..6fd1dc7949 100644
--- a/nova/compute/cells_api.py
+++ b/nova/compute/cells_api.py
@@ -587,7 +587,10 @@ class HostAPI(compute_api.HostAPI):
         """Get a compute node from a particular cell by its integer ID.
         compute_id should be in the format of 'path!to!cell@ID'.
         """
-        return self.cells_rpcapi.compute_node_get(context, compute_id)
+        try:
+            return self.cells_rpcapi.compute_node_get(context, compute_id)
+        except exception.CellRoutingInconsistency:
+            raise exception.ComputeHostNotFound(host=compute_id)
 
     def compute_node_get_all(self, context):
         return self.cells_rpcapi.compute_node_get_all(context)
diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/test_api_samples.py
index e25bcde603..7b5ee1e9c1 100644
--- a/nova/tests/functional/test_api_samples.py
+++ b/nova/tests/functional/test_api_samples.py
@@ -32,6 +32,7 @@ import testtools
 from nova.api.metadata import password
 from nova.api.openstack.compute.contrib import fping
 from nova.api.openstack.compute import extensions
+from nova.cells import utils as cells_utils
 # Import extensions to pull in osapi_compute_extension CONF option used below.
 from nova.cloudpipe import pipelib
 from nova.compute import api as compute_api
@@ -2513,15 +2514,16 @@ class HypervisorsCellsSampleJsonTests(ApiSampleTestBaseV2):
         def fake_compute_node_get(self, context, hyp):
             return fake_hypervisor
 
-        @classmethod
-        def fake_service_get_by_host_and_binary(cls, context, host, binary):
-            return objects.Service(host='fake-mini', disabled=False,
-                                   disabled_reason=None)
+        def fake_service_get_by_compute_host(self, context, host):
+            return cells_utils.ServiceProxy(
+                objects.Service(id=1, host='fake-mini', disabled=False,
+                                disabled_reason=None),
+                'cell1')
 
         self.stubs.Set(cells_api.HostAPI, 'compute_node_get',
                        fake_compute_node_get)
-        self.stubs.Set(objects.Service, 'get_by_host_and_binary',
-                       fake_service_get_by_host_and_binary)
+        self.stubs.Set(cells_api.HostAPI, 'service_get_by_compute_host',
+                       fake_service_get_by_compute_host)
 
         self.stubs.Set(cells_api.HostAPI,
                        'get_host_uptime', fake_get_host_uptime)
diff --git a/nova/tests/functional/v3/test_pci.py b/nova/tests/functional/v3/test_pci.py
index db8f5808f6..011c9a5093 100644
--- a/nova/tests/functional/v3/test_pci.py
+++ b/nova/tests/functional/v3/test_pci.py
@@ -146,7 +146,7 @@ class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
             disabled_reason=None)
 
     @mock.patch("nova.servicegroup.API.service_is_up", return_value=True)
-    @mock.patch("nova.objects.Service.get_by_host_and_binary")
+    @mock.patch("nova.objects.Service.get_by_compute_host")
     @mock.patch("nova.objects.ComputeNode.get_by_id")
     def test_pci_show(self, mock_obj, mock_svc_get, mock_service):
         mock_obj.return_value = self.fake_compute_node
@@ -161,7 +161,7 @@ class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
                               subs, response, 200)
 
     @mock.patch("nova.servicegroup.API.service_is_up", return_value=True)
-    @mock.patch("nova.objects.Service.get_by_host_and_binary")
+    @mock.patch("nova.objects.Service.get_by_compute_host")
     @mock.patch("nova.objects.ComputeNodeList.get_all")
     def test_pci_detail(self, mock_obj, mock_svc_get, mock_service):
         mock_obj.return_value = [self.fake_compute_node]
diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_extended_hypervisors.py b/nova/tests/unit/api/openstack/compute/contrib/test_extended_hypervisors.py
index 4039d85c78..175f468629 100644
--- a/nova/tests/unit/api/openstack/compute/contrib/test_extended_hypervisors.py
+++ b/nova/tests/unit/api/openstack/compute/contrib/test_extended_hypervisors.py
@@ -39,7 +39,7 @@ def fake_compute_node_get_all(context):
 
 
 @classmethod
-def fake_service_get_by_host_and_binary(cls, context, host, binary):
+def fake_service_get_by_compute_host(cls, context, host):
     for service in test_hypervisors.TEST_SERVICES:
         if service.host == host:
             return service
@@ -77,8 +77,8 @@ class ExtendedHypervisorsTestV21(test.NoDBTestCase):
                        fake_compute_node_get_all)
         self.stubs.Set(self.controller.host_api, 'compute_node_get',
                        fake_compute_node_get)
-        self.stubs.Set(objects.Service, 'get_by_host_and_binary',
-                       fake_service_get_by_host_and_binary)
+        self.stubs.Set(objects.Service, 'get_by_compute_host',
+                       fake_service_get_by_compute_host)
 
     def test_view_hypervisor_detail_noservers(self):
         result = self.controller._view_hypervisor(
diff --git a/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py b/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py
index 9f63a3d116..6ee8121303 100644
--- a/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py
+++ b/nova/tests/unit/api/openstack/compute/contrib/test_hypervisors.py
@@ -23,6 +23,7 @@ from nova.api.openstack.compute.contrib import hypervisors as hypervisors_v2
 from nova.api.openstack.compute.plugins.v3 import hypervisors \
     as hypervisors_v21
 from nova.api.openstack import extensions
+from nova.cells import utils as cells_utils
 from nova import context
 from nova import db
 from nova import exception
@@ -117,8 +118,7 @@ def fake_compute_node_get(context, compute_id):
     raise exception.ComputeHostNotFound(host=compute_id)
 
 
-@classmethod
-def fake_service_get_by_host_and_binary(cls, context, host, binary):
+def fake_service_get_by_compute_host(context, host):
     for service in TEST_SERVICES:
         if service.host == host:
             return service
@@ -159,6 +159,11 @@ def fake_instance_get_all_by_host(context, host):
 
 
 class HypervisorsTestV21(test.NoDBTestCase):
+    # copying the objects locally so the cells testcases can provide their own
+    TEST_HYPERS_OBJ = copy.deepcopy(TEST_HYPERS_OBJ)
+    TEST_SERVICES = copy.deepcopy(TEST_SERVICES)
+    TEST_SERVERS = copy.deepcopy(TEST_SERVERS)
+
     DETAIL_HYPERS_DICTS = copy.deepcopy(TEST_HYPERS)
     del DETAIL_HYPERS_DICTS[0]['service_id']
     del DETAIL_HYPERS_DICTS[1]['service_id']
@@ -193,8 +198,8 @@ class HypervisorsTestV21(test.NoDBTestCase):
 
         self.stubs.Set(self.controller.host_api, 'compute_node_get_all',
                        fake_compute_node_get_all)
-        self.stubs.Set(objects.Service, 'get_by_host_and_binary',
-                       fake_service_get_by_host_and_binary)
+        self.stubs.Set(self.controller.host_api, 'service_get_by_compute_host',
+                       fake_service_get_by_compute_host)
         self.stubs.Set(self.controller.host_api,
                        'compute_node_search_by_hypervisor',
                        fake_compute_node_search_by_hypervisor)
@@ -207,20 +212,20 @@ class HypervisorsTestV21(test.NoDBTestCase):
 
     def test_view_hypervisor_nodetail_noservers(self):
         result = self.controller._view_hypervisor(
-            TEST_HYPERS_OBJ[0], TEST_SERVICES[0], False)
+            self.TEST_HYPERS_OBJ[0], self.TEST_SERVICES[0], False)
 
         self.assertEqual(result, self.INDEX_HYPER_DICTS[0])
 
     def test_view_hypervisor_detail_noservers(self):
         result = self.controller._view_hypervisor(
-            TEST_HYPERS_OBJ[0], TEST_SERVICES[0], True)
+            self.TEST_HYPERS_OBJ[0], self.TEST_SERVICES[0], True)
 
         self.assertEqual(result, self.DETAIL_HYPERS_DICTS[0])
 
     def test_view_hypervisor_servers(self):
-        result = self.controller._view_hypervisor(TEST_HYPERS_OBJ[0],
-                                                  TEST_SERVICES[0],
-                                                  False, TEST_SERVERS)
+        result = self.controller._view_hypervisor(self.TEST_HYPERS_OBJ[0],
+                                                  self.TEST_SERVICES[0],
+                                                  False, self.TEST_SERVERS)
         expected_dict = copy.deepcopy(self.INDEX_HYPER_DICTS[0])
         expected_dict.update({'servers': [
                                   dict(name="inst1", uuid="uuid1"),
@@ -262,14 +267,15 @@ class HypervisorsTestV21(test.NoDBTestCase):
 
     def test_show_withid(self):
         req = self._get_request(True)
-        result = self.controller.show(req, '1')
+        result = self.controller.show(req, self.TEST_HYPERS_OBJ[0].id)
 
         self.assertEqual(result, dict(hypervisor=self.DETAIL_HYPERS_DICTS[0]))
 
     def test_show_non_admin(self):
         req = self._get_request(False)
         self.assertRaises(exception.PolicyNotAuthorized,
-                          self.controller.show, req, '1')
+                          self.controller.show, req,
+                          self.TEST_HYPERS_OBJ[0].id)
 
     def test_uptime_noid(self):
         req = self._get_request(True)
@@ -284,7 +290,8 @@ class HypervisorsTestV21(test.NoDBTestCase):
 
         req = self._get_request(True)
         self.assertRaises(exc.HTTPNotImplemented,
-                          self.controller.uptime, req, '1')
+                          self.controller.uptime, req,
+                          self.TEST_HYPERS_OBJ[0].id)
 
     def test_uptime_implemented(self):
         def fake_get_host_uptime(context, hyp):
@@ -294,7 +301,7 @@ class HypervisorsTestV21(test.NoDBTestCase):
                        fake_get_host_uptime)
 
         req = self._get_request(True)
-        result = self.controller.uptime(req, '1')
+        result = self.controller.uptime(req, self.TEST_HYPERS_OBJ[0].id)
 
         expected_dict = copy.deepcopy(self.INDEX_HYPER_DICTS[0])
         expected_dict.update({'uptime': "fake uptime"})
@@ -307,7 +314,8 @@ class HypervisorsTestV21(test.NoDBTestCase):
     def test_uptime_non_admin(self):
         req = self._get_request(False)
         self.assertRaises(exception.PolicyNotAuthorized,
-                          self.controller.uptime, req, '1')
+                          self.controller.uptime, req,
+                          self.TEST_HYPERS_OBJ[0].id)
 
     def test_search(self):
         req = self._get_request(True)
@@ -318,7 +326,8 @@ class HypervisorsTestV21(test.NoDBTestCase):
     def test_search_non_admin(self):
         req = self._get_request(False)
         self.assertRaises(exception.PolicyNotAuthorized,
-                          self.controller.search, req, '1')
+                          self.controller.search, req,
+                          self.TEST_HYPERS_OBJ[0].id)
 
     def test_search_non_exist(self):
         def fake_compute_node_search_by_hypervisor_return_empty(context,
@@ -360,7 +369,8 @@ class HypervisorsTestV21(test.NoDBTestCase):
     def test_servers_non_admin(self):
         req = self._get_request(False)
         self.assertRaises(exception.PolicyNotAuthorized,
-                          self.controller.servers, req, '1')
+                          self.controller.servers, req,
+                          self.TEST_HYPERS_OBJ[0].id)
 
     def test_servers_with_non_integer_hypervisor_id(self):
         def fake_compute_node_search_by_hypervisor_return_empty(context,
@@ -377,10 +387,10 @@ class HypervisorsTestV21(test.NoDBTestCase):
     def test_servers_with_no_server(self):
         def fake_instance_get_all_by_host_return_empty(context, hypervisor_re):
             return []
-        self.stubs.Set(db, 'instance_get_all_by_host',
+        self.stubs.Set(self.controller.host_api, 'instance_get_all_by_host',
                        fake_instance_get_all_by_host_return_empty)
         req = self._get_request(True)
-        result = self.controller.servers(req, '1')
+        result = self.controller.servers(req, self.TEST_HYPERS_OBJ[0].id)
         self.assertEqual(result, dict(hypervisors=self.INDEX_HYPER_DICTS))
 
     def test_statistics(self):
@@ -430,3 +440,105 @@ class HypervisorsTestV2(HypervisorsTestV21):
         self.ext_mgr = extensions.ExtensionManager()
         self.ext_mgr.extensions = {}
         self.controller = hypervisors_v2.HypervisorsController(self.ext_mgr)
+
+
+class CellHypervisorsTestV21(HypervisorsTestV21):
+    cell_path = 'cell1'
+    TEST_HYPERS_OBJ = [cells_utils.ComputeNodeProxy(obj, cell_path)
+                       for obj in TEST_HYPERS_OBJ]
+    TEST_SERVICES = [cells_utils.ServiceProxy(obj, cell_path)
+                     for obj in TEST_SERVICES]
+
+    TEST_SERVERS = [dict(server,
+                         host=cells_utils.cell_with_item(cell_path,
+                                                         server['host']))
+                    for server in TEST_SERVERS]
+
+    DETAIL_HYPERS_DICTS = copy.deepcopy(HypervisorsTestV21.DETAIL_HYPERS_DICTS)
+    DETAIL_HYPERS_DICTS = [dict(hyp, id=cells_utils.cell_with_item(cell_path,
+                                                                   hyp['id']),
+                                service=dict(hyp['service'],
+                                             id=cells_utils.cell_with_item(
+                                                 cell_path,
+                                                 hyp['service']['id']),
+                                             host=cells_utils.cell_with_item(
+                                                 cell_path,
+                                                 hyp['service']['host'])))
+                           for hyp in DETAIL_HYPERS_DICTS]
+
+    INDEX_HYPER_DICTS = copy.deepcopy(HypervisorsTestV21.INDEX_HYPER_DICTS)
+    INDEX_HYPER_DICTS = [dict(hyp, id=cells_utils.cell_with_item(cell_path,
+                                                                 hyp['id']))
+                         for hyp in INDEX_HYPER_DICTS]
+
+    @classmethod
+    def fake_compute_node_get_all(cls, context):
+        return cls.TEST_HYPERS_OBJ
+
+    @classmethod
+    def fake_compute_node_search_by_hypervisor(cls, context, hypervisor_re):
+        return cls.TEST_HYPERS_OBJ
+
+    @classmethod
+    def fake_compute_node_get(cls, context, compute_id):
+        for hyper in cls.TEST_HYPERS_OBJ:
+            if hyper.id == compute_id:
+                return hyper
+        raise exception.ComputeHostNotFound(host=compute_id)
+
+    @classmethod
+    def fake_service_get_by_compute_host(cls, context, host):
+        for service in cls.TEST_SERVICES:
+            if service.host == host:
+                return service
+
+    @classmethod
+    def fake_instance_get_all_by_host(cls, context, host):
+        results = []
+        for inst in cls.TEST_SERVERS:
+            if inst['host'] == host:
+                results.append(inst)
+        return results
+
+    def setUp(self):
+
+        self.flags(enable=True, cell_type='api', group='cells')
+
+        super(CellHypervisorsTestV21, self).setUp()
+
+        self.stubs.Set(self.controller.host_api, 'compute_node_get_all',
+                       self.fake_compute_node_get_all)
+        self.stubs.Set(self.controller.host_api, 'service_get_by_compute_host',
+                       self.fake_service_get_by_compute_host)
+        self.stubs.Set(self.controller.host_api,
+                       'compute_node_search_by_hypervisor',
+                       self.fake_compute_node_search_by_hypervisor)
+        self.stubs.Set(self.controller.host_api, 'compute_node_get',
+                       self.fake_compute_node_get)
+        self.stubs.Set(self.controller.host_api, 'compute_node_statistics',
+                       fake_compute_node_statistics)
+        self.stubs.Set(self.controller.host_api, 'instance_get_all_by_host',
+                       self.fake_instance_get_all_by_host)
+
+
+class CellHypervisorsTestV2(HypervisorsTestV2, CellHypervisorsTestV21):
+    cell_path = 'cell1'
+    DETAIL_HYPERS_DICTS = copy.deepcopy(HypervisorsTestV2.DETAIL_HYPERS_DICTS)
+    DETAIL_HYPERS_DICTS = [dict(hyp, id=cells_utils.cell_with_item(cell_path,
+                                                                   hyp['id']),
+                                service=dict(hyp['service'],
+                                             id=cells_utils.cell_with_item(
+                                                 cell_path,
+                                                 hyp['service']['id']),
+                                             host=cells_utils.cell_with_item(
+                                                 cell_path,
+                                                 hyp['service']['host'])))
+                           for hyp in DETAIL_HYPERS_DICTS]
+
+    INDEX_HYPER_DICTS = copy.deepcopy(HypervisorsTestV2.INDEX_HYPER_DICTS)
+    INDEX_HYPER_DICTS = [dict(hyp, id=cells_utils.cell_with_item(cell_path,
+                                                                 hyp['id']))
+                         for hyp in INDEX_HYPER_DICTS]
+
+    def setUp(self):
+        super(CellHypervisorsTestV2, self).setUp()