openstack
/
neutron
Code Issues Proposed changes

Use segment range exceptions from neutron-lib 

There are a few places in network_segment_range service plugin in
Neutron that are not yet using the exceptions from neutron-lib.
After the merge of [1], this patch addresses these TODOs by switching
all uses of segment range exceptions to use neutron-lib.

[1] https://review.openstack.org/640777

Partially-implements: blueprint network-segment-range-management
Change-Id: I5b254de25c2781422437ab7d94b6f19dfc747efd
This commit is contained in:
Kailun Qin 2019-05-01 16:51:04 +08:00
parent f53df97e6a
commit 7dee6e4ec0
1 changed files with 8 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
neutron/services/network_segment_range/plugin.py
View File

@ -120,14 +120,8 @@ class NetworkSegmentRangePlugin(ext_range.NetworkSegmentRangePluginBase):
def _is_network_segment_range_type_supported(self, network_type):
if not (self.type_manager.network_type_supported(network_type) and
network_type in const.NETWORK_SEGMENT_RANGE_TYPES):
# TODO(kailun): To use
# range_exc.NetworkSegmentRangeNetTypeNotSupported when the
# neutron-lib patch https://review.opendev.org/640777 is merged
# and released.
message = _("Network type %s does not support "
"network segment ranges.") % network_type
raise lib_exc.BadRequest(resource=range_def.RESOURCE_NAME,
msg=message)
raise range_exc.NetworkSegmentRangeNetTypeNotSupported(
type=network_type)
return True
@ -219,28 +213,14 @@ class NetworkSegmentRangePlugin(ext_range.NetworkSegmentRangePluginBase):
existing_range_data = network_segment_range.to_dict()
if existing_range_data['default']:
# TODO(kailun): To use
# range_exc.NetworkSegmentRangeDefaultReadOnly when the
# neutron-lib patch https://review.opendev.org/640777 is
# merged and released.
message = _("Network Segment Range %s is a "
"default segment range which could not be "
"updated or deleted.") % id
raise lib_exc.BadRequest(resource=range_def.RESOURCE_NAME,
msg=message)
raise range_exc.NetworkSegmentRangeDefaultReadOnly(range_id=id)
if self._are_allocated_segments_in_range_impacted(
context,
existing_range=existing_range_data,
updated_range=updated_range_data):
# TODO(kailun): To use
# range_exc.NetworkSegmentRangeReferencedByProject when the
# neutron-lib patch https://review.opendev.org/640777 is
# merged and released.
message = _("Network Segment Range %s is referenced by "
"one or more tenant networks.") % id
raise lib_exc.InUse(resource=range_def.RESOURCE_NAME,
msg=message)
raise range_exc.NetworkSegmentRangeReferencedByProject(
range_id=id)
new_range_data = self._add_unchanged_range_attributes(
updated_range_data, existing_range_data)
@ -261,26 +241,12 @@ class NetworkSegmentRangePlugin(ext_range.NetworkSegmentRangePluginBase):
range_data = network_segment_range.to_dict()
if range_data['default']:
# TODO(kailun): To use
# range_exc.NetworkSegmentRangeDefaultReadOnly when the
# neutron-lib patch https://review.opendev.org/640777 is
# merged and released.
message = _("Network Segment Range %s is a "
"default segment range which could not be "
"updated or deleted.") % id
raise lib_exc.BadRequest(resource=range_def.RESOURCE_NAME,
msg=message)
raise range_exc.NetworkSegmentRangeDefaultReadOnly(range_id=id)
if self._is_network_segment_range_referenced(
context, range_data):
# TODO(kailun): To use
# range_exc.NetworkSegmentRangeReferencedByProject when the
# neutron-lib patch https://review.opendev.org/640777 is
# merged and released.
message = _("Network Segment Range %s is referenced by "
"one or more tenant networks.") % id
raise lib_exc.InUse(resource=range_def.RESOURCE_NAME,
msg=message)
raise range_exc.NetworkSegmentRangeReferencedByProject(
range_id=id)
network_segment_range.delete()
self.type_manager.update_network_segment_range_allocations(