From 1e8513c556e23bdfff6ba31c8b56c352916aac59 Mon Sep 17 00:00:00 2001 From: Nikolay Starodubtsev Date: Tue, 21 Jul 2015 14:23:36 +0300 Subject: [PATCH] Switch to oslo_log in murano-dashboard Change-Id: If454f698c8711f734d3220e82fc14331bd0d0661 Partial-bug: 1463093 --- muranodashboard/api/__init__.py | 2 +- muranodashboard/catalog/tabs.py | 2 +- muranodashboard/catalog/views.py | 2 +- muranodashboard/categories/forms.py | 3 +-- muranodashboard/categories/tables.py | 3 +-- muranodashboard/common/cache.py | 3 ++- muranodashboard/common/net.py | 2 +- muranodashboard/dynamic_ui/fields.py | 2 +- muranodashboard/dynamic_ui/forms.py | 2 +- muranodashboard/dynamic_ui/services.py | 2 +- muranodashboard/environments/api.py | 2 +- muranodashboard/environments/forms.py | 2 +- muranodashboard/environments/tables.py | 2 +- muranodashboard/environments/tabs.py | 2 +- muranodashboard/environments/views.py | 2 +- muranodashboard/images/forms.py | 2 +- muranodashboard/middleware.py | 2 +- muranodashboard/packages/consts.py | 3 +-- muranodashboard/packages/forms.py | 2 +- muranodashboard/packages/tables.py | 2 +- muranodashboard/packages/views.py | 2 +- muranodashboard/tests/functional/base.py | 18 ++++++++++-------- muranodashboard/tests/functional/utils.py | 4 +++- 23 files changed, 35 insertions(+), 33 deletions(-) diff --git a/muranodashboard/api/__init__.py b/muranodashboard/api/__init__.py index 08aad1224..4725651cb 100644 --- a/muranodashboard/api/__init__.py +++ b/muranodashboard/api/__init__.py @@ -13,7 +13,6 @@ # under the License. import contextlib -import logging from django.conf import settings from django.contrib.messages import api as msg_api @@ -21,6 +20,7 @@ from django.utils.encoding import force_unicode from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from openstack_dashboard.api import base +from oslo_log import log as logging import muranoclient.client as client from muranoclient.common import exceptions as exc diff --git a/muranodashboard/catalog/tabs.py b/muranodashboard/catalog/tabs.py index 485c2e808..9840c02ac 100644 --- a/muranodashboard/catalog/tabs.py +++ b/muranodashboard/catalog/tabs.py @@ -13,9 +13,9 @@ # under the License. from horizon import tabs -import logging from django.utils.translation import ugettext_lazy as _ +from oslo_log import log as logging from muranodashboard.dynamic_ui import services diff --git a/muranodashboard/catalog/views.py b/muranodashboard/catalog/views.py index ff6a6928a..7be4508ad 100644 --- a/muranodashboard/catalog/views.py +++ b/muranodashboard/catalog/views.py @@ -16,7 +16,6 @@ import collections import copy import functools import json -import logging import re from django.conf import settings @@ -36,6 +35,7 @@ from horizon import exceptions from horizon.forms import views from horizon import messages from horizon import tabs +from oslo_log import log as logging from muranoclient.common import exceptions as exc from muranodashboard import api diff --git a/muranodashboard/categories/forms.py b/muranodashboard/categories/forms.py index c62163712..247441988 100644 --- a/muranodashboard/categories/forms.py +++ b/muranodashboard/categories/forms.py @@ -12,12 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from django import forms from django.utils.translation import ugettext_lazy as _ from horizon import forms as horizon_forms from horizon import messages +from oslo_log import log as logging from muranodashboard import api diff --git a/muranodashboard/categories/tables.py b/muranodashboard/categories/tables.py index b2d104583..29f8f197c 100644 --- a/muranodashboard/categories/tables.py +++ b/muranodashboard/categories/tables.py @@ -12,12 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tables from muranoclient.common import exceptions as exc +from oslo_log import log as logging from muranodashboard import api diff --git a/muranodashboard/common/cache.py b/muranodashboard/common/cache.py index de71ba676..af93719e3 100644 --- a/muranodashboard/common/cache.py +++ b/muranodashboard/common/cache.py @@ -17,9 +17,10 @@ try: except ImportError: import pickle import functools -import logging import os +from oslo_log import log as logging + from muranodashboard.environments import consts diff --git a/muranodashboard/common/net.py b/muranodashboard/common/net.py index 40bd46458..ccf22f01a 100644 --- a/muranodashboard/common/net.py +++ b/muranodashboard/common/net.py @@ -13,13 +13,13 @@ # under the License. -import logging import re import uuid from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from openstack_dashboard.api import neutron +from oslo_log import log as logging from muranodashboard.environments import api as env_api diff --git a/muranodashboard/dynamic_ui/fields.py b/muranodashboard/dynamic_ui/fields.py index 036bc3dd0..e35ca7c46 100644 --- a/muranodashboard/dynamic_ui/fields.py +++ b/muranodashboard/dynamic_ui/fields.py @@ -15,7 +15,6 @@ import ast import copy import json -import logging import netaddr import re @@ -31,6 +30,7 @@ from horizon import forms as hz_forms from horizon import messages from openstack_dashboard.api import glance from openstack_dashboard.api import nova +from oslo_log import log as logging import yaql from muranoclient.common import exceptions as muranoclient_exc diff --git a/muranodashboard/dynamic_ui/forms.py b/muranodashboard/dynamic_ui/forms.py index 56d404803..cc691ff89 100644 --- a/muranodashboard/dynamic_ui/forms.py +++ b/muranodashboard/dynamic_ui/forms.py @@ -14,11 +14,11 @@ from collections import defaultdict import copy -import logging import types from django import forms from django.utils.translation import ugettext_lazy as _ +from oslo_log import log as logging import yaql import muranodashboard.dynamic_ui.fields as fields diff --git a/muranodashboard/dynamic_ui/services.py b/muranodashboard/dynamic_ui/services.py index 204f6180a..b86e27965 100644 --- a/muranodashboard/dynamic_ui/services.py +++ b/muranodashboard/dynamic_ui/services.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import os import re import semantic_version @@ -20,6 +19,7 @@ import yaql from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ +from oslo_log import log as logging import six from muranodashboard.api import packages as pkg_api diff --git a/muranodashboard/environments/api.py b/muranodashboard/environments/api.py index af25981c6..602b21562 100644 --- a/muranodashboard/environments/api.py +++ b/muranodashboard/environments/api.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -import logging +from oslo_log import log as logging from muranoclient.common import exceptions as exc from muranodashboard import api diff --git a/muranodashboard/environments/forms.py b/muranodashboard/environments/forms.py index 0c681a76a..fa9810435 100644 --- a/muranodashboard/environments/forms.py +++ b/muranodashboard/environments/forms.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. import ast -import logging from django.core import validators from django import forms @@ -20,6 +19,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms as horizon_forms from horizon import messages +from oslo_log import log as logging from muranoclient.common import exceptions as exc from muranodashboard.common import net diff --git a/muranodashboard/environments/tables.py b/muranodashboard/environments/tables.py index a939a0050..9d3a900a3 100644 --- a/muranodashboard/environments/tables.py +++ b/muranodashboard/environments/tables.py @@ -13,7 +13,6 @@ # under the License. import json -import logging from django.core.urlresolvers import reverse from django import http as django_http @@ -25,6 +24,7 @@ from horizon import exceptions from horizon import forms from horizon import messages from horizon import tables +from oslo_log import log as logging from muranodashboard import api as api_utils from muranodashboard.api import packages as pkg_api diff --git a/muranodashboard/environments/tabs.py b/muranodashboard/environments/tabs.py index 17057b131..3d6cb30f2 100644 --- a/muranodashboard/environments/tabs.py +++ b/muranodashboard/environments/tabs.py @@ -13,7 +13,6 @@ # under the License. import json -import logging from django.core.urlresolvers import reverse from django.utils.datastructures import SortedDict @@ -22,6 +21,7 @@ from horizon import exceptions from horizon import tabs from openstack_dashboard.api import heat as heat_api from openstack_dashboard.api import nova as nova_api +from oslo_log import log as logging from muranoclient.common import exceptions as exc diff --git a/muranodashboard/environments/views.py b/muranodashboard/environments/views.py index c4ebd87cb..dc8ee25d6 100644 --- a/muranodashboard/environments/views.py +++ b/muranodashboard/environments/views.py @@ -14,7 +14,6 @@ import base64 import json -import logging from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse_lazy @@ -26,6 +25,7 @@ from horizon.forms import views from horizon import tables from horizon import tabs from horizon.utils import memoized +from oslo_log import log as logging from muranoclient.common import exceptions as exc from muranodashboard import api as api_utils diff --git a/muranodashboard/images/forms.py b/muranodashboard/images/forms.py index 09458dba8..e23839a3c 100644 --- a/muranodashboard/images/forms.py +++ b/muranodashboard/images/forms.py @@ -13,7 +13,6 @@ # under the License. import json -import logging from django import forms from django.utils.translation import ugettext_lazy as _ @@ -21,6 +20,7 @@ from horizon import exceptions from horizon import forms as horizon_forms from horizon import messages from openstack_dashboard.api import glance +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/muranodashboard/middleware.py b/muranodashboard/middleware.py index 2262fe9c0..959570381 100644 --- a/muranodashboard/middleware.py +++ b/muranodashboard/middleware.py @@ -12,11 +12,11 @@ # License for the specific language governing permissions and limitations # under the License. -import logging import traceback from horizon import exceptions from horizon import middleware +from oslo_log import log as logging logger = logging.getLogger(__name__) diff --git a/muranodashboard/packages/consts.py b/muranodashboard/packages/consts.py index 1a56a7796..a216a7efb 100644 --- a/muranodashboard/packages/consts.py +++ b/muranodashboard/packages/consts.py @@ -12,9 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -import logging - from django.conf import settings +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/muranodashboard/packages/forms.py b/muranodashboard/packages/forms.py index 485ce9eee..31097d74e 100644 --- a/muranodashboard/packages/forms.py +++ b/muranodashboard/packages/forms.py @@ -13,7 +13,6 @@ # under the License. import json -import logging import sys from django.core.urlresolvers import reverse @@ -22,6 +21,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import forms as horizon_forms from horizon import messages +from oslo_log import log as logging from muranoclient.common import exceptions as exc from muranodashboard import api diff --git a/muranodashboard/packages/tables.py b/muranodashboard/packages/tables.py index d23c64768..6cc581914 100644 --- a/muranodashboard/packages/tables.py +++ b/muranodashboard/packages/tables.py @@ -13,7 +13,6 @@ # under the License. from collections import defaultdict -import logging from django.core.urlresolvers import reverse from django import http @@ -22,6 +21,7 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ungettext_lazy from horizon import exceptions from horizon import tables +from oslo_log import log as logging from muranoclient.common import exceptions as exc from muranodashboard import api diff --git a/muranodashboard/packages/views.py b/muranodashboard/packages/views.py index 2bbb90216..9cff894a1 100644 --- a/muranodashboard/packages/views.py +++ b/muranodashboard/packages/views.py @@ -13,7 +13,6 @@ # under the License. import json -import logging import sys from django.contrib.formtools.wizard import views as wizard_views @@ -30,6 +29,7 @@ from horizon.utils import functions as utils from muranoclient.common import exceptions as exc from muranoclient.common import utils as muranoclient_utils from openstack_dashboard.api import glance +from oslo_log import log as logging from muranodashboard import api from muranodashboard.api import packages as pkg_api diff --git a/muranodashboard/tests/functional/base.py b/muranodashboard/tests/functional/base.py index a400de380..dcd4c39c1 100644 --- a/muranodashboard/tests/functional/base.py +++ b/muranodashboard/tests/functional/base.py @@ -21,6 +21,8 @@ import urlparse from glanceclient import client as gclient from keystoneclient.v2_0 import client as ksclient from muranoclient import client as mclient +from oslo_log import handlers +from oslo_log import log from selenium.common import exceptions as exc from selenium import webdriver from selenium.webdriver.common.action_chains import ActionChains @@ -32,9 +34,9 @@ import config.config as cfg from muranodashboard.tests.functional import consts from muranodashboard.tests.functional import utils -log = logging.getLogger(__name__) -log.setLevel(logging.DEBUG) -log.addHandler(logging.StreamHandler()) +logger = log.getLogger(__name__).logger +logger.level = logging.DEBUG +logger.addHandler(handlers.ColorHandler()) if sys.version_info >= (2, 7): class BaseDeps(testtools.TestCase): @@ -103,7 +105,7 @@ class UITestCase(BaseDeps): """ name = self._testMethodName - log.exception('{0} failed'.format(name)) + logger.error('{0} failed'.format(name)) screenshot_dir = './screenshots' if not os.path.exists(screenshot_dir): os.makedirs(screenshot_dir) @@ -229,7 +231,7 @@ class UITestCase(BaseDeps): def wait_for_alert_message(self): locator = (by.By.CSS_SELECTOR, 'div.alert-success') - log.debug("Waiting for a success message") + logger.debug("Waiting for a success message") ui.WebDriverWait(self.driver, 2).until( EC.presence_of_element_located(locator)) @@ -292,7 +294,7 @@ class ImageTestCase(PackageBase): is_public=True, properties=property) except Exception as e: - log.exception("Unable to create or update image in Glance") + logger.error("Unable to create or update image in Glance") raise e return image @@ -325,8 +327,8 @@ class FieldsTestCase(PackageBase): self.driver.find_element_by_xpath( consts.ErrorMessage.format(error_message)) except (exc.NoSuchElementException, exc.ElementNotVisibleException): - log.info("Message {0} is not" - " present on the page".format(error_message)) + logger.info("Message {0} is not" + " present on the page".format(error_message)) self.driver.implicitly_wait(30) diff --git a/muranodashboard/tests/functional/utils.py b/muranodashboard/tests/functional/utils.py index 6ed713941..0d1d01fe6 100644 --- a/muranodashboard/tests/functional/utils.py +++ b/muranodashboard/tests/functional/utils.py @@ -3,9 +3,11 @@ import os import yaml import zipfile +from oslo_log import log + from muranodashboard.tests.functional import consts -log = logging.getLogger(__name__) +log = log.getLogger(__name__).logger log.setLevel(logging.DEBUG) log.addHandler(logging.StreamHandler())