From 7b9ed4edeef7d599c164c8682fbbb36066d98abb Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Sun, 1 Jun 2014 22:43:02 -0700 Subject: [PATCH] BSN: Set hash header to empty instead of False Sets the consistency hash header to empty instead of False since 'False' is handled like a string on the backend and requires special-casing to detect. Closes-Bug: #1325771 Change-Id: Iee1651574c01a32e78167a9bbed4e0433abbdec2 --- neutron/plugins/bigswitch/servermanager.py | 2 +- neutron/tests/unit/bigswitch/test_servermanager.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py index 2ab629797..29b271cc4 100644 --- a/neutron/plugins/bigswitch/servermanager.py +++ b/neutron/plugins/bigswitch/servermanager.py @@ -131,7 +131,7 @@ class ServerProxy(object): headers['NeutronProxy-Agent'] = self.name headers['Instance-ID'] = self.neutron_id headers['Orchestration-Service-ID'] = ORCHESTRATION_SERVICE_ID - headers[HASH_MATCH_HEADER] = self.mypool.consistency_hash + headers[HASH_MATCH_HEADER] = self.mypool.consistency_hash or '' if 'keep-alive' in self.capabilities: headers['Connection'] = 'keep-alive' else: diff --git a/neutron/tests/unit/bigswitch/test_servermanager.py b/neutron/tests/unit/bigswitch/test_servermanager.py index 914a88744..5f086aaea 100644 --- a/neutron/tests/unit/bigswitch/test_servermanager.py +++ b/neutron/tests/unit/bigswitch/test_servermanager.py @@ -102,8 +102,8 @@ class ServerManagerTests(test_rp.BigSwitchProxyPluginV2TestCase): with self.network(): callheaders = rv.request.mock_calls[0][1][3] self.assertIn('X-BSN-BVS-HASH-MATCH', callheaders) - # first call will be False to indicate no previous state hash - self.assertEqual(callheaders['X-BSN-BVS-HASH-MATCH'], False) + # first call will be empty to indicate no previous state hash + self.assertEqual(callheaders['X-BSN-BVS-HASH-MATCH'], '') # change the header that will be received on delete call rv.getresponse.return_value.getheader.return_value = 'HASH2' -- 2.45.2