diff options
| author | Eric Fried <efried@us.ibm.com> | 2018-11-28 15:58:12 -0600 |
|---|---|---|
| committer | Eric Fried <openstack@fried.cc> | 2019-01-17 06:34:29 +0000 |
| commit | 35ce77835bb271bad3c18eaf22146edac3a42ea0 (patch) | |
| tree | 0eb54aef299f8a9c617f354fa4364d4557d6350d /nova/test.py | |
| parent | 4c34ab574ef61819a891ac4445a3dbfaed30d498 (diff) | |
| download | nova-35ce77835bb271bad3c18eaf22146edac3a42ea0.tar.gz | |
Use a static resource tracker in compute manager
There was one edge case in the compute manager wherein we would
reinitialize the resource tracker. Jay promises that isn't needed
anymore, so this change removes it. That allows us to remove the
_get_resource_tracker() helper and set up the resource tracker just once
during __init__ of the compute manager.
Change-Id: Ibb8c12fb2799bb5ceb9e3d72a2b86dbb4f14451e
Diffstat (limited to 'nova/test.py')
| -rw-r--r-- | nova/test.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/test.py b/nova/test.py index cb6302c403..696176375b 100644 --- a/nova/test.py +++ b/nova/test.py @@ -49,6 +49,7 @@ from oslotest import moxstubout import six import testtools +from nova.compute import resource_tracker from nova import context from nova.db import api as db from nova import exception @@ -415,8 +416,9 @@ class TestCase(testtools.TestCase): # So this helper method tries to simulate a better compute service # restart by cleaning up some of the internal state of the compute # manager. + host, driver = compute.manager.host, compute.manager.driver compute.stop() - compute.manager._resource_tracker = None + compute.manager.rt = resource_tracker.ResourceTracker(host, driver) compute.start() def assertJsonEqual(self, expected, observed, message=''): |