openstack/octavia
Code Issues Proposed changes

project_id should not be UUIDType in API validation

Browse Source 
Currently UUIDType is being validted for project_id.
In most cases this will cause issues. Update to more
appropriate StringType

Change-Id: I54fa78e7140f57084fffb68528d4a4252b9a5d28
Closes-Bug: #1547717
This commit is contained in:
ptoohill1 2016-02-19 17:48:30 -06:00
parent c1b1f6ed85
commit c1aeec17c7
5 changed files with 10 additions and 10 deletions

4
octavia/api/v1/types/health_monitor.py

@ -29,7 +29,7 @@ class HealthMonitorResponse(base.BaseType):
url_path = wtypes.wsattr(wtypes.text) url_path = wtypes.wsattr(wtypes.text)
expected_codes = wtypes.wsattr(wtypes.text) expected_codes = wtypes.wsattr(wtypes.text)
enabled = wtypes.wsattr(bool) enabled = wtypes.wsattr(bool)
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType())
class HealthMonitorPOST(base.BaseType): class HealthMonitorPOST(base.BaseType):
@ -45,7 +45,7 @@ class HealthMonitorPOST(base.BaseType):
url_path = wtypes.wsattr(wtypes.text) url_path = wtypes.wsattr(wtypes.text)
expected_codes = wtypes.wsattr(wtypes.text) expected_codes = wtypes.wsattr(wtypes.text)
enabled = wtypes.wsattr(bool, default=True) enabled = wtypes.wsattr(bool, default=True)
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType(max_length=36))
class HealthMonitorPUT(base.BaseType): class HealthMonitorPUT(base.BaseType):

4
octavia/api/v1/types/listener.py

@ -38,7 +38,7 @@ class ListenerResponse(base.BaseType):
connection_limit = wtypes.wsattr(wtypes.IntegerType()) connection_limit = wtypes.wsattr(wtypes.IntegerType())
tls_certificate_id = wtypes.wsattr(wtypes.StringType(max_length=255)) tls_certificate_id = wtypes.wsattr(wtypes.StringType(max_length=255))
sni_containers = [wtypes.StringType(max_length=255)] sni_containers = [wtypes.StringType(max_length=255)]
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType())
default_pool_id = wtypes.wsattr(wtypes.UuidType()) default_pool_id = wtypes.wsattr(wtypes.UuidType())
@ -55,7 +55,7 @@ class ListenerPOST(base.BaseType):
tls_certificate_id = wtypes.wsattr(wtypes.StringType(max_length=255)) tls_certificate_id = wtypes.wsattr(wtypes.StringType(max_length=255))
tls_termination = wtypes.wsattr(TLSTermination) tls_termination = wtypes.wsattr(TLSTermination)
sni_containers = [wtypes.StringType(max_length=255)] sni_containers = [wtypes.StringType(max_length=255)]
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType(max_length=36))
default_pool_id = wtypes.wsattr(wtypes.UuidType()) default_pool_id = wtypes.wsattr(wtypes.UuidType())

4
octavia/api/v1/types/load_balancer.py

@ -33,7 +33,7 @@ class LoadBalancerResponse(base.BaseType):
operating_status = wtypes.wsattr(wtypes.StringType()) operating_status = wtypes.wsattr(wtypes.StringType())
enabled = wtypes.wsattr(bool) enabled = wtypes.wsattr(bool)
vip = wtypes.wsattr(VIP) vip = wtypes.wsattr(VIP)
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType())
class LoadBalancerPOST(base.BaseType): class LoadBalancerPOST(base.BaseType):
@ -43,7 +43,7 @@ class LoadBalancerPOST(base.BaseType):
description = wtypes.wsattr(wtypes.StringType(max_length=255)) description = wtypes.wsattr(wtypes.StringType(max_length=255))
enabled = wtypes.wsattr(bool, default=True) enabled = wtypes.wsattr(bool, default=True)
vip = wtypes.wsattr(VIP, mandatory=True) vip = wtypes.wsattr(VIP, mandatory=True)
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType(max_length=36))
class LoadBalancerPUT(base.BaseType): class LoadBalancerPUT(base.BaseType):

4
octavia/api/v1/types/member.py

@ -26,7 +26,7 @@ class MemberResponse(base.BaseType):
protocol_port = wtypes.wsattr(wtypes.IntegerType()) protocol_port = wtypes.wsattr(wtypes.IntegerType())
weight = wtypes.wsattr(wtypes.IntegerType()) weight = wtypes.wsattr(wtypes.IntegerType())
subnet_id = wtypes.wsattr(wtypes.UuidType()) subnet_id = wtypes.wsattr(wtypes.UuidType())
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType())
class MemberPOST(base.BaseType): class MemberPOST(base.BaseType):
@ -37,7 +37,7 @@ class MemberPOST(base.BaseType):
protocol_port = wtypes.wsattr(wtypes.IntegerType(), mandatory=True) protocol_port = wtypes.wsattr(wtypes.IntegerType(), mandatory=True)
weight = wtypes.wsattr(wtypes.IntegerType(), default=1) weight = wtypes.wsattr(wtypes.IntegerType(), default=1)
subnet_id = wtypes.wsattr(wtypes.UuidType()) subnet_id = wtypes.wsattr(wtypes.UuidType())
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType(max_length=36))
class MemberPUT(base.BaseType): class MemberPUT(base.BaseType):

4
octavia/api/v1/types/pool.py

@ -47,7 +47,7 @@ class PoolResponse(base.BaseType):
protocol = wtypes.wsattr(wtypes.text) protocol = wtypes.wsattr(wtypes.text)
lb_algorithm = wtypes.wsattr(wtypes.text) lb_algorithm = wtypes.wsattr(wtypes.text)
session_persistence = wtypes.wsattr(SessionPersistenceResponse) session_persistence = wtypes.wsattr(SessionPersistenceResponse)
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType())
class PoolPOST(base.BaseType): class PoolPOST(base.BaseType):
@ -64,7 +64,7 @@ class PoolPOST(base.BaseType):
wtypes.Enum(str, *constants.SUPPORTED_LB_ALGORITHMS), wtypes.Enum(str, *constants.SUPPORTED_LB_ALGORITHMS),
mandatory=True) mandatory=True)
session_persistence = wtypes.wsattr(SessionPersistencePOST) session_persistence = wtypes.wsattr(SessionPersistencePOST)
project_id = wtypes.wsattr(wtypes.UuidType()) project_id = wtypes.wsattr(wtypes.StringType(max_length=36))
class PoolPUT(base.BaseType): class PoolPUT(base.BaseType):