openstack/horizon
Code Issues Proposed changes

SDK subnetpools: change prefixlen fields as SDK calls them

Browse Source 
Closes-Bug: #2116927
Change-Id: Ie5fcbe934e4434044b146a724d4cfc907d506b06
Signed-off-by: lajoskatona <lajos.katona@est.tech>
This commit is contained in:
lajoskatona
2025-07-28 12:03:46 +02:00
parent fb8bacac69
commit e2edb40c62
5 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
horizon/static/horizon/js/horizon.forms.js
View File

@@ -86,9 +86,9 @@ horizon.forms = {
var $ipVersion = $form.find("select#id_ip_version");
var $prefixLength = $form.find("select#id_prefixlen");
var subnetpoolIpVersion = parseInt($option.data("ip_version"), 10) || 4;
var minPrefixLen = parseInt($option.data("min_prefixlen"), 10) || 1;
var maxPrefixLen = parseInt($option.data("max_prefixlen"), 10);
var defaultPrefixLen = parseInt($option.data("default_prefixlen"), 10) ||
var minPrefixLen = parseInt($option.data("minimum_prefix_length"), 10) || 1;
var maxPrefixLen = parseInt($option.data("maximum_prefix_length"), 10);
var defaultPrefixLen = parseInt($option.data("default_prefix_length"), 10) ||
-1;
var optionsAsString = "";

18
openstack_dashboard/api/neutron.py
View File

@@ -1795,17 +1795,17 @@ def subnetpool_create(request, name, prefixes, **kwargs):
ip_version is auto-detected in back-end.
Parameters:
request -- Request context
name -- Name for subnetpool
prefixes -- List of prefixes for pool
request -- Request context
name -- Name for subnetpool
prefixes -- List of prefixes for pool
Keyword Arguments (optional):
min_prefixlen -- Minimum prefix length for allocations from pool
max_prefixlen -- Maximum prefix length for allocations from pool
default_prefixlen -- Default prefix length for allocations from pool
default_quota -- Default quota for allocations from pool
shared -- Subnetpool should be shared (Admin-only)
tenant_id -- Owner of subnetpool
minimum_prefix_length -- Minimum prefix length for allocations from pool
maximum_prefix_length -- Maximum prefix length for allocations from pool
default_prefix_length -- Default prefix length for allocations from pool
default_quota -- Default quota for allocations from pool
shared -- Subnetpool should be shared (Admin-only)
tenant_id -- Owner of subnetpool
Returns:
SubnetPool object

10
openstack_dashboard/dashboards/project/networks/tests.py
View File

@@ -731,7 +731,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
if test_with_subnetpool:
subnetpool = self.subnetpools.first()
form_data['subnetpool'] = subnetpool.id
form_data['prefixlen'] = subnetpool.default_prefixlen
form_data['prefixlen'] = subnetpool.default_prefix_length
form_data.update(form_data_subnet(subnet, cidr='10.0.0.0',
allocation_pools=[]))
url = reverse('horizon:project:networks:create')
@@ -768,7 +768,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
if test_with_subnetpool:
subnetpool = self.subnetpools.first()
form_data['subnetpool'] = subnetpool.id
form_data['prefixlen'] = subnetpool.default_prefixlen
form_data['prefixlen'] = subnetpool.default_prefix_length
form_data.update(form_data_subnet(subnet, cidr='30.30.30.0/24',
allocation_pools=[]))
@@ -809,7 +809,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
if test_with_subnetpool:
subnetpool = self.subnetpools.first()
form_data['subnetpool'] = subnetpool.id
form_data['prefixlen'] = subnetpool.default_prefixlen
form_data['prefixlen'] = subnetpool.default_prefix_length
form_data.update(form_data_subnet(subnet_v6, cidr='fc00::/7',
allocation_pools=[]))
@@ -898,7 +898,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
if test_with_subnetpool:
subnetpool = self.subnetpools.first()
form_data['subnetpool'] = subnetpool.id
form_data['prefixlen'] = subnetpool.default_prefixlen
form_data['prefixlen'] = subnetpool.default_prefix_length
form_data.update(form_data_subnet(subnet, cidr=cidr,
allocation_pools=[]))
url = reverse('horizon:project:networks:create')
@@ -934,7 +934,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
if test_with_subnetpool:
subnetpool = self.subnetpools.first()
form_data['subnetpool'] = subnetpool.id
form_data['prefixlen'] = subnetpool.default_prefixlen
form_data['prefixlen'] = subnetpool.default_prefix_length
form_data.update(form_data_subnet(subnet, gateway_ip=gateway_ip,
allocation_pools=[]))
url = reverse('horizon:project:networks:create')

6
openstack_dashboard/dashboards/project/networks/workflows.py
View File

@@ -131,9 +131,9 @@ class CreateSubnetInfoAction(workflows.Action):
'data-source-subnetpool': _('Address pool')},
data_attrs=('name', 'prefixes',
'ip_version',
'min_prefixlen',
'max_prefixlen',
'default_prefixlen'),
'minimum_prefix_length',
'maximum_prefix_length',
'default_prefix_length'),
transform=lambda x: "%s (%s)" % (x.name, ", ".join(x.prefixes))
if 'prefixes' in x else "%s" % (x.name)),
required=False)

12
openstack_dashboard/test/test_data/neutron_data.py
View File

@@ -921,12 +921,12 @@ def data(TEST):
# Subnetpools
# 1st subnetpool
subnetpool_dict = {'default_prefixlen': 24,
subnetpool_dict = {'default_prefix_length': 24,
'default_quota': None,
'id': '419eb314-e244-4088-aed7-851af9d9500d',
'ip_version': 4,
'max_prefixlen': 32,
'min_prefixlen': 12,
'maximum_prefix_length': 32,
'minimum_prefix_length': 12,
'name': 'mysubnetpool1',
'prefixes': ['172.16.0.0/12'],
'shared': False,
@@ -938,12 +938,12 @@ def data(TEST):
TEST.subnetpools.add(subnetpool)
# 2nd subnetpool (v6)
subnetpool_dict = {'default_prefixlen': 64,
subnetpool_dict = {'default_prefix_length': 64,
'default_quota': None,
'id': 'dcdad289-46f3-4298-bec6-41d91c942efa',
'ip_version': 6,
'max_prefixlen': 64,
'min_prefixlen': 60,
'maximum_prefix_length': 64,
'minimum_prefix_length': 60,
'name': 'mysubnetpool2',
'prefixes': ['2001:db8:42::/48'],
'shared': False,