From: Kevin Benton <blak111@gmail.com>
Date: Tue, 7 Oct 2014 11:34:41 +0000 (-0700)
Subject: Big Switch: Don't clear hash before sync
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=24e4110eb284078775496501ff81630eb1619c11;p=openstack-build%2Fneutron-build.git

Big Switch: Don't clear hash before sync

This patch removes the step of clearing the consistency
hash from the DB before a topology sync. This will ensure
that inconsistency will be detected if the topology sync
fails.

This logic was originally there to make sure the hash header
was not present on the topology sync call to the backend.
However, the hash header is ignored by the backend in a sync
call so it wasn't necessary.

Closes-Bug: #1379510
Change-Id: I2d58fa2aea3b692834d64192d06ace727c7df8a0
---

diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py
index 6fdbec36a..0a86ff437 100644
--- a/neutron/plugins/bigswitch/servermanager.py
+++ b/neutron/plugins/bigswitch/servermanager.py
@@ -447,8 +447,6 @@ 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)