openstack/horizon
Code Issues Proposed changes

Merge "Do not call handle() when AZ is required"

Browse Source
This commit is contained in:
Zuul 2019-06-05 12:46:19 +00:00 committed by Gerrit Code Review
commit 0bc65a43d1
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
openstack_dashboard/dashboards/admin/aggregates/forms.py
View File

@ -23,26 +23,35 @@ INDEX_URL = constants.AGGREGATES_INDEX_URL
class UpdateAggregateForm(forms.SelfHandlingForm): class UpdateAggregateForm(forms.SelfHandlingForm):
use_required_attribute = False
name = forms.CharField(label=_("Name"), name = forms.CharField(label=_("Name"),
max_length=255) max_length=255)
availability_zone = forms.CharField(label=_("Availability Zone"), availability_zone = forms.CharField(
required=False, label=_("Availability Zone"),
max_length=255) max_length=255,
# This message is used when the initial value is non-empty.
# Once AZ is set, nova API does not allow us to clear it.
error_messages={
'required': _("The new availability zone can't be empty"),
},
)
def __init__(self, request, *args, **kwargs):
super(UpdateAggregateForm, self).__init__(request, *args, **kwargs)
old_availability_zone = self.initial['availability_zone']
if not old_availability_zone:
self.fields['availability_zone'].required = False
def handle(self, request, data): def handle(self, request, data):
id = self.initial['id'] id = self.initial['id']
old_availability_zone = self.initial['availability_zone']
name = data['name'] name = data['name']
availability_zone = data['availability_zone'] availability_zone = data['availability_zone']
aggregate = {'name': name} aggregate = {'name': name}
try: if availability_zone:
if availability_zone: aggregate['availability_zone'] = availability_zone
aggregate['availability_zone'] = availability_zone
elif old_availability_zone:
raise ValueError
except Exception:
exceptions.handle(request,
_('The new availability zone can\'t be empty'))
try: try:
api.nova.aggregate_update(request, id, aggregate) api.nova.aggregate_update(request, id, aggregate)
message = (_('Successfully updated aggregate: "%s."') message = (_('Successfully updated aggregate: "%s."')

16
openstack_dashboard/dashboards/admin/aggregates/tests.py
View File

@ -266,13 +266,25 @@ class AggregatesViewTests(test.BaseAdminViewTests):
self._test_generic_update_aggregate(form_data, aggregate) self._test_generic_update_aggregate(form_data, aggregate)
def test_update_aggregate_fails_missing_fields(self): def test_update_aggregate_fails_missing_name_field(self):
aggregate = self.aggregates.first() aggregate = self.aggregates.first()
form_data = {'id': aggregate.id} form_data = {'id': aggregate.id,
'name': '',
'availability_zone': aggregate.availability_zone}
self._test_generic_update_aggregate(form_data, aggregate, 1, self._test_generic_update_aggregate(form_data, aggregate, 1,
u'This field is required') u'This field is required')
def test_update_aggregate_fails_missing_az_field(self):
aggregate = self.aggregates.first()
form_data = {'id': aggregate.id,
'name': aggregate.name,
'availability_zone': ''}
self._test_generic_update_aggregate(
form_data, aggregate, 1,
u'The new availability zone can't be empty')
class ManageHostsTests(test.BaseAdminViewTests): class ManageHostsTests(test.BaseAdminViewTests):