Merge "Centralize oslo.service patching"

neutron/cmd/agents/__init__.py

@@ -0,0 +1,17 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from oslo_service import backend as oslo_service_backend
+
+
+# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
+oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)

neutron/cmd/agents/dhcp.py

@@ -10,14 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo_service import backend
-backend.init_backend(backend.BackendType.THREADING)
+import setproctitle
 
-# pylint: disable=wrong-import-position
-import setproctitle  # noqa: E402
-
-from neutron.agent import dhcp_agent  # noqa: E402
-from neutron_lib import constants  # noqa: E402
+from neutron.agent import dhcp_agent
+from neutron_lib import constants
 
 
 def main():

neutron/cmd/agents/l3.py

@@ -10,15 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
-from oslo_service import backend as oslo_service_backend
-oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
+import setproctitle
 
-# pylint: disable=wrong-import-position
-import setproctitle  # noqa: E402
-
-from neutron.agent import l3_agent  # noqa: E402
-from neutron_lib import constants  # noqa: E402
+from neutron.agent import l3_agent
+from neutron_lib import constants
 
 
 def main():

neutron/cmd/agents/metadata.py

@@ -10,15 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING``
-from oslo_service import backend as oslo_service_backend
-oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
+import setproctitle
 
-# pylint: disable=wrong-import-position
-import setproctitle  # noqa: E402
-
-from neutron.agent import metadata_agent  # noqa: E402
-from neutron_lib import constants  # noqa: E402
+from neutron.agent import metadata_agent
+from neutron_lib import constants
 
 
 def main():

neutron/cmd/agents/ovn_metadata.py

@@ -10,15 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING``
-from oslo_service import backend as oslo_service_backend
-oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
+import setproctitle
 
-# pylint: disable=wrong-import-position
-import setproctitle  # noqa: E402
-
-from neutron.agent.ovn import metadata_agent  # noqa: E402
-from neutron_lib import constants  # noqa: E402
+from neutron.agent.ovn import metadata_agent
+from neutron_lib import constants
 
 
 def main():

neutron/cmd/agents/ovn_neutron_agent.py

@@ -10,20 +10,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# NOTE(haleyb): remove once the default backend is ``BackendType.THREADING``
-from oslo_service import backend as oslo_service_backend
-oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
+import setproctitle
 
-# pylint: disable=wrong-import-position
-import setproctitle  # noqa: E402
-
-from neutron_lib import constants as lib_constants  # noqa: E402
-
-from neutron.agent.ovn import ovn_neutron_agent  # noqa: E402
+from neutron.agent.ovn import ovn_neutron_agent
+from neutron_lib import constants
 
 
 def main():
-    proctitle = "{} ({})".format(lib_constants.AGENT_PROCESS_OVN,
+    proctitle = "{} ({})".format(constants.AGENT_PROCESS_OVN,
                                  setproctitle.getproctitle())
     setproctitle.setproctitle(proctitle)
     ovn_neutron_agent.main()

neutron/cmd/agents/ovs_neutron_agent.py

@@ -13,23 +13,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
-import os
+import setproctitle
 
-from oslo_service import backend as oslo_service_backend
-oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
-
-# NOTE: the environment variable "OSKEN_HUB_TYPE" defines the ``os-ken``
-# hub type to be used. The default value is now "eventlet". Once the
-# default value is set to "native", we will remove the following line.
-os.environ['OSKEN_HUB_TYPE'] = 'native'
-
-
-# pylint: disable=wrong-import-position, line-too-long
-import setproctitle  # noqa: E402
-
-import neutron.plugins.ml2.drivers.openvswitch.agent.main as agent_main  # noqa: E402,E501
-from neutron_lib import constants  # noqa: E402
+import neutron.plugins.ml2.drivers.openvswitch.agent.main as agent_main
+from neutron_lib import constants
 
 
 def main():

neutron/cmd/plugins/__init__.py

@@ -0,0 +1,19 @@
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
+from oslo_service import backend as oslo_service_backend
+
+
+oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)

neutron/cmd/plugins/macvtap_neutron_agent.py

@@ -12,16 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
-from oslo_service import backend as oslo_service_backend
-oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
+import setproctitle
 
-# pylint: disable=wrong-import-position
-import setproctitle  # noqa: E402
-
-from neutron.plugins.ml2.drivers.macvtap.agent import (  # noqa: E402
-    macvtap_neutron_agent as agent_main)
-from neutron_lib import constants  # noqa: E402
+from neutron.plugins.ml2.drivers.macvtap.agent import macvtap_neutron_agent \
+        as agent_main
+from neutron_lib import constants
 
 
 def main():

neutron/cmd/services/__init__.py

@@ -0,0 +1,17 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
+from oslo_service import backend as oslo_service_backend
+
+
+oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)

neutron/cmd/services/metering_agent.py

@@ -10,15 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-# NOTE(ralonsoh): remove once the default backend is ``BackendType.THREADING``
-from oslo_service import backend as oslo_service_backend
-oslo_service_backend.init_backend(oslo_service_backend.BackendType.THREADING)
+import setproctitle
 
-# pylint: disable=wrong-import-position
-import setproctitle  # noqa: E402
-
-from neutron.services.metering.agents import metering_agent  # noqa: E402
-from neutron_lib import constants  # noqa: E402
+from neutron.services.metering.agents import metering_agent
+from neutron_lib import constants
 
 
 def main():