diff --git a/octavia_dashboard/api/rest/lbaasv2.py b/octavia_dashboard/api/rest/lbaasv2.py index e3113022..ff1349c1 100644 --- a/octavia_dashboard/api/rest/lbaasv2.py +++ b/octavia_dashboard/api/rest/lbaasv2.py @@ -185,6 +185,7 @@ def create_listener(request, **kwargs): timeout_member_connect=data['listener'].get('timeout_member_connect'), timeout_member_data=data['listener'].get('timeout_member_data'), timeout_tcp_inspect=data['listener'].get('timeout_tcp_inspect'), + allowed_cidrs=data['listener'].get('allowed_cidrs') ) if data.get('pool'): @@ -457,6 +458,7 @@ def update_listener(request, **kwargs): timeout_member_connect=data['listener'].get('timeout_member_connect'), timeout_member_data=data['listener'].get('timeout_member_data'), timeout_tcp_inspect=data['listener'].get('timeout_tcp_inspect'), + allowed_cidrs=data['listener'].get('allowed_cidrs') ) if data.get('pool'): diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html index c396c9ac..522ba568 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/detail.html @@ -53,7 +53,7 @@ 'id', 'name', 'description', 'project_id', 'created_at', 'updated_at', 'connection_limit', 'insert_headers', 'default_pool_id', 'timeout_client_data', 'timeout_member_connect', - 'timeout_member_data', 'timeout_tcp_inspect' + 'timeout_member_data', 'timeout_tcp_inspect', 'allowed_cidrs' ]]"> diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/drawer.html b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/drawer.html index c72d1ae4..21aa9c4c 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/drawer.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/details/drawer.html @@ -6,6 +6,6 @@ ['created_at', 'updated_at', 'description'], ['protocol', 'protocol_port', 'connection_limit'], ['insert_headers', 'default_pool_id', 'timeout_client_data'], - ['timeout_member_connect', 'timeout_member_data', 'timeout_tcp_inspect'] + ['timeout_member_connect', 'timeout_member_data', 'timeout_tcp_inspect', 'allowed_cidrs'] ]"> diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js index 78792f77..fb9be478 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/listeners/listeners.module.js @@ -177,6 +177,10 @@ loadBalancerService.nullFilter ] }, + allowed_cidrs: { + label: gettext('Allowed Cidrs'), + filters: ['noValue'] + }, timeout_client_data: gettext('Client Data Timeout'), timeout_member_connect: gettext('Member Connect Timeout'), timeout_member_data: gettext('Member Data Timeout'), diff --git a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html index 4ffe70b9..862d9606 100644 --- a/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html +++ b/octavia_dashboard/static/dashboard/project/lbaasv2/workflow/listener/listener.help.html @@ -62,3 +62,10 @@ Backend member inactivity timeout in milliseconds. Default: 50000.
+
+ Allowed Cidrs:
+