Merge "Fix duplicate object error messages" into stable/ussuri
This commit is contained in:
commit
5838600e6f
|
@ -297,16 +297,10 @@ class ListenersController(base.BaseController):
|
||||||
lock_session, id=db_listener.id)
|
lock_session, id=db_listener.id)
|
||||||
|
|
||||||
return db_listener
|
return db_listener
|
||||||
except odb_exceptions.DBDuplicateEntry as de:
|
except odb_exceptions.DBDuplicateEntry as e:
|
||||||
column_list = ['load_balancer_id', 'protocol', 'protocol_port']
|
raise exceptions.DuplicateListenerEntry(
|
||||||
constraint_list = ['uq_listener_load_balancer_id_protocol_port']
|
protocol=listener_dict.get('protocol'),
|
||||||
if ['id'] == de.columns:
|
port=listener_dict.get('protocol_port')) from e
|
||||||
raise exceptions.IDAlreadyExists()
|
|
||||||
if (set(column_list) == set(de.columns) or
|
|
||||||
set(constraint_list) == set(de.columns)):
|
|
||||||
raise exceptions.DuplicateListenerEntry(
|
|
||||||
protocol=listener_dict.get('protocol'),
|
|
||||||
port=listener_dict.get('protocol_port'))
|
|
||||||
except odb_exceptions.DBError:
|
except odb_exceptions.DBError:
|
||||||
raise exceptions.InvalidOption(value=listener_dict.get('protocol'),
|
raise exceptions.InvalidOption(value=listener_dict.get('protocol'),
|
||||||
option='protocol')
|
option='protocol')
|
||||||
|
|
|
@ -119,16 +119,10 @@ class MemberController(base.BaseController):
|
||||||
"""Validate creating member on pool."""
|
"""Validate creating member on pool."""
|
||||||
try:
|
try:
|
||||||
return self.repositories.member.create(lock_session, **member_dict)
|
return self.repositories.member.create(lock_session, **member_dict)
|
||||||
except odb_exceptions.DBDuplicateEntry as de:
|
except odb_exceptions.DBDuplicateEntry as e:
|
||||||
column_list = ['pool_id', 'ip_address', 'protocol_port']
|
raise exceptions.DuplicateMemberEntry(
|
||||||
constraint_list = ['uq_member_pool_id_address_protocol_port']
|
ip_address=member_dict.get('ip_address'),
|
||||||
if ['id'] == de.columns:
|
port=member_dict.get('protocol_port')) from e
|
||||||
raise exceptions.IDAlreadyExists()
|
|
||||||
if (set(column_list) == set(de.columns) or
|
|
||||||
set(constraint_list) == set(de.columns)):
|
|
||||||
raise exceptions.DuplicateMemberEntry(
|
|
||||||
ip_address=member_dict.get('ip_address'),
|
|
||||||
port=member_dict.get('protocol_port'))
|
|
||||||
except odb_exceptions.DBError:
|
except odb_exceptions.DBError:
|
||||||
# TODO(blogan): will have to do separate validation protocol
|
# TODO(blogan): will have to do separate validation protocol
|
||||||
# before creation or update since the exception messages
|
# before creation or update since the exception messages
|
||||||
|
|
Loading…
Reference in New Issue