diff options
| author | Tzu-Mainn Chen <tzumainn@redhat.com> | 2013-10-30 10:48:38 -0400 |
|---|---|---|
| committer | Tzu-Mainn Chen <tzumainn@redhat.com> | 2013-10-30 10:48:38 -0400 |
| commit | a205292981972aa3404e44ef1f490614616a154b (patch) | |
| tree | c58ebc006ace9e31dfda65c2a66d027034d487a0 | |
| parent | 7b2282331a48afedd2506e0adc110028ff81f769 (diff) | |
| download | tuskar-ui-a205292981972aa3404e44ef1f490614616a154b.tar.gz | |
Stop appending rc name to rc flavors
When the api registers flavors with nova, it appends the
resource class name to the flavor name. With the current
code, the UI does the same thing resulting in nova flavor
names such as 'm1.m1.small'.
Change-Id: I2c77d61f415e4d3e857446d0afc80cd3e261fb62
| -rw-r--r-- | tuskar_ui/infrastructure/resource_management/resource_classes/tables.py | 1 | ||||
| -rw-r--r-- | tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py index 9075fd3b..d16b5abe 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py @@ -206,7 +206,6 @@ class FlavorsFormsetTable(tuskar_ui.tables.FormsetDataTableMixin, name = tables.Column( 'name', verbose_name=_('Flavor Name'), - filters=(lambda n: (n or '.').split('.')[1],), ) DELETE = tables.Column('DELETE', verbose_name=_("Delete")) formset_class = flavors_forms.FlavorFormset diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py b/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py index 8df5e4cb..08227106 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py @@ -221,7 +221,6 @@ class ResourceClassWorkflowMixin: def _get_flavors(self, request, data): flavors = [] - resource_class_name = data['name'] for flavor in data.get('flavors') or []: capacities = [] for name, info in flavors_forms.CAPACITIES.items(): @@ -231,11 +230,8 @@ class ResourceClassWorkflowMixin: value = '' capacities.append({'name': name, 'value': str(value), 'unit': unit}) - # FIXME: tuskar uses resource-class-name prefix for flavors, - # e.g. m1.large, we add rc name to the template name: - flavor_name = "%s.%s" % (resource_class_name, flavor['name']) # FIXME: for now just use blank max_vms - flavors.append({'name': flavor_name, 'capacities': capacities, + flavors.append({'name': flavor['name'], 'capacities': capacities, 'max_vms': None, 'id': data.get('id')}) return flavors |