openstack
/
octavia-lib
Code Issues Proposed changes

Merge "Add project_id to all of the data model objects"

This commit is contained in:
Zuul 2019-06-06 12:06:19 +00:00 committed by Gerrit Code Review
parent 1185be7781 5376e0304c
commit d7c844cc65
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
octavia_lib/api/drivers/data_models.py
View File

@ -136,7 +136,7 @@ class Listener(BaseDataModel):
timeout_tcp_inspect=Unset, client_ca_tls_container_ref=Unset,
client_ca_tls_container_data=Unset,
client_authentication=Unset, client_crl_container_ref=Unset,
client_crl_container_data=Unset):
client_crl_container_data=Unset, project_id=Unset):
self.admin_state_up = admin_state_up
self.connection_limit = connection_limit
@ -163,6 +163,7 @@ class Listener(BaseDataModel):
self.client_authentication = client_authentication
self.client_crl_container_ref = client_crl_container_ref
self.client_crl_container_data = client_crl_container_data
self.project_id = project_id
class Pool(BaseDataModel):
@ -173,7 +174,8 @@ class Pool(BaseDataModel):
session_persistence=Unset, tls_container_ref=Unset,
tls_container_data=Unset, ca_tls_container_ref=Unset,
ca_tls_container_data=Unset, crl_container_ref=Unset,
crl_container_data=Unset, tls_enabled=Unset):
crl_container_data=Unset, tls_enabled=Unset,
project_id=Unset):
self.admin_state_up = admin_state_up
self.description = description
@ -193,13 +195,14 @@ class Pool(BaseDataModel):
self.crl_container_ref = crl_container_ref
self.crl_container_data = crl_container_data
self.tls_enabled = tls_enabled
self.project_id = project_id
class Member(BaseDataModel):
def __init__(self, address=Unset, admin_state_up=Unset, member_id=Unset,
monitor_address=Unset, monitor_port=Unset, name=Unset,
pool_id=Unset, protocol_port=Unset, subnet_id=Unset,
weight=Unset, backup=Unset):
weight=Unset, backup=Unset, project_id=Unset):
self.address = address
self.admin_state_up = admin_state_up
@ -212,6 +215,7 @@ class Member(BaseDataModel):
self.subnet_id = subnet_id
self.weight = weight
self.backup = backup
self.project_id = project_id
class HealthMonitor(BaseDataModel):
@ -219,7 +223,7 @@ class HealthMonitor(BaseDataModel):
healthmonitor_id=Unset, http_method=Unset, max_retries=Unset,
max_retries_down=Unset, name=Unset, pool_id=Unset,
timeout=Unset, type=Unset, url_path=Unset, http_version=Unset,
domain_name=Unset):
domain_name=Unset, project_id=Unset):
self.admin_state_up = admin_state_up
self.delay = delay
@ -235,13 +239,15 @@ class HealthMonitor(BaseDataModel):
self.url_path = url_path
self.http_version = http_version
self.domain_name = domain_name
self.project_id = project_id
class L7Policy(BaseDataModel):
def __init__(self, action=Unset, admin_state_up=Unset, description=Unset,
l7policy_id=Unset, listener_id=Unset, name=Unset,
position=Unset, redirect_pool_id=Unset, redirect_url=Unset,
rules=Unset, redirect_prefix=Unset, redirect_http_code=Unset):
rules=Unset, redirect_prefix=Unset, redirect_http_code=Unset,
project_id=Unset):
self.action = action
self.admin_state_up = admin_state_up
@ -255,12 +261,13 @@ class L7Policy(BaseDataModel):
self.rules = rules
self.redirect_prefix = redirect_prefix
self.redirect_http_code = redirect_http_code
self.project_id = project_id
class L7Rule(BaseDataModel):
def __init__(self, admin_state_up=Unset, compare_type=Unset, invert=Unset,
key=Unset, l7policy_id=Unset, l7rule_id=Unset, type=Unset,
value=Unset):
value=Unset, project_id=Unset):
self.admin_state_up = admin_state_up
self.compare_type = compare_type
@ -270,6 +277,7 @@ class L7Rule(BaseDataModel):
self.l7rule_id = l7rule_id
self.type = type
self.value = value
self.project_id = project_id
class VIP(BaseDataModel):

