openstack/neutron
Code Issues Proposed changes

Merge "Fixes "OVS Agent doesn't start on Windows""

Browse Source
This commit is contained in:
Jenkins 2016-03-15 08:21:28 +00:00 committed by Gerrit Code Review
commit c6ab89aee3
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/agent/common/polling.py
View File

@ -22,3 +22,4 @@ else:
from neutron.agent.linux import polling
get_polling_manager = polling.get_polling_manager
InterfacePollingMinimizer = polling.InterfacePollingMinimizer

6
neutron/agent/windows/polling.py
View File

@ -22,3 +22,9 @@ from neutron.agent.common import base_polling
def get_polling_manager(minimize_polling, ovsdb_monitor_respawn_interval):
pm = base_polling.AlwaysPoll()
yield pm
# TODO(atuvenie): make this manager inherit from
# that fully fledged polling manager interface
class InterfacePollingMinimizer(object):
pass

3
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -34,7 +34,6 @@ from neutron.agent.common import polling
from neutron.agent.common import utils
from neutron.agent.l2.extensions import manager as ext_manager
from neutron.agent.linux import ip_lib
from neutron.agent.linux import polling as linux_polling
from neutron.agent import rpc as agent_rpc
from neutron.agent import securitygroups_rpc as sg_rpc
from neutron.api.rpc.callbacks import resources
@ -1913,7 +1912,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
# BasePollingManager that will be implemented by AlwaysPoll as
# no action and by InterfacePollingMinimizer as start/stop
if isinstance(
polling_manager, linux_polling.InterfacePollingMinimizer):
polling_manager, polling.InterfacePollingMinimizer):
polling_manager.stop()
polling_manager.start()
elif ovs_status == constants.OVS_DEAD: