Merge "Switch to oslo_log"

requirements.txt

@@ -7,5 +7,6 @@
 # be installed in a specific order.
 #
 # PBR should always appear first
+oslo.log>=3.11.0 # Apache-2.0
 pbr>=2.0.0 # Apache-2.0
 python-tackerclient>=0.8.0 # Apache-2.0

tacker_horizon/openstack_dashboard/api/tacker.py

@@ -14,9 +14,8 @@
 
 from __future__ import absolute_import
 
-import logging
-
 from django.conf import settings
+from oslo_log import log as logging
 from tackerclient.v1_0 import client as tacker_client
 
 from horizon.utils.memoized import memoized  # noqa

tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/forms.py

@@ -10,10 +10,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
-
 from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
+from oslo_log import log as logging
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/tabs.py

@@ -10,8 +10,6 @@
 # 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 tabs
@@ -20,8 +18,6 @@ from tacker_horizon.openstack_dashboard import api
 from tacker_horizon.openstack_dashboard.dashboards.nfv.nsmanager import tables
 from tacker_horizon.openstack_dashboard.dashboards.nfv import utils
 
-LOG = logging.getLogger(__name__)
-
 
 class NSManagerTab(tabs.TableTab):
     name = _("NSManager Tab")

tacker_horizon/openstack_dashboard/dashboards/nfv/nsmanager/views.py

@@ -10,11 +10,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
-
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
+from oslo_log import log as logging
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/vim/forms.py

@@ -12,8 +12,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
-
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.debug import sensitive_variables
 
@@ -23,8 +21,6 @@ from horizon import messages
 
 from tacker_horizon.openstack_dashboard import api
 
-LOG = logging.getLogger(__name__)
-
 
 class RegisterVim(forms.SelfHandlingForm):
     vim_name = forms.CharField(max_length=255, label=_("Name"))

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/forms.py

@@ -10,9 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
-
 from django.utils.translation import ugettext_lazy as _
+from oslo_log import log as logging
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/views.py

@@ -11,11 +11,11 @@
 # under the License.
 
 import json
-import logging
 
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
+from oslo_log import log as logging
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/forms.py

@@ -12,11 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import logging
 import yaml
 
 from django.forms import ValidationError
 from django.utils.translation import ugettext_lazy as _
+from oslo_log import log as logging
 
 from horizon import exceptions
 from horizon import forms

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/tabs.py

@@ -12,8 +12,6 @@
 # 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 tabs
@@ -22,8 +20,6 @@ from tacker_horizon.openstack_dashboard import api
 from tacker_horizon.openstack_dashboard.dashboards.nfv import utils
 from tacker_horizon.openstack_dashboard.dashboards.nfv.vnfmanager import tables
 
-LOG = logging.getLogger(__name__)
-
 
 class VNFManagerTab(tabs.TableTab):
     name = _("VNFManager Tab")

tacker_horizon/openstack_dashboard/dashboards/nfv/vnfmanager/views.py

@@ -13,11 +13,11 @@
 # under the License.
 
 import json
-import logging
 
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
+from oslo_log import log as logging
 
 from horizon import exceptions
 from horizon import forms