Merge "Switch to oslo_log"

vmware_nsx/common/config.py

@@ -12,10 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from oslo_config import cfg
 from oslo_config import types
+from oslo_log import log as logging
 
 from neutron.db import l3_hamode_db
 

vmware_nsx/osc/plugin.py

@@ -14,9 +14,8 @@
 #    under the License.
 
 
-import logging
-
 from osc_lib import utils
+from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/shell/__init__.py

@@ -13,14 +13,25 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-import logging
 import sys
 
 from neutronclient import shell
+from oslo_config import cfg
+from oslo_log import log as logging
+
 from vmware_nsx.shell import commands as cmd
 
-logging.basicConfig(format='%(message)s', level=logging.INFO)
-logging.getLogger('requests').setLevel(logging.WARNING)
+# Oslo Logging uses INFO as default
+# Use a simple format for the output
+logging_format_string = '%(message)s'
+logging.register_options(cfg.CONF)
+logging.setup(cfg.CONF, "vmware-nsx")
+cfg.CONF.set_override('logging_context_format_string',
+                      logging_format_string)
+cfg.CONF.set_override('logging_default_format_string',
+                      logging_format_string)
+cfg.CONF.set_override('logging_exception_prefix',
+                      '')
 
 
 class NsxManage(shell.NeutronShell):

vmware_nsx/shell/admin/plugins/common/formatters.py

@@ -12,9 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #     under the License.
 
-import logging
-
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 
 import prettytable

vmware_nsx/shell/admin/plugins/common/utils.py

@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import six
 import sys
 
 from vmware_nsx._i18n import _LI, _
 from neutron.callbacks import registry
 from neutron.common import profiler  # noqa
+from oslo_log import log as logging
 from vmware_nsx.shell import resources as nsxadmin
 
 LOG = logging.getLogger(__name__)

vmware_nsx/shell/admin/plugins/nsxv/resources/backup_edges.py

@@ -13,11 +13,10 @@
 #    under the License.
 
 
-import logging
-
 from neutron.callbacks import registry
 from neutron.db import l3_db
 from neutron_lib import exceptions
+from oslo_log import log as logging
 from oslo_utils import uuidutils
 
 from vmware_nsx._i18n import _LE, _LI

vmware_nsx/shell/admin/plugins/nsxv/resources/dhcp_binding.py

@@ -13,10 +13,10 @@
 #    under the License.
 
 
-import logging
 import pprint
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from vmware_nsx.shell.admin.plugins.common import constants
 import vmware_nsx.shell.admin.plugins.common.utils as admin_utils

vmware_nsx/shell/admin/plugins/nsxv/resources/edges.py

@@ -13,7 +13,6 @@
 #    under the License.
 
 
-import logging
 import pprint
 import textwrap
 
@@ -28,6 +27,7 @@ import vmware_nsx.shell.resources as shell
 
 from neutron.callbacks import registry
 from neutron_lib import exceptions
+from oslo_log import log as logging
 
 from vmware_nsx._i18n import _LE, _LI
 from vmware_nsx.common import nsxv_constants

vmware_nsx/shell/admin/plugins/nsxv/resources/metadata.py

@@ -15,11 +15,11 @@
 
 import hashlib
 import hmac
-import logging
 
 from neutron.callbacks import registry
 from neutron.db import models_v2
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from vmware_nsx._i18n import _LE, _LI
 from vmware_nsx.common import config

vmware_nsx/shell/admin/plugins/nsxv/resources/networks.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 
-import logging
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 import re
 import xml.etree.ElementTree as et

vmware_nsx/shell/admin/plugins/nsxv/resources/routers.py

@@ -13,8 +13,6 @@
 #    under the License.
 
 
-import logging
-
 from vmware_nsx.shell.admin.plugins.common import constants
 import vmware_nsx.shell.admin.plugins.common.utils as admin_utils
 import vmware_nsx.shell.admin.plugins.nsxv.resources.utils as utils
@@ -23,6 +21,7 @@ import vmware_nsx.shell.resources as shell
 from neutron.callbacks import registry
 from neutron import context as n_context
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from vmware_nsx._i18n import _LE, _LI, _LW
 from vmware_nsx.common import locking

vmware_nsx/shell/admin/plugins/nsxv/resources/securitygroups.py

@@ -13,7 +13,6 @@
 #    under the License.
 
 
-import logging
 import xml.etree.ElementTree as et
 
 from neutron.callbacks import registry
@@ -22,6 +21,7 @@ from neutron.db.models import securitygroup as sg_models
 from neutron.db import models_v2
 from neutron.db import securitygroups_db
 from neutron.extensions import securitygroup as ext_sg
