Pool name/desc needs to be "" when empty, not null
Switch to catching and filling these at the base types layer. Change-Id: I0ade22b9e9ec0cfa456f0fe263d1cdd726d6a78e
This commit is contained in:
parent
c0a141989a
commit
8fb7c17572
|
@ -84,6 +84,8 @@ class BaseType(wtypes.Base):
|
|||
for child_key, child_value in value.items():
|
||||
if '.'.join([key, child_key]) in dm_to_type_map:
|
||||
new_dict['_'.join([key, child_key])] = child_value
|
||||
elif key in ['name', 'description'] and value is None:
|
||||
new_dict[key] = ''
|
||||
else:
|
||||
if key in dm_to_type_map:
|
||||
new_dict[dm_to_type_map[key]] = value
|
||||
|
|
|
@ -46,10 +46,6 @@ class L7PolicyResponse(BaseL7PolicyType):
|
|||
def from_data_model(cls, data_model, children=False):
|
||||
policy = super(L7PolicyResponse, cls).from_data_model(
|
||||
data_model, children=children)
|
||||
if not policy.name:
|
||||
policy.name = ""
|
||||
if not policy.description:
|
||||
policy.description = ""
|
||||
|
||||
if cls._full_response():
|
||||
rule_model = l7rule.L7RuleFullResponse
|
||||
|
|
|
@ -65,11 +65,6 @@ class ListenerResponse(BaseListenerType):
|
|||
listener.l7policies = [
|
||||
l7policy_type.from_data_model(i) for i in data_model.l7policies]
|
||||
|
||||
if not listener.description:
|
||||
listener.description = ""
|
||||
if not listener.name:
|
||||
listener.name = ""
|
||||
|
||||
return listener
|
||||
|
||||
|
||||
|
|
|
@ -68,10 +68,6 @@ class LoadBalancerResponse(BaseLoadBalancerType):
|
|||
result.pools = [
|
||||
pool_model.from_data_model(i) for i in data_model.pools]
|
||||
|
||||
if not result.description:
|
||||
result.description = ""
|
||||
if not result.name:
|
||||
result.name = ""
|
||||
if not result.flavor:
|
||||
result.flavor = ""
|
||||
if not result.provider:
|
||||
|
|
|
@ -44,9 +44,6 @@ class MemberResponse(BaseMemberType):
|
|||
def from_data_model(cls, data_model, children=False):
|
||||
member = super(MemberResponse, cls).from_data_model(
|
||||
data_model, children=children)
|
||||
if not member.name:
|
||||
member.name = ""
|
||||
|
||||
return member
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue