openstack
/
nova
Code Issues Proposed changes

Use oslo.log 

Convert the use of the incubated version of the log module
to the new oslo.log library.

Sync oslo-incubator modules to update their imports as well.

Co-Authored-By: Doug Hellmann <doug@doughellmann.com>
Change-Id: Ic4932e3f58191869c30bd07a010a6e9fdcb2a12c
This commit is contained in:
Davanum Srinivas 2015-02-09 17:28:19 -05:00
parent 69d0c64361
commit 97d63d8745
287 changed files with 376 additions and 1060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/auth.py
View File

@ -17,6 +17,7 @@ Common Auth Middleware.
""" """
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_middleware import request_id from oslo_middleware import request_id
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import webob.dec import webob.dec
@ -24,7 +25,6 @@ import webob.exc
from nova import context from nova import context
from nova.i18n import _ from nova.i18n import _
from nova.openstack.common import log as logging
from nova import wsgi from nova import wsgi

2
nova/api/ec2/__init__.py
View File

@ -22,6 +22,7 @@ import hashlib
from oslo_config import cfg from oslo_config import cfg
from oslo_context import context as common_context from oslo_context import context as common_context
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import importutils from oslo_utils import importutils
from oslo_utils import netutils from oslo_utils import netutils
@ -42,7 +43,6 @@ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova.i18n import _LI from nova.i18n import _LI
from nova.i18n import _LW from nova.i18n import _LW
from nova.openstack.common import log as logging
from nova.openstack.common import memorycache from nova.openstack.common import memorycache
from nova import wsgi from nova import wsgi

2
nova/api/ec2/apirequest.py
View File

@ -23,12 +23,12 @@ import datetime
from xml.dom import minidom from xml.dom import minidom
from lxml import etree from lxml import etree
from oslo_log import log as logging
from oslo_utils import encodeutils from oslo_utils import encodeutils
import six import six
from nova.api.ec2 import ec2utils from nova.api.ec2 import ec2utils
from nova import exception from nova import exception
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/ec2/cloud.py
View File

@ -24,6 +24,7 @@ import base64
import time import time
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
from nova.api.ec2 import ec2utils from nova.api.ec2 import ec2utils
@ -46,7 +47,6 @@ from nova import network
from nova.network.security_group import neutron_driver from nova.network.security_group import neutron_driver
from nova.network.security_group import openstack_driver from nova.network.security_group import openstack_driver
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova import quota from nova import quota
from nova import servicegroup from nova import servicegroup
from nova import utils from nova import utils

2
nova/api/ec2/ec2utils.py
View File

@ -17,6 +17,7 @@
import functools import functools
import re import re
from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
from nova import context from nova import context
@ -26,7 +27,6 @@ from nova.i18n import _LI
from nova.network import model as network_model from nova.network import model as network_model
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common import log as logging
from nova.openstack.common import memorycache from nova.openstack.common import memorycache
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils

2
nova/api/ec2/faults.py
View File

@ -11,12 +11,12 @@
# under the License. # under the License.
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import webob.dec import webob.dec
import webob.exc import webob.exc
import nova.api.ec2 import nova.api.ec2
from nova import context from nova import context
from nova.openstack.common import log as logging
from nova import utils from nova import utils
CONF = cfg.CONF CONF = cfg.CONF

2
nova/api/metadata/base.py
View File

@ -21,6 +21,7 @@ import os
import posixpath import posixpath
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import importutils from oslo_utils import importutils
from oslo_utils import timeutils from oslo_utils import timeutils
@ -34,7 +35,6 @@ from nova import context
from nova import network from nova import network
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common import log as logging
from nova import utils from nova import utils
from nova.virt import netutils from nova.virt import netutils

2
nova/api/metadata/handler.py
View File

@ -20,6 +20,7 @@ import hmac
import os import os
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import six import six
import webob.dec import webob.dec
import webob.exc import webob.exc
@ -30,7 +31,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova.i18n import _LW from nova.i18n import _LW
from nova.openstack.common import log as logging
from nova.openstack.common import memorycache from nova.openstack.common import memorycache
from nova import utils from nova import utils
from nova import wsgi from nova import wsgi

2
nova/api/metadata/vendordata_json.py
View File

@ -18,11 +18,11 @@
import errno import errno
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from nova.api.metadata import base from nova.api.metadata import base
from nova.i18n import _LW from nova.i18n import _LW
from nova.openstack.common import log as logging
file_opt = cfg.StrOpt('vendordata_jsonfile_path', file_opt = cfg.StrOpt('vendordata_jsonfile_path',
help='File to load JSON formatted vendor data from') help='File to load JSON formatted vendor data from')

2
nova/api/openstack/__init__.py
View File

@ -19,6 +19,7 @@ WSGI middleware for OpenStack API controllers.
""" """
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import routes import routes
import stevedore import stevedore
import webob.dec import webob.dec
@ -34,7 +35,6 @@ from nova.i18n import _LI
from nova.i18n import _LW from nova.i18n import _LW
from nova.i18n import translate from nova.i18n import translate
from nova import notifications from nova import notifications
from nova.openstack.common import log as logging
from nova import utils from nova import utils
from nova import wsgi as base_wsgi from nova import wsgi as base_wsgi

2
nova/api/openstack/common.py
View File

