openstack/ironic
Code Issues Proposed changes

Merge "Remove unused IronicObjectIndirectionAPI from ironic-api"

Browse Source
This commit is contained in:
Zuul 2017-11-14 07:17:54 +00:00 committed by Gerrit Code Review
commit 04015a0b51
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ironic/cmd/api.py
View File

@ -25,8 +25,6 @@ from oslo_reports import guru_meditation_report as gmr
from ironic.common import profiler from ironic.common import profiler
from ironic.common import service as ironic_service from ironic.common import service as ironic_service
from ironic.common import wsgi_service from ironic.common import wsgi_service
from ironic.objects import base
from ironic.objects import indirection
from ironic import version from ironic import version
CONF = cfg.CONF CONF = cfg.CONF
@ -38,10 +36,6 @@ def main():
gmr.TextGuruMeditation.setup_autorun(version) gmr.TextGuruMeditation.setup_autorun(version)
# Enable object backporting via the conductor
base.IronicObject.indirection_api = (
indirection.IronicObjectIndirectionAPI())
profiler.setup('ironic_api', CONF.host) profiler.setup('ironic_api', CONF.host)
# Build and start the WSGI app # Build and start the WSGI app

1
ironic/tests/base.py
View File

@ -89,7 +89,6 @@ class TestCase(oslo_test_base.BaseTestCase):
# NOTE(danms): Make sure to reset us back to non-remote objects # NOTE(danms): Make sure to reset us back to non-remote objects
# for each test to avoid interactions. Also, backup the object # for each test to avoid interactions. Also, backup the object
# registry # registry
objects_base.IronicObject.indirection_api = None
self._base_test_obj_backup = copy.copy( self._base_test_obj_backup = copy.copy(
objects_base.IronicObjectRegistry.obj_classes()) objects_base.IronicObjectRegistry.obj_classes())
self.addCleanup(self._restore_obj_registry) self.addCleanup(self._restore_obj_registry)