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

diff --cc neutron/plugins/bigswitch/plugin.py
index ef9cc03cd7674001715615619c1d118108a3ba60,44ea5e4fad5fb50809856ca0b593b5a188eb1679..3cc6e00d1040dd42a6da3516853f1d3ff065491b
--- 1/neutron/plugins/bigswitch/plugin.py
--- 2/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.
  

diff --cc neutron/plugins/bigswitch/servermanager.py
Simple merge

diff --cc neutron/tests/unit/bigswitch/test_servermanager.py
Simple merge