openstack
/
horizon
Code Issues Proposed changes

Merge "Prevent creating a single IP address sized network (network details)" into stable/folsom

This commit is contained in:
Jenkins 2013-04-03 22:31:07 +00:00 committed by Gerrit Code Review
parent c157d95eb2 6e1d0690c9
commit 8b5242c683
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
horizon/dashboards/nova/networks/subnets/forms.py
View File

@ -65,9 +65,15 @@ class CreateSubnet(forms.SelfHandlingForm):
ip_version = int(cleaned_data.get('ip_version'))
gateway_ip = cleaned_data.get('gateway_ip')
if cidr:
if netaddr.IPNetwork(cidr).version is not ip_version:
subnet = netaddr.IPNetwork(cidr)
if subnet.version != ip_version:
msg = _('Network Address and IP version are inconsistent.')
raise forms.ValidationError(msg)
if (ip_version == 4 and subnet.prefixlen == 32) or \
(ip_version == 6 and subnet.prefixlen == 128):
msg = _("The subnet in the Network Address is too small (/%s)."
% subnet.prefixlen)
raise forms.ValidationError(msg)
if gateway_ip:
if netaddr.IPAddress(gateway_ip).version is not ip_version:
msg = _('Gateway IP and IP version are inconsistent.')

22
horizon/dashboards/nova/networks/tests.py
View File

@ -670,6 +670,28 @@ class NetworkTests(test.TestCase):
self.assertContains(res, 'Gateway IP and IP version are inconsistent.')
@test.create_stubs({api.quantum: ('network_get',)})
def test_subnet_create_post_cidr_without_mask(self):
network = self.networks.first()
subnet = self.subnets.first()
api.quantum.network_get(IsA(http.HttpRequest),
network.id) \
.AndReturn(self.networks.first())
self.mox.ReplayAll()
form_data = {'network_id': subnet.network_id,
'network_name': network.name,
'subnet_name': subnet.name,
'cidr': '10.0.0.0',
'ip_version': subnet.ip_version,
'gateway_ip': subnet.gateway_ip}
url = reverse('horizon:nova:networks:addsubnet',
args=[subnet.network_id])
res = self.client.post(url, form_data)
expected_msg = "The subnet in the Network Address is too small (/32)."
self.assertContains(res, expected_msg)
@test.create_stubs({api.quantum: ('subnet_modify',
'subnet_get',)})
def test_subnet_update_post(self):