openstack/kuryr
Code Issues Proposed changes

Merge "startup: Fix Kuryr initialization"

Browse Source
This commit is contained in:
Jenkins 2016-05-19 07:48:14 +00:00 committed by Gerrit Code Review
commit 0ef39368fe
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kuryr/controllers.py
View File

@ -1247,5 +1247,3 @@ def ipam_release_address():
raise raise
return flask.jsonify(const.SCHEMA['SUCCESS']) return flask.jsonify(const.SCHEMA['SUCCESS'])
neutron_client()

2
kuryr/server.py
View File

@ -20,7 +20,7 @@ from kuryr import controllers
config.init(sys.argv[1:]) config.init(sys.argv[1:])
controllers.neutron_client()
controllers.check_for_neutron_ext_support() controllers.check_for_neutron_ext_support()
controllers.check_for_neutron_ext_tag() controllers.check_for_neutron_ext_tag()
app.debug = config.CONF.debug app.debug = config.CONF.debug

2
kuryr/tests/unit/base.py
View File

@ -15,6 +15,7 @@ from neutronclient.tests.unit import test_cli20
from kuryr import app from kuryr import app
from kuryr import binding from kuryr import binding
from kuryr.common import constants as const from kuryr.common import constants as const
from kuryr import controllers
from kuryr import utils from kuryr import utils
@ -35,6 +36,7 @@ class TestKuryrBase(TestCase):
def setUp(self): def setUp(self):
super(TestKuryrBase, self).setUp() super(TestKuryrBase, self).setUp()
controllers.neutron_client()
self.app.neutron.format = 'json' self.app.neutron.format = 'json'
self.addCleanup(self.mox.VerifyAll) self.addCleanup(self.mox.VerifyAll)
self.addCleanup(self.mox.UnsetStubs) self.addCleanup(self.mox.UnsetStubs)