From 52da6ef6333fa9685c1859afdcc3e4e1145a8fe5 Mon Sep 17 00:00:00 2001 From: Sumit Naiksatam Date: Thu, 29 Nov 2012 02:17:59 -0800 Subject: [PATCH] Fixes Context exception in BigSwitch/FloodLight Plugin Bug #1083389 Aligning with the changes in the patch: https://review.openstack.org/#/c/15726 to only use Quantum API context. Change-Id: I5644ad59c34430a9d558c39bbc07f594609ebfbc --- quantum/plugins/bigswitch/plugin.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/quantum/plugins/bigswitch/plugin.py b/quantum/plugins/bigswitch/plugin.py index 50e1ab8e0..86fac69bb 100644 --- a/quantum/plugins/bigswitch/plugin.py +++ b/quantum/plugins/bigswitch/plugin.py @@ -50,6 +50,7 @@ import json import socket from quantum.common import exceptions +from quantum.common import rpc as q_rpc from quantum.common import topics from quantum import context as qcontext from quantum.db import api as db @@ -57,10 +58,8 @@ from quantum.db import db_base_plugin_v2 from quantum.db import dhcp_rpc_base from quantum.db import models_v2 from quantum.openstack.common import cfg -from quantum.openstack.common import context as glbcontext from quantum.openstack.common import log as logging from quantum.openstack.common import rpc -from quantum.openstack.common.rpc import dispatcher from quantum.plugins.bigswitch.version import version_string_with_vcs @@ -238,11 +237,8 @@ class RpcProxy(dhcp_rpc_base.DhcpRpcCallbackMixin): RPC_API_VERSION = '1.0' - def __init__(self, rpc_context): - self.rpc_context = rpc_context - def create_rpc_dispatcher(self): - return dispatcher.RpcDispatcher([self]) + return q_rpc.PluginRpcDispatcher([self]) class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2): @@ -279,10 +275,8 @@ class QuantumRestProxyV2(db_base_plugin_v2.QuantumDbPluginV2): # init dhcp support self.topic = topics.PLUGIN - self.rpc_context = glbcontext.RequestContext( - 'quantum', 'quantum', is_admin=False) self.conn = rpc.create_connection(new=True) - self.callbacks = RpcProxy(self.rpc_context) + self.callbacks = RpcProxy() self.dispatcher = self.callbacks.create_rpc_dispatcher() self.conn.create_consumer(self.topic, self.dispatcher, fanout=False) -- 2.45.2