Use olso.log directly

As the openstack/common is deprecated, Watcher should use oslo lib
directly to run in the openstack env. So there is much work to do
with oslo. This patch fixed the log part.

Change-Id: I3145a842fe3a22b3d08fec60d180329073edd50f

watcher/applier/framework/command/wrapper/nova_wrapper.py

@@ -20,6 +20,8 @@
 import random
 import time
 
+from oslo_log import log
+
 import cinderclient.exceptions as ciexceptions
 import cinderclient.v2.client as ciclient
 import glanceclient.v2.client as glclient
@@ -27,7 +29,6 @@ import keystoneclient.v3.client as ksclient
 import neutronclient.neutron.client as netclient
 import novaclient.exceptions as nvexceptions
 import novaclient.v2.client as nvclient
-from watcher.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

watcher/applier/framework/command_executor.py

@@ -16,6 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from oslo_log import log
+
 from watcher.applier.framework.default_command_mapper import \
     DefaultCommandMapper
 
@@ -24,7 +26,6 @@ from watcher.applier.framework.messaging.events import Events
 from watcher.common.messaging.events.event import Event
 from watcher.objects import Action
 from watcher.objects.action_plan import Status
-from watcher.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

watcher/applier/framework/deploy_phase.py

@@ -16,7 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-from watcher.openstack.common import log
+from oslo_log import log
+
 LOG = log.getLogger(__name__)
 
 

watcher/applier/framework/manager_applier.py

@@ -19,13 +19,13 @@
 from concurrent.futures import ThreadPoolExecutor
 
 from oslo_config import cfg
+from oslo_log import log
 
 from watcher.applier.framework.messaging.trigger_action_plan import \
     TriggerActionPlan
 from watcher.common.messaging.messaging_core import MessagingCore
 from watcher.common.messaging.notification_handler import NotificationHandler
 from watcher.decision_engine.framework.messaging.events import Events
-from watcher.openstack.common import log
 
 CONF = cfg.CONF
 

watcher/applier/framework/messaging/launch_action_plan.py

@@ -16,6 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from oslo_log import log
+
 from watcher.applier.api.messaging.applier_command import ApplierCommand
 from watcher.applier.framework.default_applier import DefaultApplier
 from watcher.applier.framework.messaging.events import Events
@@ -23,8 +25,6 @@ from watcher.common.messaging.events.event import Event
 from watcher.objects.action_plan import ActionPlan
 from watcher.objects.action_plan import Status
 
-from watcher.openstack.common import log
-
 LOG = log.getLogger(__name__)
 
 

watcher/applier/framework/messaging/trigger_action_plan.py

@@ -16,10 +16,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+from oslo_log import log
 
 from watcher.applier.framework.messaging.launch_action_plan import \
     LaunchActionPlanCommand
-from watcher.openstack.common import log
 
 LOG = log.getLogger(__name__)
 

watcher/applier/framework/rpcapi.py

@@ -17,6 +17,7 @@
 # limitations under the License.
 #
 from oslo_config import cfg
+from oslo_log import log
 import oslo_messaging as om
 
 
@@ -30,7 +31,6 @@ from watcher.common.messaging.messaging_core import MessagingCore
 from watcher.common.messaging.notification_handler import NotificationHandler
 from watcher.common.messaging.utils.transport_url_builder import \
     TransportUrlBuilder
-from watcher.openstack.common import log
 
 LOG = log.getLogger(__name__)
 CONF = cfg.CONF