+from oslo_log import log as logging
 
 from vmware_nsx._i18n import _LE, _LI, _LW
 from vmware_nsx.db import db as nsx_db

vmware_nsx/shell/admin/plugins/nsxv/resources/spoofguard_policy.py

@@ -13,9 +13,6 @@
 #    under the License.
 
 
-import logging
-
-
 from vmware_nsx.shell.admin.plugins.common import constants
 from vmware_nsx.shell.admin.plugins.common import formatters
 
@@ -29,6 +26,8 @@ from neutron_lib import exceptions
 from vmware_nsx._i18n import _LE, _LI
 from vmware_nsx.db import nsxv_db
 
+from oslo_log import log as logging
+
 LOG = logging.getLogger(__name__)
 nsxv = utils.get_nsxv_client()
 

vmware_nsx/shell/admin/plugins/nsxv3/resources/dhcp_binding.py

@@ -12,12 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
 import netaddr
 
 from neutron.callbacks import registry
 from neutron_lib import constants as const
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from vmware_nsx._i18n import _LE, _LI
 from vmware_nsx.common import utils as nsx_utils

vmware_nsx/shell/admin/plugins/nsxv3/resources/dhcp_servers.py

@@ -12,11 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from neutron.callbacks import registry
 from neutron import context
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from vmware_nsx._i18n import _LE, _LI
 from vmware_nsx.common import utils as nsx_utils

vmware_nsx/shell/admin/plugins/nsxv3/resources/metadata_proxy.py

@@ -12,11 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from neutron.callbacks import registry
 from neutron_lib import constants as const
 from oslo_config import cfg
+from oslo_log import log as logging
 
 from vmware_nsx._i18n import _LE, _LI
 from vmware_nsx.common import utils as nsx_utils

vmware_nsx/shell/admin/plugins/nsxv3/resources/networks.py

@@ -13,8 +13,6 @@
 #    under the License.
 
 
-import logging
-
 from vmware_nsx._i18n import _LI
 from vmware_nsx.db import db as nsx_db
 from vmware_nsx.shell.admin.plugins.common import constants
@@ -27,6 +25,7 @@ from vmware_nsxlib.v3 import exceptions as nsx_exc
 from neutron.callbacks import registry
 from neutron import context as neutron_context
 from neutron.db import db_base_plugin_v2
+from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/shell/admin/plugins/nsxv3/resources/ports.py

@@ -13,9 +13,8 @@
 #    under the License.
 
 
-import logging
-
 from oslo_config import cfg
+from oslo_log import log as logging
 from sqlalchemy.orm import exc
 
 from vmware_nsx._i18n import _LE, _LI, _LW

vmware_nsx/shell/admin/plugins/nsxv3/resources/routers.py

@@ -13,8 +13,6 @@
 #    under the License.
 
 
-import logging
-
 from vmware_nsx._i18n import _LI
 from vmware_nsx.db import db as nsx_db
 from vmware_nsx.shell.admin.plugins.common import constants
@@ -29,6 +27,7 @@ from neutron.callbacks import registry
 from neutron import context as neutron_context
 from neutron.db import db_base_plugin_v2
 from neutron.db import l3_db
+from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
 

vmware_nsx/shell/admin/plugins/nsxv3/resources/securitygroups.py

@@ -12,13 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import logging
-
 from neutron.callbacks import registry
 from neutron import context as neutron_context
 from neutron.db import common_db_mixin as common_db
 from neutron.db.models import securitygroup
 from neutron.db import securitygroups_db
+from oslo_log import log as logging
 
 from vmware_nsx.common import utils
 from vmware_nsx.db import db as nsx_db

vmware_nsx/shell/nsxadmin.py

@@ -24,7 +24,6 @@ TODO: Add support for other resources, ports, logical switches etc.
 TODO: Autocomplete command line args
 """
 
-import logging
 import requests
 import sys
 
@@ -37,6 +36,7 @@ from vmware_nsx.common import config  # noqa
 
 from oslo_config import cfg
 from oslo_log import _options
+from oslo_log import log as logging
 
 from vmware_nsx.shell.admin.plugins.common import constants
 from vmware_nsx.shell.admin import version

vmware_nsx/shell/resources.py

@@ -15,10 +15,10 @@
 import enum
 import glob
 import importlib
-import logging
 import os
 
 from oslo_config import cfg
+from oslo_log import log as logging
 import requests
 
 from vmware_nsx.common import config  # noqa

vmware_nsx/tests/unit/shell/test_admin_utils.py

@@ -14,12 +14,12 @@
 #    under the License.
 
 import abc
-import logging
 import mock
 import six
 
 from oslo_config import cfg
 from oslo_log import _options
+from oslo_log import log as logging
 from oslo_utils import uuidutils
 
 from neutron.callbacks import registry