diff --git a/networking_powervm/plugins/ibm/agent/powervm/agent_base.py b/networking_powervm/plugins/ibm/agent/powervm/agent_base.py index 02d1e58..c6bc123 100644 --- a/networking_powervm/plugins/ibm/agent/powervm/agent_base.py +++ b/networking_powervm/plugins/ibm/agent/powervm/agent_base.py @@ -22,9 +22,9 @@ from oslo_config import cfg from oslo_log import log as logging from oslo_service import loopingcall -from neutron.agent.common import config as a_config from neutron.agent import rpc as agent_rpc from neutron.common import topics +from neutron.conf.agent import common as a_config from neutron_lib import constants as q_const from neutron_lib import context as ctx from pypowervm import adapter as pvm_adpt diff --git a/networking_powervm/plugins/ibm/agent/powervm/prov_req.py b/networking_powervm/plugins/ibm/agent/powervm/prov_req.py index d028f62..e499f62 100644 --- a/networking_powervm/plugins/ibm/agent/powervm/prov_req.py +++ b/networking_powervm/plugins/ibm/agent/powervm/prov_req.py @@ -17,7 +17,7 @@ import six import time -from neutron.agent.common import config as a_config +from neutron.conf.agent import common as a_config from oslo_config import cfg from oslo_log import log as logging from oslo_serialization import jsonutils diff --git a/networking_powervm/plugins/ibm/agent/powervm/sea_agent.py b/networking_powervm/plugins/ibm/agent/powervm/sea_agent.py index 659ab82..244de91 100644 --- a/networking_powervm/plugins/ibm/agent/powervm/sea_agent.py +++ b/networking_powervm/plugins/ibm/agent/powervm/sea_agent.py @@ -22,8 +22,8 @@ eventlet.monkey_patch() from oslo_config import cfg from oslo_log import log as logging -from neutron.agent.common import config as a_config from neutron.common import config as n_config +from neutron.conf.agent import common as a_config from pypowervm.tasks import network_bridger as net_br from pypowervm.wrappers import logical_partition as pvm_lpar from pypowervm.wrappers import network as pvm_net diff --git a/networking_powervm/plugins/ibm/agent/powervm/sriov_agent.py b/networking_powervm/plugins/ibm/agent/powervm/sriov_agent.py index c8aa1e0..9abfccb 100644 --- a/networking_powervm/plugins/ibm/agent/powervm/sriov_agent.py +++ b/networking_powervm/plugins/ibm/agent/powervm/sriov_agent.py @@ -17,8 +17,8 @@ import eventlet import sys -from neutron.agent.common import config as a_config from neutron.common import config as n_config +from neutron.conf.agent import common as a_config from oslo_config import cfg from oslo_log import log as logging