From 1776e3fc926e804250eb42439dde5aa40062f360 Mon Sep 17 00:00:00 2001
From: Andrew Bogott <abogott@wikimedia.org>
Date: Thu, 28 Jun 2012 15:59:23 -0500
Subject: [PATCH] Switch to common logging.

I only just moved logging from nova to common, so behavior should remain the same.

Change-Id: I1d7304ca200f9d024bb7244d25be2f9a670318fb
---
 nova/api/openstack/compute/contrib/aggregates.py            | 2 +-
 nova/db/sqlalchemy/api.py                                   | 2 +-
 nova/db/sqlalchemy/migration.py                             | 2 +-
 nova/test.py                                                | 2 +-
 nova/tests/__init__.py                                      | 4 ++--
 nova/tests/api/openstack/compute/contrib/test_aggregates.py | 2 +-
 nova/utils.py                                               | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nova/api/openstack/compute/contrib/aggregates.py b/nova/api/openstack/compute/contrib/aggregates.py
index aa10fe532..834131f92 100644
--- a/nova/api/openstack/compute/contrib/aggregates.py
+++ b/nova/api/openstack/compute/contrib/aggregates.py
@@ -20,7 +20,7 @@ from webob import exc
 from nova.api.openstack import extensions
 from nova.compute import api as compute_api
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 authorize = extensions.extension_authorizer('compute', 'aggregates')
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 9bf3a0e12..f9f9e2228 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -33,7 +33,7 @@ from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy.session import get_session
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
 from sqlalchemy import and_
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
index e7c659a70..69375d05c 100644
--- a/nova/db/sqlalchemy/migration.py
+++ b/nova/db/sqlalchemy/migration.py
@@ -23,7 +23,7 @@ from nova.db import migration
 from nova.db.sqlalchemy.session import get_engine
 from nova import exception
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 
 import migrate
diff --git a/nova/test.py b/nova/test.py
index da115300e..a8a2464ce 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -32,8 +32,8 @@ import nose.plugins.skip
 import stubout
 
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import service
 from nova import tests
diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index 9ff38e3a9..a8d0ef28c 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -39,7 +39,7 @@ import shutil
 
 from nova.db.sqlalchemy.session import get_engine
 from nova import flags
-from nova import log as logging
+from nova.openstack.common import log as logging
 
 import eventlet
 
@@ -49,7 +49,7 @@ eventlet.monkey_patch(os=False)
 FLAGS = flags.FLAGS
 FLAGS.use_stderr = False
 
-logging.setup()
+logging.setup('nova')
 
 _DB = None
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
index fc19a9545..c2c5a1486 100644
--- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py
+++ b/nova/tests/api/openstack/compute/contrib/test_aggregates.py
@@ -20,7 +20,7 @@ from webob import exc
 from nova.api.openstack.compute.contrib import aggregates
 from nova import context
 from nova import exception
-from nova import log as logging
+from nova.openstack.common import log as logging
 from nova import test
 
 
diff --git a/nova/utils.py b/nova/utils.py
index 9560c1d18..b9af41fca 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -51,10 +51,10 @@ import netaddr
 
 from nova import exception
 from nova import flags
-from nova import log as logging
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
+from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils