Merge "Tecs have been successfully installed. then modify cluster, prompt error."

This commit is contained in:
Jenkins 2017-03-07 05:54:48 +00:00 committed by Gerrit Code Review
commit a517d0945e
1 changed files with 4 additions and 3 deletions

View File

@ -590,9 +590,10 @@ class Controller(controller.BaseController):
orig_network_meta['network_type'])
if dataplane_type == 'DATAPLANE':
orig_segment_type = orig_network_meta.get('segmentation_type')
self._is_dataplane_in_use(req.context,
network_meta, network_id,
orig_segment_type)
if network_meta.get('segmentation_type'):
self._is_dataplane_in_use(req.context,
network_meta, network_id,
orig_segment_type)
if network_meta.get('ip_ranges', None) and \
eval(network_meta['ip_ranges']):