From 3c6b639b685558acc225357546101094a97a0e46 Mon Sep 17 00:00:00 2001 From: Adam Harwell Date: Mon, 14 Oct 2019 12:31:46 -0700 Subject: [PATCH] Batch member update needs pool_id explicitly Pulling it from the members doesn't work if it is a delete operation where there aren't any! Story: 2006719 Task: 37091 Change-Id: Ia67172306c28c17648eb7f0263c5a66b44a96baa --- octavia_lib/api/drivers/provider_base.py | 4 +++- octavia_lib/tests/unit/api/drivers/test_provider_base.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/octavia_lib/api/drivers/provider_base.py b/octavia_lib/api/drivers/provider_base.py index a8b2a57..315eb2c 100644 --- a/octavia_lib/api/drivers/provider_base.py +++ b/octavia_lib/api/drivers/provider_base.py @@ -285,9 +285,11 @@ class ProviderDriver(object): operator_fault_string='This provider does not support updating ' 'members.') - def member_batch_update(self, members): + def member_batch_update(self, pool_id, members): """Creates, updates, or deletes a set of pool members. + :param pool_id: The id of the pool to update. + :type pool_id: string :param members: List of member objects. :type members: list :return: Nothing if the create request was accepted. diff --git a/octavia_lib/tests/unit/api/drivers/test_provider_base.py b/octavia_lib/tests/unit/api/drivers/test_provider_base.py index 164757d..7012dff 100644 --- a/octavia_lib/tests/unit/api/drivers/test_provider_base.py +++ b/octavia_lib/tests/unit/api/drivers/test_provider_base.py @@ -100,7 +100,7 @@ class TestProviderBase(base.TestCase): def test_member_batch_update(self): self.assertRaises(exceptions.NotImplementedError, self.driver.member_batch_update, - False) + False, False) def test_health_monitor_create(self): self.assertRaises(exceptions.NotImplementedError,