Merge "Move monkey_patch from init to the entrypoints"

openstack/nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Zuul

2025年11月06日 23:48:36 +00:00

committed by Gerrit Code Review

parent 4cfdf18a0b 0afb72e883

commit a79fea0347

16 changed files with 54 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

3
nova/api/openstack/init.py

View File

@@ -17,9 +17,6 @@

"""

WSGI middleware for OpenStack API controllers.

"""

# autopep8: off

from nova import monkey_patch ; monkey_patch.patch() # noqa

# autopep8: on

from oslo_log import log as logging

import routes

16
nova/cmd/init.py

View File

@@ -1,16 +0,0 @@

#

# 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 nova import monkey_patch

monkey_patch.patch()

3
nova/cmd/baseproxy.py

View File

@@ -16,6 +16,9 @@

"""Base proxy module used to create compatible consoles

for OpenStack Nova."""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import os

import sys

3
nova/cmd/compute.py

View File

@@ -15,6 +15,9 @@

# under the License.

"""Starter script for Nova Compute."""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import shlex

import sys

3
nova/cmd/conductor.py

View File

@@ -13,6 +13,9 @@

# under the License.

"""Starter script for Nova Conductor."""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import sys

3
nova/cmd/manage.py

View File

@@ -20,6 +20,9 @@

"""

CLI interface for nova management.

"""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import collections

from contextlib import contextmanager

3
nova/cmd/novncproxy.py

View File

@@ -17,6 +17,9 @@

Websocket proxy that is compatible with OpenStack Nova

noVNC consoles. Leverages websockify.py by Joel Martin

"""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import sys

3
nova/cmd/policy.py

View File

@@ -16,6 +16,9 @@

"""

CLI interface for nova policy rule commands.

"""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import functools

import os

3
nova/cmd/scheduler.py

View File

@@ -15,6 +15,9 @@

# under the License.

"""Starter script for Nova Scheduler."""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import sys

4
nova/cmd/serialproxy.py

View File

@@ -17,6 +17,10 @@ Websocket proxy that is compatible with OpenStack Nova

Serial consoles. Leverages websockify.py by Joel Martin.

Based on nova-novncproxy.

"""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import sys

from nova.cmd import baseproxy

3
nova/cmd/spicehtml5proxy.py

View File

@@ -17,6 +17,9 @@

Websocket proxy that is compatible with OpenStack Nova

SPICE HTML5 consoles. Leverages websockify.py by Joel Martin

"""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import sys

3
nova/cmd/status.py

View File

@@ -15,6 +15,9 @@

"""

CLI interface for nova status commands.

"""

# autopep8: off

from nova import monkey_patch; monkey_patch.patch() # noqa

# autopep8: on

import functools

import sys

4
nova/test.py

View File

@@ -20,10 +20,6 @@ Allows overriding of flags for use of fakes, and some black magic for

inline callbacks.

"""

# autopep8: off

from nova import monkey_patch ; monkey_patch.patch() # noqa

# autopep8: on

import abc

import builtins

import collections

17
nova/tests/functional/init.py

View File

@@ -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.

# autopep8: off

from nova import monkey_patch ; monkey_patch.patch() # noqa

# autopep8: on

3
nova/wsgi/metadata.py

View File

@@ -11,6 +11,9 @@

# under the License.

"""WSGI application entry-point for Nova Metadata API."""

# autopep8: off

from nova import monkey_patch ; monkey_patch.patch() # noqa

# autopep8: on

import threading

3
nova/wsgi/osapi_compute.py

View File

@@ -11,6 +11,9 @@

# under the License.

"""WSGI application entry-point for Nova Compute API."""

# autopep8: off

from nova import monkey_patch ; monkey_patch.patch() # noqa

# autopep8: on

import threading