From: Jenkins <jenkins@review.openstack.org>
Date: Sun, 29 Jun 2014 03:26:26 +0000 (+0000)
Subject: Merge "Big Switch: Lock consistency table for REST calls"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fe57b966ac4b2bf8e19b66ac75e25981361d5e0c;p=openstack-build%2Fneutron-build.git

Merge "Big Switch: Lock consistency table for REST calls"
---

fe57b966ac4b2bf8e19b66ac75e25981361d5e0c
diff --cc neutron/plugins/bigswitch/plugin.py
index ef9cc03cd,44ea5e4fa..3cc6e00d1
--- a/neutron/plugins/bigswitch/plugin.py
+++ b/neutron/plugins/bigswitch/plugin.py
@@@ -501,13 -516,14 +510,14 @@@ class NeutronRestProxyV2(NeutronRestPro
          self.agent_notifiers[const.AGENT_TYPE_DHCP] = (
              self._dhcp_agent_notifier
          )
 -        self.callbacks = RestProxyCallbacks()
 -        self.dispatcher = self.callbacks.create_rpc_dispatcher()
 -        self.conn.create_consumer(self.topic, self.dispatcher,
 +        self.endpoints = [RestProxyCallbacks(),
 +                          agents_db.AgentExtRpcCallback()]
 +        self.conn.create_consumer(self.topic, self.endpoints,
                                    fanout=False)
 -        # Consume from all consumers in a thread
 -        self.conn.consume_in_thread()
 +        # Consume from all consumers in threads
 +        self.conn.consume_in_threads()
  
+     @put_context_in_serverpool
      def create_network(self, context, network):
          """Create a network.