VIM accounts part of the project view
Change-Id: I58992f1fd42dcf78b2db33a285af1b8032a954db
Signed-off-by: lombardof <flombardo@cnit.it>
diff --git a/projecthandler/template/project/osm/descriptor/descriptorlist.html b/projecthandler/template/project/osm/descriptor/descriptorlist.html
index f2f4c8d..67f4a75 100644
--- a/projecthandler/template/project/osm/descriptor/descriptorlist.html
+++ b/projecthandler/template/project/osm/descriptor/descriptorlist.html
@@ -37,7 +37,7 @@
<td>
<div class="btn-group">
{% if descriptor_type == "nsd" %}
- <button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Instantiate NS" onclick="javascript:openModalCreateNS({ 'project_id':'{{project_id}}', 'descriptor_type': '{{descriptor_type}}', 'descriptor_name':'{{ k|get:"name" }}', 'descriptor_id':'{{ k|get:"_id" }}','vim_list_url': '{% url "vim:list" %}', 'nsd_list_url': '{% url "projects:list_descriptors" project_id=project_id descriptor_type=descriptor_type %}' })"><i class="fa fa-paper-plane"></i></button>
+ <button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Instantiate NS" onclick="javascript:openModalCreateNS({ 'project_id':'{{project_id}}', 'descriptor_type': '{{descriptor_type}}', 'descriptor_name':'{{ k|get:"name" }}', 'descriptor_id':'{{ k|get:"_id" }}','vim_list_url': '{% url "projects:vims:list" project_id=project_id%}', 'nsd_list_url': '{% url "projects:list_descriptors" project_id=project_id descriptor_type=descriptor_type %}' })"><i class="fa fa-paper-plane"></i></button>
{% endif %}
<button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Edit" onclick="javascript:openDescriptorView('{{project_id}}', '{{descriptor_type}}', '{{ k|get:"_id" }}')"><i class="fa fa-edit"></i></button>
<button type="button" class="btn btn-default" data-container="body" data-toggle="tooltip" data-placement="top" title="Show content" onclick="javascript:openPackageContentList('{{project_id}}', '{{descriptor_type}}', '{{ k|get:"_id" }}')"><i class="fa fa-folder-open"></i></button>
diff --git a/projecthandler/template/project/osm/osm_project_left_sidebar.html b/projecthandler/template/project/osm/osm_project_left_sidebar.html
index 495f85e..b265080 100644
--- a/projecthandler/template/project/osm/osm_project_left_sidebar.html
+++ b/projecthandler/template/project/osm/osm_project_left_sidebar.html
@@ -54,10 +54,10 @@
<i class="fa fa-list fa-fw"></i><span>SDN Controllers</span>
</a>
</li>
- <li class="header">CONFIG</li>
- {% url "vim:list" type='ns' as vim_list_url %}
+
+ {% url "projects:vims:list" project_id=project_id as vim_list_url %}
<li {% if request.get_full_path == vim_list_url %} class="active" {% endif %}>
- <a href='{% url "vim:list" %}'>
+ <a href='{% url "projects:vims:list" project_id=project_id %}'>
<i class="fa fa-list fa-fw"></i><span>VIM Accounts</span>
</a>
</li>
diff --git a/projecthandler/urls/project.py b/projecthandler/urls/project.py
index eb88a9e..452365a 100644
--- a/projecthandler/urls/project.py
+++ b/projecthandler/urls/project.py
@@ -22,6 +22,7 @@
url(r'^new/', views.create_new_project, name='new_project'),
url(r'^(?P<project_id>\d+)/$', views.open_project, name='open_project'),
url(r'^(?P<project_id>\d+)/sdn/', include('sdnctrlhandler.urls', namespace='sdns'), name='sdns_base'),
+ url(r'^(?P<project_id>\d+)/vims/', include('vimhandler.urls', namespace='vims'), name='vims_base'),
url(r'^(?P<project_id>\d+)/instances/', include('instancehandler.urls', namespace='instances'), name='instances_base'),
url(r'^(?P<project_id>\d+)/delete$', views.delete_project, name='delete_project'),
url(r'^(?P<project_id>\d+)/graph(/$)', views.graph, name='graph_view'),