openstack
/
horizon
Code Issues Proposed changes

Sync segmentation ID ranges with Neutron 

There's no point to allow wider ranges than Neutron.

Closes-Bug: #1505500
Change-Id: I5a1ff8f64c9e005fed52d8d2be208d9318f13b80
This commit is contained in:
YAMAMOTO Takashi 2015-10-13 13:39:23 +09:00 committed by Akihiro Motoki
parent ed7c766854
commit eb2c632eb8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/admin/networks/forms.py
View File

@ -77,8 +77,8 @@ PROVIDER_TYPES = {
# in the settings.
SEGMENTATION_ID_RANGE = {
'vlan': (1, 4094),
'gre': (0, (2 ** 32) - 1),
'vxlan': (0, (2 ** 24) - 1),
'gre': (1, (2 ** 32) - 1),
'vxlan': (1, (2 ** 24) - 1),
'geneve': (1, (2 ** 24) - 1),
}
# DEFAULT_PROVIDER_TYPES is used when ['*'] is specified

2
openstack_dashboard/dashboards/admin/networks/tests.py
View File

@ -436,7 +436,7 @@ class NetworkTests(test.BaseAdminViewTests):
res = self.client.post(url, form_data)
self.assertFormErrors(res, 1)
self.assertContains(res, "0 through %s" % ((2 ** 32) - 1))
self.assertContains(res, "1 through %s" % ((2 ** 32) - 1))
@test.create_stubs({api.neutron: ('list_extensions',),
api.keystone: ('tenant_list',)})