Resolved issue with details-page

Change-Id: I53883d40b00998386cad0a7fccce9c264f229276
This commit is contained in:
Serg Melikyan 2013-11-19 19:39:05 +04:00
parent e9daac3f7b
commit 48968016b7
1 changed files with 23 additions and 22 deletions

View File

@ -72,32 +72,33 @@ class OverviewTab(tabs.Tab):
#check for deployed services so additional information can be added
units = []
instance_name = None
for unit in service_data.units:
if hasattr(unit, 'state'):
# unit_detail = {'Name': unit.name}
unit_detail = SortedDict()
instance_hostname = unit.state.hostname
if 'Hostname template' in detail_info:
del detail_info['Hostname template']
unit_detail['Hostname'] = instance_hostname
instances = nova_api.server_list(request)
if not hasattr(unit, 'state'):
continue
# HEAT always adds e before instance name
instance_name = 'e' + environment_id + '.' + instance_hostname
unit_detail = SortedDict()
instance_hostname = unit.state.hostname
if 'Hostname template' in detail_info:
del detail_info['Hostname template']
for instance in instances:
if instance._apiresource.name == instance_name:
unit_detail['instance'] = {
'id': instance._apiresource.id,
'name': instance_name
}
break
unit_detail['Hostname'] = instance_hostname
instances = nova_api.server_list(request)[0]
if len(service_data.units) > 1:
units.append(unit_detail)
else:
detail_info.update(unit_detail)
# HEAT always adds e before instance name
instance_name = 'e' + environment_id + '.' + instance_hostname
for instance in instances:
if instance.name == instance_name:
unit_detail['instance'] = {
'id': instance.id,
'name': instance_name
}
break
if len(service_data.units) > 1:
units.append(unit_detail)
else:
detail_info.update(unit_detail)
return {'service': detail_info, 'units': units}