From: Kevin Benton <blak111@gmail.com>
Date: Mon, 9 Jun 2014 19:20:18 +0000 (-0700)
Subject: Big Switch: Remove consistency hash on full sync
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e60670e5a202870693f7485a1da4411f4faaf36d;p=openstack-build%2Fneutron-build.git

Big Switch: Remove consistency hash on full sync

Clears the consistency hash before performing a full
backend synchronization. Since all of the data is being
replaced, there is no reason to include this and it
currently requires special-casing to handle.

Closes-Bug: #1328233
Change-Id: Iace766d869dc78b041d3a5464e728b872c8347c2
---

diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py
index f02748248..fdce8a489 100644
--- a/neutron/plugins/bigswitch/servermanager.py
+++ b/neutron/plugins/bigswitch/servermanager.py
@@ -421,6 +421,8 @@ class ServerPool(object):
                 if not self.get_topo_function:
                     raise cfg.Error(_('Server requires synchronization, '
                                       'but no topology function was defined.'))
+                # The hash was incorrect so it needs to be removed
+                hash_handler.put_hash('')
                 data = self.get_topo_function(**self.get_topo_function_args)
                 active_server.rest_call('PUT', TOPOLOGY_PATH, data,
                                         timeout=None)