From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 6 Nov 2015 17:31:47 +0000 (+0000)
Subject: Merge "Deprecate new= argument from create_connection"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4e4500b314f2e79d2932b4803f4c059be30a5896;p=openstack-build%2Fneutron-build.git

Merge "Deprecate new= argument from create_connection"
---

4e4500b314f2e79d2932b4803f4c059be30a5896
diff --cc neutron/common/rpc.py
index 6d37c28ba,f4b7475f0..beef015ad
--- a/neutron/common/rpc.py
+++ b/neutron/common/rpc.py
@@@ -220,8 -221,9 +221,9 @@@ class VoidConnection(object)
  
  
  # functions
+ @removals.removed_kwarg('new')
  def create_connection(new=True):
 -    # NOTE(salv-orlando): This is a clever interpreation of the factory design
 +    # NOTE(salv-orlando): This is a clever interpretation of the factory design
      # patter aimed at preventing plugins from initializing RPC servers upon
      # initialization when they are running in the REST over HTTP API server.
      # The educated reader will perfectly be able that this a fairly dirty hack
diff --cc neutron/plugins/ml2/plugin.py
index a2ee1de6a,622d012bf..5b3569266
--- a/neutron/plugins/ml2/plugin.py
+++ b/neutron/plugins/ml2/plugin.py
@@@ -188,9 -188,8 +188,9 @@@ class Ml2Plugin(db_base_plugin_v2.Neutr
          """Start the RPC loop to let the plugin communicate with agents."""
          self._setup_rpc()
          self.topic = topics.PLUGIN
-         self.conn = n_rpc.create_connection(new=True)
+         self.conn = n_rpc.create_connection()
          self.conn.create_consumer(self.topic, self.endpoints, fanout=False)
 +        # process state reports despite dedicated rpc workers
          self.conn.create_consumer(topics.REPORTS,
                                    [agents_db.AgentExtRpcCallback()],
                                    fanout=False)