diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-04-09 15:29:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-04-09 15:29:06 +0000 |
| commit | 9db0e052d80cd708ec08afbb01c89cd642285a87 (patch) | |
| tree | 7c6347e981f587c1136b3db337b23de22b690511 | |
| parent | 68e93e0701657592dc34404a74b31ac8e5eaf50a (diff) | |
| parent | 3d7dc492a76836248e5f4c771467267902fcef77 (diff) | |
| download | tuskar-ui-9db0e052d80cd708ec08afbb01c89cd642285a87.tar.gz | |
Merge "Fix error when viewing role with no flavor"
| -rw-r--r-- | tuskar_ui/infrastructure/overcloud/templates/overcloud/overcloud_role.html | 6 | ||||
| -rw-r--r-- | tuskar_ui/infrastructure/overcloud/views.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tuskar_ui/infrastructure/overcloud/templates/overcloud/overcloud_role.html b/tuskar_ui/infrastructure/overcloud/templates/overcloud/overcloud_role.html index 37905bdc..4e449507 100644 --- a/tuskar_ui/infrastructure/overcloud/templates/overcloud/overcloud_role.html +++ b/tuskar_ui/infrastructure/overcloud/templates/overcloud/overcloud_role.html @@ -13,7 +13,11 @@ <p><strong>{% blocktrans count counter=nodes|length %}{{ counter }} instance{% plural %}{{ counter }} instances{% endblocktrans %}</strong></p> <dl> <dt>{% trans 'Flavor' %}</dt> - <dd><em>{{ flavor.name }}</em> {{ flavor.get_keys.cpu_arch }} | {{ flavor.vcpus }} {% trans "CPU" %} | {{ flavor.ram }} {% trans "MB RAM" %} | {{ flavor.disk }} {% trans "GB HDD" %}</dd> + {% if flavor %} + <dd><em>{{ flavor.name }}</em> {{ flavor.get_keys.cpu_arch }} | {{ flavor.vcpus }} {% trans "CPU" %} | {{ flavor.ram }} {% trans "MB RAM" %} | {{ flavor.disk }} {% trans "GB HDD" %}</dd> + {% else %} + <dd>{% trans 'No flavor associated' %}</dd> + {% endif %} <dt>{% trans 'Image' %}</dt> <dd>{{ image_name }}</dd> </dl> diff --git a/tuskar_ui/infrastructure/overcloud/views.py b/tuskar_ui/infrastructure/overcloud/views.py index 1ee0982e..72e44dd5 100644 --- a/tuskar_ui/infrastructure/overcloud/views.py +++ b/tuskar_ui/infrastructure/overcloud/views.py @@ -11,6 +11,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +import novaclient from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy as _ @@ -171,6 +172,8 @@ class OvercloudRoleView(horizon_tables.DataTableView, try: context['flavor'] = nova.flavor_get(self.request, role.flavor_id) + except novaclient.exceptions.NotFound: + context['flavor'] = None except Exception: msg = _('Unable to retrieve flavor.') horizon.exceptions.handle(self.request, msg) |