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 8d4bd42c2d15eae13cfb450958a042f8b68f74e1..61ab9b4a983fe7e0247ba51932538e75ad6682a8 100644 (file)
--- 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 f3dec246a428f31af541b9e48bfe35bbf62786b1..88e72a2c420b66d3d60361343377c6352c59e5b6 100644 (file)
--- 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 bb32abae2922ab7ce3ab2dd2f9de8d6a5c0b3cd8..c2ea4d3726e67795bccaa03f8eeb740cdcaddf77 100644 (file)
--- 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 d2a61ead1132923eb340505dc1d81c7b7cfc3103..5ccdc6e89eef8a57ceb20c753a77538df9b0096e 100644 (file)
--- 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