openstack
/
horizon
Code Issues Proposed changes

Merge "Add flavor name regex validation to match nova." into milestone-proposed

This commit is contained in:
Jenkins 2013-03-28 15:44:20 +00:00 committed by Gerrit Code Review
parent 94c93f671d a4ba8e14a6
commit 94d59e66c8
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_dashboard/dashboards/admin/flavors/forms.py
View File

@ -33,7 +33,12 @@ LOG = logging.getLogger(__name__)
class CreateFlavor(forms.SelfHandlingForm):
name = forms.CharField(max_length="25", label=_("Name"))
name = forms.RegexField(label=_("Name"),
max_length=25,
regex=r'^[\w\.\- ]+$',
error_messages={'invalid': _('Name may only '
'contain letters, numbers, underscores, '
'periods and hyphens.')})
vcpus = forms.IntegerField(label=_("VCPUs"))
memory_mb = forms.IntegerField(label=_("RAM MB"))
disk_gb = forms.IntegerField(label=_("Root Disk GB"))

37
openstack_dashboard/dashboards/admin/flavors/tests.py
View File

@ -159,6 +159,43 @@ class FlavorsTests(test.BaseAdminViewTests):
self.assertRedirectsNoFollow(resp,
reverse("horizon:admin:flavors:index"))
@test.create_stubs({api.nova: ('flavor_list',
'flavor_get'), })
def test_edit_flavor_set_invalid_name(self):
flavor_a = self.flavors.list()[0]
flavor_b = self.flavors.list()[1]
eph = getattr(flavor_a, 'OS-FLV-EXT-DATA:ephemeral')
invalid_flavor_name = "m1.tiny()"
# GET
api.nova.flavor_get(IsA(http.HttpRequest),
flavor_a.id).AndReturn(flavor_a)
# POST
api.nova.flavor_list(IsA(http.HttpRequest)) \
.AndReturn(self.flavors.list())
api.nova.flavor_get(IsA(http.HttpRequest),
flavor_a.id).AndReturn(flavor_a)
self.mox.ReplayAll()
# get_test
url = reverse('horizon:admin:flavors:edit', args=[flavor_a.id])
resp = self.client.get(url)
self.assertEqual(resp.status_code, 200)
self.assertTemplateUsed(resp, "admin/flavors/edit.html")
# post test
data = {'flavor_id': flavor_a.id,
'name': invalid_flavor_name,
'vcpus': flavor_a.vcpus + 1,
'memory_mb': flavor_a.ram,
'disk_gb': flavor_a.disk,
'swap_mb': flavor_a.swap,
'eph_gb': eph}
resp = self.client.post(url, data)
self.assertFormErrors(resp, 1, 'Name may only contain letters, '
'numbers, underscores, periods and hyphens.')
@test.create_stubs({api.nova: ('flavor_list',
'flavor_get'), })
def test_edit_flavor_set_existing_name(self):