12
octavia_lib/tests/unit/api/drivers/test_data_models.py
View File

@ -53,6 +53,7 @@ class TestProviderDataModels(base.TestCase):
l7policy_id=self.l7policy_id,
l7rule_id=self.l7rule_id,
type='COOKIE',
project_id=self.project_id,
value='chocolate')
self.ref_l7policy = data_models.L7Policy(
@ -66,6 +67,7 @@ class TestProviderDataModels(base.TestCase):
redirect_pool_id=self.pool_id,
redirect_url='/test',
rules=[self.ref_l7rule],
project_id=self.project_id,
redirect_prefix='http://example.com',
redirect_http_code=301)
@ -82,6 +84,7 @@ class TestProviderDataModels(base.TestCase):
listener_id=self.listener_id,
loadbalancer_id=self.loadbalancer_id,
name='super_listener',
project_id=self.project_id,
protocol='avian',
protocol_port=42,
sni_container_data=['sni_cert_data_1', 'sni_cert_data_2'],
@ -126,6 +129,7 @@ class TestProviderDataModels(base.TestCase):
monitor_port=8888,
name='member',
pool_id=self.pool_id,
project_id=self.project_id,
protocol_port=80,
subnet_id=self.mem_subnet_id,
weight=1,
@ -141,6 +145,7 @@ class TestProviderDataModels(base.TestCase):
max_retries_down=3,
name='member',
pool_id=self.pool_id,
project_id=self.project_id,
timeout=4,
type='HTTP',
url_path='/test',
@ -156,6 +161,7 @@ class TestProviderDataModels(base.TestCase):
members=[self.ref_member],
name='pool',
pool_id=self.pool_id,
project_id=self.project_id,
listener_id=self.listener_id,
protocol='avian',
session_persistence=self.session_persistence)
@ -167,6 +173,7 @@ class TestProviderDataModels(base.TestCase):
'l7policy_id': self.l7policy_id,
'l7rule_id': self.l7rule_id,
'type': 'COOKIE',
'project_id': self.project_id,
'value': 'chocolate'}
self.ref_l7policy_dict = {'action': 'REJECT',
@ -176,6 +183,7 @@ class TestProviderDataModels(base.TestCase):
'listener_id': self.listener_id,
'name': 'l7policy',
'position': 1,
'project_id': self.project_id,
'redirect_pool_id': self.pool_id,
'redirect_url': '/test',
'rules': [self.ref_l7rule_dict],
@ -207,6 +215,7 @@ class TestProviderDataModels(base.TestCase):
'l7policies': [self.ref_l7policy_dict],
'loadbalancer_id': self.loadbalancer_id,
'name': 'super_listener',
'project_id': self.project_id,
'protocol': 'avian',
'protocol_port': 42,
'sni_container_data': ['sni_cert_data_1', 'sni_cert_data_2'],
@ -251,6 +260,7 @@ class TestProviderDataModels(base.TestCase):
'monitor_port': 8888,
'name': 'member',
'pool_id': self.pool_id,
'project_id': self.project_id,
'protocol_port': 80,
'subnet_id': self.mem_subnet_id,
'weight': 1,
@ -266,6 +276,7 @@ class TestProviderDataModels(base.TestCase):
'max_retries_down': 3,
'name': 'member',
'pool_id': self.pool_id,
'project_id': self.project_id,
'timeout': 4,
'type': 'HTTP',
'url_path': '/test',
@ -281,6 +292,7 @@ class TestProviderDataModels(base.TestCase):
'members': [self.ref_member_dict],
'name': 'pool',
'pool_id': self.pool_id,
'project_id': self.project_id,
'listener_id': self.listener_id,
'protocol': 'avian',
'session_persistence': self.session_persistence}