openstack/horizon
Code Issues Proposed changes

Merge "Fix flavor id auto generation"

Browse Source
This commit is contained in:
Zuul 2022-11-04 11:34:26 +00:00 committed by Gerrit Code Review
commit e1ce2bb8e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/dashboards/admin/flavors/workflows.py
View File

@ -30,7 +30,7 @@ class CreateFlavorInfoAction(workflows.Action):
_flavor_id_regex = (r'^[a-zA-Z0-9. _-]+$') _flavor_id_regex = (r'^[a-zA-Z0-9. _-]+$')
_flavor_id_help_text = _("flavor id can only contain alphanumeric " _flavor_id_help_text = _("flavor id can only contain alphanumeric "
"characters, underscores, periods, hyphens, " "characters, underscores, periods, hyphens, "
"spaces.") "spaces. Use 'auto' to automatically generate id")
name = forms.CharField( name = forms.CharField(
label=_("Name"), label=_("Name"),
max_length=255) max_length=255)
@ -93,7 +93,7 @@ class CreateFlavorInfoAction(workflows.Action):
error_msg = _('The name "%s" is already used by ' error_msg = _('The name "%s" is already used by '
'another flavor.') % name 'another flavor.') % name
self._errors['name'] = self.error_class([error_msg]) self._errors['name'] = self.error_class([error_msg])
if flavor.id == flavor_id: if (flavor.id != 'auto') and (flavor.id == flavor_id):
error_msg = _('The ID "%s" is already used by ' error_msg = _('The ID "%s" is already used by '
'another flavor.') % flavor_id 'another flavor.') % flavor_id
self._errors['flavor_id'] = self.error_class([error_msg]) self._errors['flavor_id'] = self.error_class([error_msg])