Moved l2/agent_extensions_manager into l2/extensions/manager.py
This is to keep manager more close to extensions. Also made some minor renames in ovs agent attributes that seemed more beautiful. Change-Id: Id5a356a595a052d0cf1f57d376ad8289e710a9b3 Partial-Implements: blueprint quantum-qos-api
This commit is contained in:
parent
4dd9841186
commit
d5ee971d71
|
@ -204,7 +204,7 @@ with them.
|
|||
* neutron.agent.l2.agent_extension:
|
||||
This module defines an abstract extension interface.
|
||||
|
||||
* neutron.agent.l2.agent_extensions_manager:
|
||||
* neutron.agent.l2.extensions.manager:
|
||||
This module contains a manager that allows to register multiple extensions,
|
||||
and passes handle_port events down to all enabled extensions.
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ from six import moves
|
|||
from neutron.agent.common import ovs_lib
|
||||
from neutron.agent.common import polling
|
||||
from neutron.agent.common import utils
|
||||
from neutron.agent.l2 import agent_extensions_manager
|
||||
from neutron.agent.l2.extensions import manager as ext_manager
|
||||
from neutron.agent.linux import ip_lib
|
||||
from neutron.agent import rpc as agent_rpc
|
||||
from neutron.agent import securitygroups_rpc as sg_rpc
|
||||
|
@ -226,7 +226,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
|
|||
# keeps association between ports and ofports to detect ofport change
|
||||
self.vifname_to_ofport_map = {}
|
||||
self.setup_rpc()
|
||||
self.init_agent_extensions_mgr()
|
||||
self.init_extension_manager()
|
||||
self.bridge_mappings = bridge_mappings
|
||||
self.setup_physical_bridges(self.bridge_mappings)
|
||||
self.local_vlan_map = {}
|
||||
|
@ -367,11 +367,11 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
|
|||
consumers,
|
||||
start_listening=False)
|
||||
|
||||
def init_agent_extensions_mgr(self):
|
||||
agent_extensions_manager.register_opts(self.conf)
|
||||
self.agent_extensions_mgr = (
|
||||
agent_extensions_manager.AgentExtensionsManager(self.conf))
|
||||
self.agent_extensions_mgr.initialize()
|
||||
def init_extension_manager(self):
|
||||
ext_manager.register_opts(self.conf)
|
||||
self.ext_manager = (
|
||||
ext_manager.AgentExtensionsManager(self.conf))
|
||||
self.ext_manager.initialize()
|
||||
|
||||
def get_net_uuid(self, vif_id):
|
||||
for network_id, vlan_mapping in six.iteritems(self.local_vlan_map):
|
||||
|
@ -1269,7 +1269,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
|
|||
port, details)
|
||||
if need_binding:
|
||||
need_binding_devices.append(details)
|
||||
self.agent_extensions_mgr.handle_port(self.context, details)
|
||||
self.ext_manager.handle_port(self.context, details)
|
||||
else:
|
||||
LOG.warn(_LW("Device %s not defined on plugin"), device)
|
||||
if (port and port.ofport != -1):
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
import mock
|
||||
from oslo_config import cfg
|
||||
|
||||
from neutron.agent.l2 import agent_extensions_manager
|
||||
from neutron.agent.l2.extensions import manager as ext_manager
|
||||
from neutron.tests import base
|
||||
|
||||
|
||||
|
@ -24,9 +24,9 @@ class TestAgentExtensionsManager(base.BaseTestCase):
|
|||
mock.patch('neutron.agent.l2.extensions.qos.QosAgentExtension',
|
||||
autospec=True).start()
|
||||
conf = cfg.CONF
|
||||
agent_extensions_manager.register_opts(conf)
|
||||
ext_manager.register_opts(conf)
|
||||
cfg.CONF.set_override('extensions', ['qos'], 'agent')
|
||||
self.manager = agent_extensions_manager.AgentExtensionsManager(conf)
|
||||
self.manager = ext_manager.AgentExtensionsManager(conf)
|
||||
|
||||
def _get_extension(self):
|
||||
return self.manager.extensions[0].obj
|
|
@ -415,7 +415,7 @@ class TestOvsNeutronAgent(object):
|
|||
'get_devices_details_list_and_failed_devices',
|
||||
return_value={'devices': [details],
|
||||
'failed_devices': None}),\
|
||||
mock.patch.object(self.agent.agent_extensions_mgr,
|
||||
mock.patch.object(self.agent.ext_manager,
|
||||
'handle_port', new=fake_handle_port),\
|
||||
mock.patch.object(self.agent.int_br,
|
||||
'get_vifs_by_ids',
|
||||
|
|
Loading…
Reference in New Issue