Merge "Consume FWaaS plugin queue in RPC workers" into stable/liberty

This commit is contained in:
Jenkins 2016-05-03 02:20:36 +00:00 committed by Gerrit Code Review
commit 5d56fe212b
1 changed files with 9 additions and 6 deletions

View File

@ -145,12 +145,7 @@ class FirewallPlugin(
def __init__(self):
"""Do the initialization for the firewall service plugin here."""
self.endpoints = [FirewallCallbacks(self)]
self.conn = n_rpc.create_connection(new=True)
self.conn.create_consumer(
topics.FIREWALL_PLUGIN, self.endpoints, fanout=False)
self.conn.consume_in_threads()
self.start_rpc_listeners()
self.agent_rpc = FirewallAgentApi(
topics.L3_AGENT,
@ -158,6 +153,14 @@ class FirewallPlugin(
)
firewall_db.subscribe()
def start_rpc_listeners(self):
self.endpoints = [FirewallCallbacks(self)]
self.conn = n_rpc.create_connection(new=True)
self.conn.create_consumer(
topics.FIREWALL_PLUGIN, self.endpoints, fanout=False)
return self.conn.consume_in_threads()
def _rpc_update_firewall(self, context, firewall_id):
status_update = {"firewall": {"status": const.PENDING_UPDATE}}
super(FirewallPlugin, self).update_firewall(context, firewall_id,