Merge "startup: Fix Kuryr initialization"

kuryr/controllers.py

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

kuryr/server.py

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

kuryr/tests/unit/base.py

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