From 666b2fb70c7c682155e0a351fb427e7fa33015d0 Mon Sep 17 00:00:00 2001 From: Kien Nguyen Date: Tue, 14 Nov 2017 11:51:31 +0700 Subject: [PATCH] Use specific Exception Change generic KuryrException to the specfic one - ConflictConfigOption Depends-On: I448cf979fb87de7fe57325cca579b47b43c37f36 Change-Id: I90a961d5b9dc825a4ea933a69ded1c8b57ade7e9 --- kuryr_libnetwork/controllers.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/kuryr_libnetwork/controllers.py b/kuryr_libnetwork/controllers.py index e776c31b..1374ba28 100644 --- a/kuryr_libnetwork/controllers.py +++ b/kuryr_libnetwork/controllers.py @@ -889,11 +889,7 @@ def network_driver_create_network(): {'neutron_network_name': neutron_network_name, 'network': network}) if network_shared != shared: - # NOTE(kiennt): Use generic KuryrException to unblock - # patch 516228 for merging. Will change - # it to ConflictOption exception in the - # follow-up. - raise exceptions.KuryrException( + raise exceptions.ConflictConfigOption( 'Network %(network_id)s had option ' 'shared=%(network_shared)s, conflict with the given option ' 'shared=%(shared)s', { @@ -1544,11 +1540,7 @@ def ipam_request_pool(): pool_cidr = ipaddress.ip_network(six.text_type(prefixes[0])) if pool_cidr == cidr: if shared != existing_pools[0]['shared']: - # NOTE(kiennt): Use generic KuryrException to unblock - # patch 516228 for merging. Will change - # it to ConflictOption exception in the - # follow-up. - raise exceptions.KuryrException( + raise exceptions.ConflictConfigOption( 'There is already existing subnet pool ' 'with %(cidr)s but with shared = %(shared)s', {'cidr': cidr,