From: Soheil Hassas Yeganeh <soheil@cs.toronto.edu>
Date: Fri, 6 Jul 2012 22:27:29 +0000 (-0400)
Subject: Corrects imported modules in Cisco and Ryu according to latest nova packages.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=bb2b244fe371b7df995cb38189a12963579304eb;p=openstack-build%2Fneutron-build.git

Corrects imported modules in Cisco and Ryu according to latest nova packages.

Change-Id: I58b6d4356b071624c725b4dd0d98a60592ef0b45
---

diff --git a/quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py b/quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py
index 8d4bd42c2..61ab9b4a9 100644
--- a/quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py
+++ b/quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py
@@ -24,8 +24,8 @@ Quantum Port Aware Scheduler Implementation
 
 from nova import exception as excp
 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.scheduler import chance
 from quantumclient import Client
 
diff --git a/quantum/plugins/cisco/nova/vifdirect.py b/quantum/plugins/cisco/nova/vifdirect.py
index f3dec246a..88e72a2c4 100644
--- a/quantum/plugins/cisco/nova/vifdirect.py
+++ b/quantum/plugins/cisco/nova/vifdirect.py
@@ -21,8 +21,8 @@
 
 from nova import exception as excp
 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.virt.vif import VIFDriver
 from quantumclient import Client
 
diff --git a/quantum/plugins/ryu/nova/linux_net.py b/quantum/plugins/ryu/nova/linux_net.py
index bb32abae2..c2ea4d372 100644
--- a/quantum/plugins/ryu/nova/linux_net.py
+++ b/quantum/plugins/ryu/nova/linux_net.py
@@ -18,9 +18,9 @@
 from ryu.app.client import OFPClient
 
 from nova import flags
-from nova import log as logging
 from nova.network import linux_net
 from nova.openstack.common import cfg
+from nova.openstack.common import log as logging
 from nova import utils
 
 
diff --git a/quantum/plugins/ryu/nova/vif.py b/quantum/plugins/ryu/nova/vif.py
index d2a61ead1..5ccdc6e89 100644
--- a/quantum/plugins/ryu/nova/vif.py
+++ b/quantum/plugins/ryu/nova/vif.py
@@ -20,8 +20,8 @@ import httplib
 from ryu.app.client import OFPClient
 
 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 import utils
 from nova.virt.libvirt import vif as libvirt_vif