summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-01-27 18:59:41 +0000
committerGerrit Code Review <review@openstack.org>2023-01-27 18:59:41 +0000
commitdc9bd9ed74665195eb23bbcafdf069014c3e8865 (patch)
treeca0fcc6de2a27856a194e374ea85e912014f93f4
parentf5ca3b202f597918da61dc8694a1ea0d6ef70740 (diff)
parent6acabc4f39dcd08756b7b43b5182d78bf6a54d51 (diff)
downloadhorizon-dc9bd9ed74665195eb23bbcafdf069014c3e8865.tar.gz
Merge "Fix flavor id auto generation" into stable/zed
-rw-r--r--openstack_dashboard/dashboards/admin/flavors/workflows.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack_dashboard/dashboards/admin/flavors/workflows.py b/openstack_dashboard/dashboards/admin/flavors/workflows.py
index 074924eb8..3244ad992 100644
--- a/openstack_dashboard/dashboards/admin/flavors/workflows.py
+++ b/openstack_dashboard/dashboards/admin/flavors/workflows.py
@@ -30,7 +30,7 @@ class CreateFlavorInfoAction(workflows.Action):
_flavor_id_regex = (r'^[a-zA-Z0-9. _-]+$')
_flavor_id_help_text = _("flavor id can only contain alphanumeric "
"characters, underscores, periods, hyphens, "
- "spaces.")
+ "spaces. Use 'auto' to automatically generate id")
name = forms.CharField(
label=_("Name"),
max_length=255)
@@ -93,7 +93,7 @@ class CreateFlavorInfoAction(workflows.Action):
error_msg = _('The name "%s" is already used by '
'another flavor.') % name
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 '
'another flavor.') % flavor_id
self._errors['flavor_id'] = self.error_class([error_msg])