openstack
/
horizon
Code Issues Proposed changes

Merge "If the flavor_id not in full_flavors, don't make a new API request"

This commit is contained in:
Jenkins 2017-07-27 07:29:45 +00:00 committed by Gerrit Code Review
parent b897350227 46c4c3d4f9
commit 67eba64439
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack_dashboard/dashboards/project/instances/tests.py
View File

@ -205,8 +205,6 @@ class InstanceTests(helpers.ResetImageAPIVersionMixin, helpers.TestCase):
})
def test_index_flavor_list_exception(self):
servers = self.servers.list()
flavors = self.flavors.list()
full_flavors = OrderedDict([(f.id, f) for f in flavors])
search_opts = {'marker': None, 'paginate': True}
api.nova.extension_supported('AdminActions', IsA(http.HttpRequest)) \
.MultipleTimes().AndReturn(True)
@ -222,9 +220,6 @@ class InstanceTests(helpers.ResetImageAPIVersionMixin, helpers.TestCase):
.AndRaise(self.exceptions.nova)
api.glance.image_list_detailed(IgnoreArg()) \
.AndReturn((self.images.list(), False, False))
for server in servers:
api.nova.flavor_get(IsA(http.HttpRequest), server.flavor["id"]). \
AndReturn(full_flavors[server.flavor["id"]])
api.nova.tenant_absolute_limits(IsA(http.HttpRequest), reserved=True) \
.MultipleTimes().AndReturn(self.limits['absolute'])
api.neutron.floating_ip_supported(IsA(http.HttpRequest)) \

22
openstack_dashboard/dashboards/project/instances/views.py
View File

@ -132,19 +132,15 @@ class IndexView(tables.DataTableView):
else:
instance.image['name'] = _("-")
try:
flavor_id = instance.flavor["id"]
if flavor_id in full_flavors:
instance.full_flavor = full_flavors[flavor_id]
else:
# If the flavor_id is not in full_flavors list,
# get it via nova api.
instance.full_flavor = api.nova.flavor_get(
self.request, flavor_id)
except Exception:
LOG.info('Unable to retrieve flavor "%(flavor)s" for '
'instance "%(id)s".',
{'flavor': flavor_id, 'id': instance.id})
flavor_id = instance.flavor["id"]
if flavor_id in full_flavors:
instance.full_flavor = full_flavors[flavor_id]
else:
# If the flavor_id is not in full_flavors list,
# put info in the log file.
msg = ('Unable to retrieve flavor "%s" for instance "%s".'
% (flavor_id, instance.id))
LOG.info(msg)
return instances