Merge "Remove compute_node field from service_get_by_compute_host"

openstack · Mar 3, 2015 · 83b64ce · 83b64ce
2 parents b8e2f53 + d04ebf6
commit 83b64ce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
@@ -417,7 +417,6 @@ def service_get_all_by_host(context, host):
 def service_get_by_compute_host(context, host, use_slave=False):
     result = model_query(context, models.Service, read_deleted="no",
                          use_slave=use_slave).\
-                options(joinedload('compute_node')).\
                 filter_by(host=host).\
                 filter_by(topic=CONF.compute_topic).\
                 first()

diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py
@@ -2840,8 +2840,7 @@ def test_service_get_by_compute_host(self):
         services = [self._create_service(vals) for vals in values]
 
         real_service = db.service_get_by_compute_host(self.ctxt, 'host1')
-        self._assertEqualObjects(services[0], real_service,
-                                 ignored_keys=['compute_node'])
+        self._assertEqualObjects(services[0], real_service)
 
         self.assertRaises(exception.ComputeHostNotFound,
                           db.service_get_by_compute_host,