@ -20,6 +20,7 @@ import os
import re import re
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import six.moves.urllib.parse as urlparse import six.moves.urllib.parse as urlparse
import webob import webob
from webob import exc from webob import exc
@ -31,7 +32,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova.i18n import _LW from nova.i18n import _LW
from nova.openstack.common import log as logging
from nova import quota from nova import quota
osapi_opts = [ osapi_opts = [

2
nova/api/openstack/compute/contrib/__init__.py
View File

@ -20,9 +20,9 @@ It can't be called 'extensions' because that causes namespacing problems.
""" """
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.openstack.common import log as logging
ext_opts = [ ext_opts = [
cfg.ListOpt('osapi_compute_ext_list', cfg.ListOpt('osapi_compute_ext_list',

2
nova/api/openstack/compute/contrib/admin_actions.py
View File

@ -15,6 +15,7 @@
import os.path import os.path
import traceback import traceback
from oslo_log import log as logging
from oslo_utils import strutils from oslo_utils import strutils
import six import six
import webob import webob
@ -28,7 +29,6 @@ from nova.compute import vm_states
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/contrib/assisted_volume_snapshots.py
View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import six import six
import webob import webob
@ -21,7 +22,6 @@ from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _LI from nova.i18n import _LI
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/contrib/attach_interfaces.py
View File

@ -16,6 +16,7 @@
"""The instance interfaces extension.""" """The instance interfaces extension."""
import netaddr import netaddr
from oslo_log import log as logging
import six import six
import webob import webob
from webob import exc from webob import exc
@ -27,7 +28,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LI from nova.i18n import _LI
from nova import network from nova import network
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/contrib/baremetal_nodes.py
View File

@ -16,13 +16,13 @@
"""The bare-metal admin extension with Ironic Proxy.""" """The bare-metal admin extension with Ironic Proxy."""
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import importutils from oslo_utils import importutils
import webob import webob
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.i18n import _ from nova.i18n import _
from nova.openstack.common import log as logging
ironic_client = importutils.try_import('ironicclient.client') ironic_client = importutils.try_import('ironicclient.client')

2
nova/api/openstack/compute/contrib/floating_ips.py
View File

@ -15,6 +15,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
import webob import webob
from nova.api.openstack import common from nova.api.openstack import common
@ -26,7 +27,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LW from nova.i18n import _LW
from nova import network from nova import network
from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils

2
nova/api/openstack/compute/contrib/hosts.py
View File

@ -15,6 +15,7 @@
"""The hosts admin extension.""" """The hosts admin extension."""
from oslo_log import log as logging
import webob.exc import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
@ -23,7 +24,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LI from nova.i18n import _LI
from nova import objects from nova import objects
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
authorize = extensions.extension_authorizer('compute', 'hosts') authorize = extensions.extension_authorizer('compute', 'hosts')

2
nova/api/openstack/compute/contrib/multinic.py
View File

@ -15,6 +15,7 @@
"""The multinic extension.""" """The multinic extension."""
from oslo_log import log as logging
import webob import webob
from webob import exc from webob import exc
@ -25,7 +26,6 @@ from nova import compute
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
nova/api/openstack/compute/contrib/os_tenant_networks.py
View File

@ -13,10 +13,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import netaddr import netaddr
import netaddr.core as netexc import netaddr.core as netexc
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import six import six
import webob import webob
from webob import exc from webob import exc
@ -27,7 +27,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
import nova.network import nova.network
from nova.openstack.common import log as logging
from nova import quota from nova import quota

2
nova/api/openstack/compute/contrib/security_groups.py
View File

@ -19,6 +19,7 @@
import contextlib import contextlib
from xml.dom import minidom from xml.dom import minidom
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import six import six
import webob import webob
@ -31,7 +32,6 @@ from nova import compute
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.network.security_group import openstack_driver from nova.network.security_group import openstack_driver
from nova.openstack.common import log as logging
from nova.virt import netutils from nova.virt import netutils

2
nova/api/openstack/compute/contrib/server_external_events.py
View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
import webob import webob
from nova.api.openstack import extensions from nova.api.openstack import extensions
@ -22,7 +23,6 @@ from nova.i18n import _
from nova.i18n import _LI from nova.i18n import _LI
from nova import objects from nova import objects
from nova.objects import external_event as external_event_obj from nova.objects import external_event as external_event_obj
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/contrib/server_groups.py
View File

@ -15,6 +15,7 @@
"""The Server Group API Extension.""" """The Server Group API Extension."""
from oslo_log import log as logging
import webob import webob
from webob import exc from webob import exc
@ -25,7 +26,6 @@ import nova.exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova import utils from nova import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
nova/api/openstack/compute/contrib/server_usage.py
View File

@ -12,10 +12,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova import compute from nova import compute
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
authorize = extensions.soft_extension_authorizer('compute', 'server_usage') authorize = extensions.soft_extension_authorizer('compute', 'server_usage')

2
nova/api/openstack/compute/contrib/volumes.py
View File

@ -15,6 +15,7 @@
"""The volumes extension.""" """The volumes extension."""
from oslo_log import log as logging
from oslo_utils import strutils from oslo_utils import strutils
import webob import webob
from webob import exc from webob import exc
@ -27,7 +28,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LI from nova.i18n import _LI
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils
from nova import volume from nova import volume

2
nova/api/openstack/compute/extensions.py
View File

@ -14,9 +14,9 @@
# under the License. # under the License.
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova.api.openstack import extensions as base_extensions from nova.api.openstack import extensions as base_extensions
from nova.openstack.common import log as logging
ext_opts = [ ext_opts = [
cfg.MultiStrOpt('osapi_compute_extension', cfg.MultiStrOpt('osapi_compute_extension',

2
nova/api/openstack/compute/plugins/__init__.py
View File

@ -12,10 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from nova import exception from nova import exception
from nova.i18n import _LE from nova.i18n import _LE
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/assisted_volume_snapshots.py
View File

@ -16,6 +16,7 @@
"""The Assisted volume snapshots extension.""" """The Assisted volume snapshots extension."""
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import six import six
from webob import exc from webob import exc
@ -27,7 +28,6 @@ from nova.api import validation
from nova import compute from nova import compute
from nova import exception from nova import exception
from nova.i18n import _LI from nova.i18n import _LI
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/extension_info.py
View File

@ -14,11 +14,11 @@
import copy import copy
from oslo_log import log as logging
import webob.exc import webob.exc
from nova.api.openstack import extensions from nova.api.openstack import extensions
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.openstack.common import log as logging
ALIAS = 'extensions' ALIAS = 'extensions'
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/floating_ips.py
View File

@ -15,6 +15,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
import webob import webob
from nova.api.openstack import common from nova.api.openstack import common
@ -28,7 +29,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LW from nova.i18n import _LW
from nova import network from nova import network
from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils

2
nova/api/openstack/compute/plugins/v3/hosts.py
View File

@ -15,6 +15,7 @@
"""The hosts admin extension.""" """The hosts admin extension."""
from oslo_log import log as logging
import webob.exc import webob.exc
from nova.api.openstack.compute.schemas.v3 import hosts from nova.api.openstack.compute.schemas.v3 import hosts
@ -26,7 +27,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LI from nova.i18n import _LI
from nova import objects from nova import objects
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
ALIAS = 'os-hosts' ALIAS = 'os-hosts'

2
nova/api/openstack/compute/plugins/v3/security_groups.py
View File

@ -15,6 +15,7 @@
# under the License. # under the License.
"""The security groups extension.""" """The security groups extension."""
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from webob import exc from webob import exc
@ -27,7 +28,6 @@ from nova import compute
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.network.security_group import openstack_driver from nova.network.security_group import openstack_driver
from nova.openstack.common import log as logging
from nova.virt import netutils from nova.virt import netutils

2
nova/api/openstack/compute/plugins/v3/server_external_events.py
View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
import webob import webob
from nova.api.openstack.compute.schemas.v3 import server_external_events from nova.api.openstack.compute.schemas.v3 import server_external_events
@ -23,7 +24,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LI from nova.i18n import _LI
from nova import objects from nova import objects
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/server_groups.py
View File

@ -15,6 +15,7 @@
"""The Server Group API Extension.""" """The Server Group API Extension."""
from oslo_log import log as logging
import webob import webob
from webob import exc from webob import exc
@ -27,7 +28,6 @@ import nova.exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova import objects from nova import objects
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/compute/plugins/v3/servers.py
View File

@ -18,6 +18,7 @@ import base64
import re import re
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_utils import strutils from oslo_utils import strutils
from oslo_utils import timeutils from oslo_utils import timeutils
@ -39,7 +40,6 @@ from nova.i18n import _
from nova.i18n import _LW from nova.i18n import _LW
from nova.image import glance from nova.image import glance
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils
from nova import policy from nova import policy
from nova import utils from nova import utils

2
nova/api/openstack/compute/plugins/v3/tenant_networks.py
View File

@ -17,6 +17,7 @@
import netaddr import netaddr
import netaddr.core as netexc import netaddr.core as netexc
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import six import six
from webob import exc from webob import exc
@ -29,7 +30,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
import nova.network import nova.network
from nova.openstack.common import log as logging
from nova import quota from nova import quota

2
nova/api/openstack/compute/servers.py
View File

@ -20,6 +20,7 @@ import re
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_utils import netutils from oslo_utils import netutils
from oslo_utils import strutils from oslo_utils import strutils
@ -37,7 +38,6 @@ from nova.compute import flavors
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils
from nova import policy from nova import policy
from nova import utils from nova import utils

2
nova/api/openstack/compute/views/servers.py
View File

@ -16,6 +16,7 @@
import hashlib import hashlib
from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
from nova.api.openstack import common from nova.api.openstack import common
@ -24,7 +25,6 @@ from nova.api.openstack.compute.views import flavors as views_flavors
from nova.api.openstack.compute.views import images as views_images from nova.api.openstack.compute.views import images as views_images
from nova.i18n import _LW from nova.i18n import _LW
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common import log as logging
from nova import utils from nova import utils

2
nova/api/openstack/extensions.py
View File

@ -18,6 +18,7 @@ import abc
import functools import functools
import os import os
from oslo_log import log as logging
from oslo_utils import importutils from oslo_utils import importutils
import six import six
import webob.dec import webob.dec
@ -29,7 +30,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova.i18n import _LW from nova.i18n import _LW
from nova.openstack.common import log as logging
import nova.policy import nova.policy
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/urlmap.py
View File

@ -16,10 +16,10 @@
import re import re
import urllib2 import urllib2
from oslo_log import log as logging
import paste.urlmap import paste.urlmap
from nova.api.openstack import wsgi from nova.api.openstack import wsgi
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/api/openstack/wsgi.py
View File

@ -19,6 +19,7 @@ import inspect
import math import math
import time import time
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import strutils from oslo_utils import strutils
import six import six
@ -31,7 +32,6 @@ from nova import i18n
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova.i18n import _LI from nova.i18n import _LI
from nova.openstack.common import log as logging
from nova import utils from nova import utils
from nova import wsgi from nova import wsgi

3
nova/api/validator.py
View File

@ -15,11 +15,10 @@
import base64 import base64
from oslo_log import log as logging
import rfc3986 import rfc3986
import six import six
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/block_device.py
View File

@ -16,11 +16,11 @@
import re import re
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import strutils from oslo_utils import strutils
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.openstack.common import log as logging
from nova import utils from nova import utils
from nova.virt import driver from nova.virt import driver

3
nova/cells/filters/__init__.py
View File

@ -17,8 +17,9 @@
Cell scheduler filters Cell scheduler filters
""" """
from oslo_log import log as logging
from nova import filters from nova import filters
from nova.openstack.common import log as logging
from nova import policy from nova import policy
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
nova/cells/filters/image_properties.py
View File

@ -27,8 +27,9 @@ cells.
from distutils import versionpredicate from distutils import versionpredicate
from oslo_log import log as logging
from nova.cells import filters from nova.cells import filters
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
nova/cells/filters/target_cell.py
View File

@ -21,9 +21,10 @@ specified to route a build to a particular cell. No error handling is
done as there's no way to know whether the full path is a valid. done as there's no way to know whether the full path is a valid.
""" """
from oslo_log import log as logging
from nova.cells import filters from nova.cells import filters
from nova.i18n import _LI from nova.i18n import _LI
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/cells/manager.py
View File

@ -20,6 +20,7 @@ import datetime
import time import time
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging import oslo_messaging
from oslo_utils import importutils from oslo_utils import importutils
from oslo_utils import timeutils from oslo_utils import timeutils
@ -34,7 +35,6 @@ from nova import manager
from nova import objects from nova import objects
from nova.objects import base as base_obj from nova.objects import base as base_obj
from nova.objects import instance as instance_obj from nova.objects import instance as instance_obj
from nova.openstack.common import log as logging
from nova.openstack.common import periodic_task from nova.openstack.common import periodic_task
cell_manager_opts = [ cell_manager_opts = [

3
nova/cells/messaging.py
View File

@ -26,11 +26,13 @@ reached.
The interface into this module is the MessageRunner class. The interface into this module is the MessageRunner class.
""" """
import sys import sys
import traceback import traceback
from eventlet import queue from eventlet import queue
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import excutils from oslo_utils import excutils
@ -53,7 +55,6 @@ from nova.i18n import _, _LE, _LI, _LW
from nova.network import model as network_model from nova.network import model as network_model
from nova import objects from nova import objects
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils
from nova import rpc from nova import rpc
from nova import utils from nova import utils

2
nova/cells/rpcapi.py
View File

@ -24,13 +24,13 @@ messaging module.
""" """
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from nova import exception from nova import exception
from nova.i18n import _LE from nova.i18n import _LE
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova.openstack.common import log as logging
from nova import rpc from nova import rpc
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/cells/scheduler.py
View File

@ -20,6 +20,7 @@ import copy
import time import time
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova.cells import filters from nova.cells import filters
from nova.cells import weights from nova.cells import weights
@ -32,7 +33,6 @@ from nova import exception
from nova.i18n import _LE, _LI from nova.i18n import _LE, _LI
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common import log as logging
from nova.scheduler import utils as scheduler_utils from nova.scheduler import utils as scheduler_utils
from nova import utils from nova import utils

2
nova/cells/state.py
View File

@ -23,6 +23,7 @@ import time
from oslo_config import cfg from oslo_config import cfg
from oslo_db import exception as db_exc from oslo_db import exception as db_exc
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import timeutils from oslo_utils import timeutils
from oslo_utils import units from oslo_utils import units
@ -34,7 +35,6 @@ from nova import exception
from nova.i18n import _LE from nova.i18n import _LE
from nova import objects from nova import objects
from nova.openstack.common import fileutils from nova.openstack.common import fileutils
from nova.openstack.common import log as logging
from nova import rpc from nova import rpc
from nova import utils from nova import utils

2
nova/cells/weights/mute_child.py
View File

@ -19,11 +19,11 @@ downgrade its likelihood of being chosen for scheduling requests.
""" """
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
from nova.cells import weights from nova.cells import weights
from nova.i18n import _LW from nova.i18n import _LW
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/cloudpipe/pipelib.py
View File

@ -25,6 +25,7 @@ import string
import zipfile import zipfile
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import compute from nova import compute
from nova.compute import flavors from nova.compute import flavors
@ -33,7 +34,6 @@ from nova import db
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.openstack.common import fileutils from nova.openstack.common import fileutils
from nova.openstack.common import log as logging
from nova import paths from nova import paths
from nova import utils from nova import utils

4
nova/cmd/all.py
View File

@ -27,12 +27,12 @@ continue attempting to launch the rest of the services.
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova.i18n import _LE from nova.i18n import _LE
from nova import objects from nova import objects
from nova.objectstore import s3server from nova.objectstore import s3server
from nova.openstack.common import log as logging
from nova import service from nova import service
from nova import utils from nova import utils
from nova.vnc import xvp_proxy from nova.vnc import xvp_proxy
@ -47,7 +47,7 @@ CONF.import_opt('enabled_ssl_apis', 'nova.service')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
LOG = logging.getLogger('nova.all') LOG = logging.getLogger('nova.all')
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

4
nova/cmd/api.py
View File

@ -23,10 +23,10 @@ Starts both the EC2 and OpenStack APIs in separate greenthreads.
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -39,7 +39,7 @@ CONF.import_opt('enabled_ssl_apis', 'nova.service')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

4
nova/cmd/api_ec2.py
View File

@ -19,10 +19,10 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -35,7 +35,7 @@ CONF.import_opt('enabled_ssl_apis', 'nova.service')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

4
nova/cmd/api_metadata.py
View File

@ -19,12 +19,12 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova.conductor import rpcapi as conductor_rpcapi from nova.conductor import rpcapi as conductor_rpcapi
from nova import config from nova import config
from nova import objects from nova import objects
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -38,7 +38,7 @@ CONF.import_opt('use_local', 'nova.conductor.api', group='conductor')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

4
nova/cmd/api_os_compute.py
View File

@ -19,10 +19,10 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -35,7 +35,7 @@ CONF.import_opt('enabled_ssl_apis', 'nova.service')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

2
nova/cmd/baseproxy.py
View File

@ -21,10 +21,10 @@ import os
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova.console import websocketproxy from nova.console import websocketproxy
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import version from nova import version

4
nova/cmd/cells.py
View File

@ -18,10 +18,10 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -34,7 +34,7 @@ CONF.import_opt('manager', 'nova.cells.opts', group='cells')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup('nova') logging.setup(CONF, 'nova')
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

4
nova/cmd/cert.py
View File

@ -17,9 +17,9 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -31,7 +31,7 @@ CONF.import_opt('cert_topic', 'nova.cert.rpcapi')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
gmr.TextGuruMeditation.setup_autorun(version) gmr.TextGuruMeditation.setup_autorun(version)

4
nova/cmd/compute.py
View File

@ -20,6 +20,7 @@ import sys
import traceback import traceback
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova.conductor import rpcapi as conductor_rpcapi from nova.conductor import rpcapi as conductor_rpcapi
from nova import config from nova import config
@ -28,7 +29,6 @@ from nova import exception
from nova.i18n import _LE from nova.i18n import _LE
from nova import objects from nova import objects
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -56,7 +56,7 @@ def block_db_access():
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup('nova') logging.setup(CONF, 'nova')
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

4
nova/cmd/conductor.py
View File

@ -18,10 +18,10 @@ import sys
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -33,7 +33,7 @@ CONF.import_opt('topic', 'nova.conductor.api', group='conductor')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

4
nova/cmd/console.py
View File

@ -18,9 +18,9 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import version from nova import version
@ -31,7 +31,7 @@ CONF.import_opt('console_topic', 'nova.console.rpcapi')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
gmr.TextGuruMeditation.setup_autorun(version) gmr.TextGuruMeditation.setup_autorun(version)

4
nova/cmd/consoleauth.py
View File

@ -18,10 +18,10 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import version from nova import version
@ -31,7 +31,7 @@ CONF = cfg.CONF
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
objects.register_all() objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version) gmr.TextGuruMeditation.setup_autorun(version)

4
nova/cmd/dhcpbridge.py
View File

@ -25,6 +25,7 @@ import sys
import traceback import traceback
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import importutils from oslo_utils import importutils
@ -37,7 +38,6 @@ from nova.i18n import _LE
from nova.network import rpcapi as network_rpcapi from nova.network import rpcapi as network_rpcapi
from nova import objects from nova import objects
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova.openstack.common import log as logging
from nova import rpc from nova import rpc
CONF = cfg.CONF CONF = cfg.CONF
@ -117,7 +117,7 @@ def main():
config.parse_args(sys.argv, config.parse_args(sys.argv,
default_config_files=jsonutils.loads(os.environ['CONFIG_FILE'])) default_config_files=jsonutils.loads(os.environ['CONFIG_FILE']))
logging.setup("nova") logging.setup(CONF, "nova")
global LOG global LOG
LOG = logging.getLogger('nova.dhcpbridge') LOG = logging.getLogger('nova.dhcpbridge')
objects.register_all() objects.register_all()

4
nova/cmd/manage.py
View File

@ -61,6 +61,7 @@ import sys
import decorator import decorator
import netaddr import netaddr
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_utils import importutils from oslo_utils import importutils
import six import six
@ -75,7 +76,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova import objects from nova import objects
from nova.openstack.common import cliutils from nova.openstack.common import cliutils
from nova.openstack.common import log as logging
from nova import quota from nova import quota
from nova import rpc from nova import rpc
from nova import servicegroup from nova import servicegroup
@ -1307,7 +1307,7 @@ def main():
CONF.register_cli_opt(category_opt) CONF.register_cli_opt(category_opt)
try: try:
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
except cfg.ConfigFilesNotFoundError: except cfg.ConfigFilesNotFoundError:
cfgfile = CONF.config_file[-1] if CONF.config_file else None cfgfile = CONF.config_file[-1] if CONF.config_file else None
if cfgfile and not os.access(cfgfile, os.R_OK): if cfgfile and not os.access(cfgfile, os.R_OK):

4
nova/cmd/network.py
View File

@ -20,6 +20,7 @@ import sys
import traceback import traceback
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova.conductor import rpcapi as conductor_rpcapi from nova.conductor import rpcapi as conductor_rpcapi
from nova import config from nova import config
@ -28,7 +29,6 @@ from nova import exception
from nova.i18n import _LE from nova.i18n import _LE
from nova import objects from nova import objects
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -56,7 +56,7 @@ def block_db_access():
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

5
nova/cmd/objectstore.py
View File

@ -19,9 +19,10 @@
import sys import sys
from oslo_log import log as logging
from nova import config from nova import config
from nova.objectstore import s3server from nova.objectstore import s3server
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -30,7 +31,7 @@ from nova import version
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(config.CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
gmr.TextGuruMeditation.setup_autorun(version) gmr.TextGuruMeditation.setup_autorun(version)

4
nova/cmd/scheduler.py
View File

@ -19,10 +19,10 @@
import sys import sys
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova import config from nova import config
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import utils from nova import utils
@ -34,7 +34,7 @@ CONF.import_opt('scheduler_topic', 'nova.scheduler.rpcapi')
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(CONF, "nova")
utils.monkey_patch() utils.monkey_patch()
objects.register_all() objects.register_all()

5
nova/cmd/xvpvncproxy.py
View File

@ -17,8 +17,9 @@
import sys import sys
from oslo_log import log as logging
from nova import config from nova import config
from nova.openstack.common import log as logging
from nova.openstack.common.report import guru_meditation_report as gmr from nova.openstack.common.report import guru_meditation_report as gmr
from nova import service from nova import service
from nova import version from nova import version
@ -27,7 +28,7 @@ from nova.vnc import xvp_proxy
def main(): def main():
config.parse_args(sys.argv) config.parse_args(sys.argv)
logging.setup("nova") logging.setup(config.CONF, "nova")
gmr.TextGuruMeditation.setup_autorun(version) gmr.TextGuruMeditation.setup_autorun(version)

18
nova/compute/api.py
View File

@ -27,6 +27,7 @@ import string
import uuid import uuid
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import excutils from oslo_utils import excutils
from oslo_utils import strutils from oslo_utils import strutils
@ -67,7 +68,6 @@ from nova.objects import block_device as block_device_obj
from nova.objects import keypair as keypair_obj from nova.objects import keypair as keypair_obj
from nova.objects import quotas as quotas_obj from nova.objects import quotas as quotas_obj
from nova.objects import security_group as security_group_obj from nova.objects import security_group as security_group_obj
from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils
from nova.pci import request as pci_request from nova.pci import request as pci_request
import nova.policy import nova.policy
@ -4073,10 +4073,10 @@ class SecurityGroupAPI(base.Base, security_group_base.SecurityGroupBase):
for v in vals: for v in vals:
rule = self.db.security_group_rule_create(context, v) rule = self.db.security_group_rule_create(context, v)
rules.append(rule) rules.append(rule)
LOG.audit(msg, {'name': name, LOG.info(msg, {'name': name,
'protocol': rule.protocol, 'protocol': rule.protocol,
'from_port': rule.from_port, 'from_port': rule.from_port,
'to_port': rule.to_port}) 'to_port': rule.to_port})
self.trigger_rules_refresh(context, id=id) self.trigger_rules_refresh(context, id=id)
return rules return rules
@ -4086,10 +4086,10 @@ class SecurityGroupAPI(base.Base, security_group_base.SecurityGroupBase):
"(%(from_port)s:%(to_port)s)") "(%(from_port)s:%(to_port)s)")
for rule_id in rule_ids: for rule_id in rule_ids:
rule = self.get_rule(context, rule_id) rule = self.get_rule(context, rule_id)
LOG.audit(msg, {'name': security_group['name'], LOG.info(msg, {'name': security_group['name'],
'protocol': rule.protocol, 'protocol': rule.protocol,
'from_port': rule.from_port, 'from_port': rule.from_port,
'to_port': rule.to_port}) 'to_port': rule.to_port})
self.db.security_group_rule_destroy(context, rule_id) self.db.security_group_rule_destroy(context, rule_id)

4
nova/compute/claims.py
View File

@ -17,6 +17,7 @@
Claim objects for use with resource tracking. Claim objects for use with resource tracking.
""" """
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from nova import context from nova import context
@ -25,7 +26,6 @@ from nova.i18n import _
from nova.i18n import _LI from nova.i18n import _LI
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common import log as logging
from nova.virt import hardware from nova.virt import hardware
@ -155,7 +155,7 @@ class Claim(NopClaim):
msg = _("Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d " msg = _("Attempting claim: memory %(memory_mb)d MB, disk %(disk_gb)d "
"GB") "GB")
params = {'memory_mb': self.memory_mb, 'disk_gb': self.disk_gb} params = {'memory_mb': self.memory_mb, 'disk_gb': self.disk_gb}
LOG.audit(msg % params, instance=self.instance) LOG.info(msg % params, instance=self.instance)
reasons = [self._test_memory(resources, memory_mb_limit), reasons = [self._test_memory(resources, memory_mb_limit),
self._test_disk(resources, disk_gb_limit), self._test_disk(resources, disk_gb_limit),

2
nova/compute/flavors.py
View File

@ -22,6 +22,7 @@ import re
import uuid import uuid
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import strutils from oslo_utils import strutils
import six import six
@ -32,7 +33,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.i18n import _LE from nova.i18n import _LE
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova import utils from nova import utils
flavor_opts = [ flavor_opts = [

4
nova/compute/manager.py
View File

@ -41,6 +41,7 @@ import eventlet.semaphore
import eventlet.timeout import eventlet.timeout
from keystoneclient import exceptions as keystone_exception from keystoneclient import exceptions as keystone_exception
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import excutils from oslo_utils import excutils
@ -76,7 +77,6 @@ from nova.network import model as network_model
from nova.network.security_group import openstack_driver from nova.network.security_group import openstack_driver
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common import log as logging
from nova.openstack.common import loopingcall from nova.openstack.common import loopingcall
from nova.openstack.common import periodic_task from nova.openstack.common import periodic_task
from nova import paths from nova import paths
@ -4636,7 +4636,7 @@ class ComputeManager(manager.Manager):
LOG.info(_LI('Attaching volume %(volume_id)s to %(mountpoint)s'), LOG.info(_LI('Attaching volume %(volume_id)s to %(mountpoint)s'),
{'volume_id': bdm.volume_id, {'volume_id': bdm.volume_id,
'mountpoint': bdm['mount_device']}, 'mountpoint': bdm['mount_device']},
context=context, instance=instance) context=context, instance=instance)
try: try:
bdm.attach(context, instance, self.volume_api, self.driver, bdm.attach(context, instance, self.volume_api, self.driver,
do_check_attach=False, do_driver_attach=True) do_check_attach=False, do_driver_attach=True)

2
nova/compute/monitors/__init__.py
View File

@ -24,12 +24,12 @@ import functools
import types import types
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
import six import six
from nova.i18n import _, _LW from nova.i18n import _, _LW
from nova import loadables from nova import loadables
from nova.openstack.common import log as logging
compute_monitors_opts = [ compute_monitors_opts = [
cfg.MultiStrOpt('compute_available_monitors', cfg.MultiStrOpt('compute_available_monitors',

2
nova/compute/monitors/virt/cpu_monitor.py
View File

@ -18,13 +18,13 @@ CPU monitor based on compute driver to retrieve CPU information
""" """
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
from nova.compute import monitors from nova.compute import monitors
from nova.compute.monitors import cpu_monitor as monitor from nova.compute.monitors import cpu_monitor as monitor
from nova import exception from nova import exception
from nova.i18n import _LE from nova.i18n import _LE
from nova.openstack.common import log as logging
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_opt('compute_driver', 'nova.virt.driver') CONF.import_opt('compute_driver', 'nova.virt.driver')

2
nova/compute/resource_tracker.py
View File

@ -21,6 +21,7 @@ model.
import copy import copy
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import importutils from oslo_utils import importutils
@ -36,7 +37,6 @@ from nova.i18n import _, _LI, _LW
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.objects import instance as instance_obj from nova.objects import instance as instance_obj
from nova.openstack.common import log as logging
from nova.pci import manager as pci_manager from nova.pci import manager as pci_manager
from nova.pci import whitelist as pci_whitelist from nova.pci import whitelist as pci_whitelist
from nova import rpc from nova import rpc

2
nova/compute/resources/__init__.py
View File

@ -13,10 +13,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
import stevedore import stevedore
from nova.i18n import _LW from nova.i18n import _LW
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

3
nova/compute/resources/vcpu.py
View File

@ -13,8 +13,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from nova.compute.resources import base from nova.compute.resources import base
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/compute/rpcapi.py
View File

@ -17,6 +17,7 @@ Client side of the compute RPC API.
""" """
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
@ -24,7 +25,6 @@ from nova import exception
from nova.i18n import _, _LW from nova.i18n import _, _LW
from nova import objects from nova import objects
from nova.objects import base as objects_base from nova.objects import base as objects_base
from nova.openstack.common import log as logging
from nova import rpc from nova import rpc
rpcapi_opts = [ rpcapi_opts = [

2
nova/compute/utils.py
View File

@ -20,6 +20,7 @@ import traceback
import netifaces import netifaces
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log
from oslo_utils import encodeutils from oslo_utils import encodeutils
from nova import block_device from nova import block_device
@ -31,7 +32,6 @@ from nova.network import model as network_model
from nova import notifications from nova import notifications
from nova import objects from nova import objects
from nova.objects import base as obj_base from nova.objects import base as obj_base
from nova.openstack.common import log
from nova import rpc from nova import rpc
from nova import utils from nova import utils
from nova.virt import driver from nova.virt import driver

2
nova/conductor/api.py
View File

@ -15,13 +15,13 @@
"""Handles all requests to the conductor service.""" """Handles all requests to the conductor service."""
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from nova import baserpc from nova import baserpc
from nova.conductor import manager from nova.conductor import manager
from nova.conductor import rpcapi from nova.conductor import rpcapi
from nova.i18n import _LI, _LW from nova.i18n import _LI, _LW
from nova.openstack.common import log as logging
from nova import utils from nova import utils
conductor_opts = [ conductor_opts = [

2
nova/conductor/manager.py
View File

@ -17,6 +17,7 @@
import copy import copy
import itertools import itertools
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import excutils from oslo_utils import excutils
@ -42,7 +43,6 @@ from nova.network.security_group import openstack_driver
from nova import notifications from nova import notifications
from nova import objects from nova import objects
from nova.objects import base as nova_object from nova.objects import base as nova_object
from nova.openstack.common import log as logging
from nova import quota from nova import quota
from nova.scheduler import client as scheduler_client from nova.scheduler import client as scheduler_client
from nova.scheduler import utils as scheduler_utils from nova.scheduler import utils as scheduler_utils

2
nova/conductor/tasks/live_migrate.py
View File

@ -11,6 +11,7 @@
# under the License. # under the License.
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from nova.compute import power_state from nova.compute import power_state
from nova.compute import rpcapi as compute_rpcapi from nova.compute import rpcapi as compute_rpcapi
@ -19,7 +20,6 @@ from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova import image from nova import image
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.scheduler import client as scheduler_client from nova.scheduler import client as scheduler_client
from nova.scheduler import utils as scheduler_utils from nova.scheduler import utils as scheduler_utils
from nova import servicegroup from nova import servicegroup

3
nova/config.py
View File

@ -17,9 +17,9 @@
from oslo_config import cfg from oslo_config import cfg
from oslo_db import options from oslo_db import options
from oslo_log import log
from nova import debugger from nova import debugger
from nova.openstack.common import log
from nova import paths from nova import paths
from nova import rpc from nova import rpc
from nova import version from nova import version
@ -45,6 +45,7 @@ _DEFAULT_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d '
def parse_args(argv, default_config_files=None): def parse_args(argv, default_config_files=None):
log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, _DEFAULT_LOG_LEVELS) log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, _DEFAULT_LOG_LEVELS)
log.register_options(CONF)
options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION, options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION,
sqlite_db='nova.sqlite') sqlite_db='nova.sqlite')
rpc.set_defaults(control_exchange='nova') rpc.set_defaults(control_exchange='nova')

2
nova/console/manager.py
View File

@ -18,13 +18,13 @@
import socket import socket
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_utils import importutils from oslo_utils import importutils
from nova.compute import rpcapi as compute_rpcapi from nova.compute import rpcapi as compute_rpcapi
from nova import exception from nova import exception
from nova import manager from nova import manager
from nova.openstack.common import log as logging
from nova import utils from nova import utils

2
nova/console/serial.py
View File

@ -17,11 +17,11 @@
import socket import socket
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import six.moves import six.moves
from nova import exception from nova import exception
from nova.i18n import _LW from nova.i18n import _LW
from nova.openstack.common import log as logging
from nova import utils from nova import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/console/vmrc_manager.py
View File

@ -16,12 +16,12 @@
"""VMRC Console Manager.""" """VMRC Console Manager."""
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import importutils from oslo_utils import importutils
from nova.compute import rpcapi as compute_rpcapi from nova.compute import rpcapi as compute_rpcapi
from nova import exception from nova import exception
from nova import manager from nova import manager
from nova.openstack.common import log as logging
from nova.virt.vmwareapi import driver as vmwareapi_conn from nova.virt.vmwareapi import driver as vmwareapi_conn

2
nova/console/websocketproxy.py
View File

@ -23,13 +23,13 @@ import socket
import sys import sys
import urlparse import urlparse
from oslo_log import log as logging
import websockify import websockify
from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova.consoleauth import rpcapi as consoleauth_rpcapi
from nova import context from nova import context
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/console/xvp.py
View File

@ -21,12 +21,12 @@ import signal
import jinja2 import jinja2
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from nova import context from nova import context
from nova import db from nova import db
from nova.i18n import _, _LE from nova.i18n import _, _LE
from nova.openstack.common import log as logging
from nova import paths from nova import paths
from nova import utils from nova import utils

2
nova/consoleauth/manager.py
View File

@ -19,6 +19,7 @@
import time import time
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging as messaging import oslo_messaging as messaging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
@ -27,7 +28,6 @@ from nova.compute import rpcapi as compute_rpcapi
from nova.i18n import _LI, _LW from nova.i18n import _LI, _LW
from nova import manager from nova import manager
from nova import objects from nova import objects
from nova.openstack.common import log as logging
from nova.openstack.common import memorycache from nova.openstack.common import memorycache

2
nova/context.py
View File

@ -22,13 +22,13 @@ import copy
from keystoneclient import auth from keystoneclient import auth
from keystoneclient import service_catalog from keystoneclient import service_catalog
from oslo_context import context from oslo_context import context
from oslo_log import log as logging
from oslo_utils import timeutils from oslo_utils import timeutils
import six import six
from nova import exception from nova import exception
from nova.i18n import _, _LW from nova.i18n import _, _LW
from nova.openstack.common import local from nova.openstack.common import local
from nova.openstack.common import log as logging
from nova import policy from nova import policy

2
nova/crypto.py
View File

@ -30,6 +30,7 @@ import struct
from oslo_concurrency import processutils from oslo_concurrency import processutils
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from oslo_utils import timeutils from oslo_utils import timeutils
from pyasn1.codec.der import encoder as der_encoder from pyasn1.codec.der import encoder as der_encoder
@ -40,7 +41,6 @@ from nova import db
from nova import exception from nova import exception
from nova.i18n import _, _LE from nova.i18n import _, _LE
from nova.openstack.common import fileutils from nova.openstack.common import fileutils
from nova.openstack.common import log as logging
from nova import paths from nova import paths
from nova import utils from nova import utils

2
nova/db/api.py
View File

@ -29,10 +29,10 @@ these objects be simple dictionaries.
from oslo_config import cfg from oslo_config import cfg
from oslo_db import concurrency from oslo_db import concurrency
from oslo_log import log as logging
from nova.cells import rpcapi as cells_rpcapi from nova.cells import rpcapi as cells_rpcapi
from nova.i18n import _LE from nova.i18n import _LE
from nova.openstack.common import log as logging
db_opts = [ db_opts = [

2
nova/db/sqlalchemy/api.py
View File

@ -30,6 +30,7 @@ from oslo_config import cfg
from oslo_db import exception as db_exc from oslo_db import exception as db_exc
from oslo_db.sqlalchemy import session as db_session from oslo_db.sqlalchemy import session as db_session
from oslo_db.sqlalchemy import utils as sqlalchemyutils from oslo_db.sqlalchemy import utils as sqlalchemyutils
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from oslo_utils import timeutils from oslo_utils import timeutils
import retrying import retrying
@ -60,7 +61,6 @@ import nova.context
from nova.db.sqlalchemy import models from nova.db.sqlalchemy import models
from nova import exception from nova import exception
from nova.i18n import _, _LI, _LE, _LW from nova.i18n import _, _LI, _LE, _LW
from nova.openstack.common import log as logging
from nova.openstack.common import uuidutils from nova.openstack.common import uuidutils
from nova import quota from nova import quota

2
nova/db/sqlalchemy/migrate_repo/versions/216_havana.py
View File

@ -14,6 +14,7 @@
from migrate.changeset import UniqueConstraint from migrate.changeset import UniqueConstraint
from migrate import ForeignKeyConstraint from migrate import ForeignKeyConstraint
from oslo_log import log as logging
from sqlalchemy import Boolean, BigInteger, Column, DateTime, Enum, Float from sqlalchemy import Boolean, BigInteger, Column, DateTime, Enum, Float
from sqlalchemy import dialects from sqlalchemy import dialects
from sqlalchemy import ForeignKey, Index, Integer, MetaData, String, Table from sqlalchemy import ForeignKey, Index, Integer, MetaData, String, Table
@ -21,7 +22,6 @@ from sqlalchemy import Text
from sqlalchemy.types import NullType from sqlalchemy.types import NullType
from nova.i18n import _LE from nova.i18n import _LE
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/db/sqlalchemy/migrate_repo/versions/234_add_expire_reservations_index.py
View File

@ -12,10 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from sqlalchemy import Index, MetaData, Table from sqlalchemy import Index, MetaData, Table
from nova.i18n import _LI from nova.i18n import _LI
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/db/sqlalchemy/migrate_repo/versions/248_add_expire_reservations_index.py
View File

@ -12,10 +12,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import log as logging
from sqlalchemy import Index, MetaData, Table from sqlalchemy import Index, MetaData, Table
from nova.i18n import _LI from nova.i18n import _LI
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
nova/db/sqlalchemy/migrate_repo/versions/267_instance_uuid_non_nullable.py
View File

@ -14,12 +14,12 @@
from migrate import UniqueConstraint from migrate import UniqueConstraint
from oslo_db.sqlalchemy import utils from oslo_db.sqlalchemy import utils
from oslo_log import log as logging
from sqlalchemy import MetaData from sqlalchemy import MetaData
from sqlalchemy.sql import null from sqlalchemy.sql import null
from nova import exception from nova import exception
from nova.i18n import _ from nova.i18n import _
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

Some files were not shown because too many files have changed in this diff Show More