openstack/tacker-horizon
Code Issues Proposed changes

Merge "VNFFG Manager Tab throwing attribute error"

Browse Source
This commit is contained in:
Jenkins
2017-02-09 00:52:28 +00:00
committed by Gerrit Code Review
parent 0548ce43d1 959e3876fa
commit 0829307356
4 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tables.py
View File

@@ -25,10 +25,10 @@ from tackerclient.common.exceptions import NotFound
class VNFFGManagerItem(object):
def __init__(self, name, description, vnffgs, status):
def __init__(self, id, name, description, status):
self.id = id
self.name = name
self.description = description
self.vnffgs = vnffgs
self.status = status

16
tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/tabs.py
View File

@@ -45,10 +45,10 @@ class VNFFGManagerTab(tabs.TableTab):
except KeyError:
vnffg_desc_str = ""
obj = VNFFGManagerItem(vnffg['name'],
obj = VNFFGManagerItem(vnffg['id'],
vnffg['name'],
vnffg_desc_str,
vnffg['status'],
vnffg['id'])
vnffg['status'])
VNFFGManagerItemList.add_item(obj)
return VNFFGManagerItemList.VNFFGLIST_P
except Exception:
@@ -65,6 +65,16 @@ class VNFFGManagerTabs(tabs.TabGroup):
sticky = True
class VNFFGDetailsTab(tabs.Tab):
name = _("VNFFG Detail")
slug = "VNFFG_Details"
template_name = "nfv/vnffgmanager/vnffg_details.html"
def get_context_data(self, request):
return {'vnffg': self.tab_group.kwargs['vnffg']}
class VNFFGDetailsTabs(tabs.TabGroup):
slug = "VNFFG_details"
tabs = (VNFFGDetailsTab,)
sticky = True

31
tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/templates/vnffgmanager/vnffg_details.html Normal file
View File

@@ -0,0 +1,31 @@
{% load i18n %}
<head>
<style>
table {
border-collapse: collapse;
width: 100%;
}
th, td {
padding: 8px;
text-align: left;
border-bottom: 1px solid #ddd;
}
</style>
</head>
<body>
<b><h4>{% trans "VNFFG information" %}<br/></b></h4>
<table style="width:100%">
<tr>
<th><b>{% trans "Id" %}<br/></b></th>
<th><b> {% trans "Name" %} <br/></b></th>
<th><b> {% trans "Description" %} <br/></b></th>
<th><b> {% trans "Status" %} <br/></b></th>
</tr>
<tr>
<td>{{ vnffg.vnffg.id }}</td>
<td>{{ vnffg.vnffg.name }}</td>
<td>{{ vnffg.vnffg.description }}</td>
<td>{{ vnffg.vnffg.status }}</td>
</tr>
</table>
</body>

2
tacker_horizon/openstack_dashboard/dashboards/nfv/vnffgmanager/views.py
View File

@@ -94,7 +94,7 @@ class DetailView(tabs.TabView):
try:
vnffg = tacker_api.tacker.get_vnffg(self.request, vnffg_id)
vnffg["vnffg"]["mgmt_url"] = json.loads(vnffg["vnffg"]["mgmt_url"]) if \
vnffg["vnffg"]["mgmt_url"] else None
vnffg["vnffg"].get("mgmt_url") else None
return vnffg
except ValueError as e:
msg = _('Cannot decode json : %s') % e