From c5b7817fd02a2408f2a5022f428ce8e942174c11 Mon Sep 17 00:00:00 2001 From: Bence Romsics Date: Tue, 10 Dec 2019 15:25:15 +0100 Subject: [PATCH] Follow up to change of exception raised The patch in the Depends-On line changed the class of an exception raised in neutron-lib. This change adapts neutron code where we expected the exception changed. Change-Id: I34f7d2aab0af0b985d9165465fe9e7c656041745 Depends-On: https://review.opendev.org/695205 --- neutron/services/segments/plugin.py | 2 +- neutron/tests/unit/extensions/test_segment.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/neutron/services/segments/plugin.py b/neutron/services/segments/plugin.py index 11481723385..44a8d29a37e 100644 --- a/neutron/services/segments/plugin.py +++ b/neutron/services/segments/plugin.py @@ -224,7 +224,7 @@ class NovaSegmentNotifier(object): self.p_client.update_resource_provider_inventory( event.segment_id, ipv4_inventory, IPV4_RESOURCE_CLASS) return - except placement_exc.PlacementInventoryUpdateConflict: + except placement_exc.PlacementResourceProviderGenerationConflict: LOG.debug('Re-trying to update Nova IPv4 inventory for ' 'routed network segment: %s', event.segment_id) LOG.error('Failed to update Nova IPv4 inventory for routed ' diff --git a/neutron/tests/unit/extensions/test_segment.py b/neutron/tests/unit/extensions/test_segment.py index db16dd4818f..7a0b7471cde 100644 --- a/neutron/tests/unit/extensions/test_segment.py +++ b/neutron/tests/unit/extensions/test_segment.py @@ -2258,9 +2258,9 @@ class TestNovaSegmentNotifier(SegmentAwareIpamTestCase): self.mock_p_client.get_inventory.return_value = inventory self.mock_p_client.update_resource_provider_inventory.\ side_effect = ( - placement_exc.PlacementInventoryUpdateConflict( - resource_provider=mock.ANY, - resource_class=seg_plugin.IPV4_RESOURCE_CLASS)) + placement_exc. + PlacementResourceProviderGenerationConflict( + resource_provider=mock.ANY, generation=1)) self.segments_plugin.nova_updater._update_nova_inventory(event) self.assertEqual(seg_plugin.MAX_INVENTORY_UPDATE_RETRIES, self.mock_p_client.get_inventory.call_count)