openstack/tap-as-a-service
Code Issues Proposed changes

Merge "Do not try to call status setting methods in case of periodic task"

Browse Source
This commit is contained in:
Zuul 2022-03-23 13:54:20 +00:00 committed by Gerrit Code Review
commit fcaebb77dc
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
neutron_taas/services/taas/agents/common/taas_agent.py
View File

@ -118,7 +118,10 @@ class TaasAgentRpcCallback(api.TaasAgentRpcCallbackMixin):
'msg_name': 'tap_flow', 'msg_name': 'tap_flow',
'set_status_func_name': 'set_tap_flow_status', 'set_status_func_name': 'set_tap_flow_status',
'fail_status': constants.PENDING_DELETE, 'fail_status': constants.PENDING_DELETE,
'succ_status': constants.INACTIVE} 'succ_status': constants.INACTIVE},
'periodic_tasks': {
'msg_name': 'periodic_tasks',
}
} }
self.portbind_drivers_map = {portbindings.VNIC_DIRECT: 'sriov', self.portbind_drivers_map = {portbindings.VNIC_DIRECT: 'sriov',
portbindings.VNIC_NORMAL: 'ovs'} portbindings.VNIC_NORMAL: 'ovs'}
@ -132,7 +135,9 @@ class TaasAgentRpcCallback(api.TaasAgentRpcCallbackMixin):
LOG.debug("Invoking Driver for %(func_name)s from agent", LOG.debug("Invoking Driver for %(func_name)s from agent",
{'func_name': func_name}) {'func_name': func_name})
status_msg = {'id': args[self.func_dict[func_name]['msg_name']]['id']} if func_name != 'periodic_tasks':
func_dict = self.func_dict[func_name]
status_msg = {'id': args[func_dict['msg_name']]['id']}
try: try:
self.taas_driver.__getattribute__(func_name)(args) self.taas_driver.__getattribute__(func_name)(args)
@ -146,11 +151,12 @@ class TaasAgentRpcCallback(api.TaasAgentRpcCallbackMixin):
self.conf.host) self.conf.host)
return return
self.taas_plugin_rpc.__getattribute__( if func_name != 'periodic_tasks':
self.func_dict[func_name]['set_status_func_name'])( self.taas_plugin_rpc.__getattribute__(
status_msg, self.func_dict[func_name]['set_status_func_name'])(
self.func_dict[func_name]['succ_status'], status_msg,
self.conf.host) self.func_dict[func_name]['succ_status'],
self.conf.host)
def create_tap_service(self, context, tap_service, host): def create_tap_service(self, context, tap_service, host):
"""Handle Rpc from plugin to create a tap_service.""" """Handle Rpc from plugin to create a tap_service."""