summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2012-12-18 07:10:28 -0800
committerDan Smith <danms@us.ibm.com>2012-12-19 08:14:45 -0800
commit7f2ed0cc193febe0246604a74bf4b178af70dd1a (patch)
tree868d11ba2c055cf4359c43fca3b1e22191af957e /nova/tests
parent0e17114aacbb6fb71477629ca8d0a1992d9ea119 (diff)
Move aggregate_get() to conductor
This moves the final remaining aggregate DB operation from the compute/manager to conductor/manager. Related to bp/no-db-compute-manager Change-Id: I1ec6b64d29da21f978f7b72a1f8271fe68e3a44d
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/conductor/test_conductor.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index 734dba9ed..3f7787e9a 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -157,6 +157,13 @@ class _BaseTestCase(object):
db.aggregate_delete(self.context.elevated(), aggregate_ref['id'])
+ def test_aggregate_get(self):
+ aggregate_ref = self._setup_aggregate_with_host()
+ aggregate = self.conductor.aggregate_get(self.context,
+ aggregate_ref['id'])
+ self.assertEqual(jsonutils.to_primitive(aggregate_ref), aggregate)
+ db.aggregate_delete(self.context.elevated(), aggregate_ref['id'])
+
def test_aggregate_get_by_host(self):
self._setup_aggregate_with_host()
aggregates = self.conductor.aggregate_get_by_host(self.context, 'bar')