refactoring urls
Change-Id: If7c9bbfec35f733b3154fd74d83794764f4dad44
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/projecthandler/template/project/osm/descriptor/descriptorlist.html b/projecthandler/template/project/osm/descriptor/descriptorlist.html
index c995844..ee3eaa7 100644
--- a/projecthandler/template/project/osm/descriptor/descriptorlist.html
+++ b/projecthandler/template/project/osm/descriptor/descriptorlist.html
@@ -42,7 +42,7 @@
{% 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 "projects:vims:list" %}', 'nsd_list_url': '{% url "projects:list_descriptors" descriptor_type=descriptor_type %}' })">
+ 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 "vims:list" %}', 'nsd_list_url': '{% url "projects:list_descriptors" descriptor_type=descriptor_type %}' })">
<i class="fa fa-paper-plane"></i></button>
{% endif %}
<button type="button" class="btn btn-default" data-container="body"
diff --git a/projecthandler/template/project/osm/osm_project_details.html b/projecthandler/template/project/osm/osm_project_details.html
index b0a1203..5158d8f 100644
--- a/projecthandler/template/project/osm/osm_project_details.html
+++ b/projecthandler/template/project/osm/osm_project_details.html
@@ -62,7 +62,7 @@
<div class="inner"><h3>{{ project_overview.ns }}</h3>
<p>NS Instances</p></div>
<div class="icon"><i class="fa fa-sitemap fa-fw"></i></div>
- <a href='{% url "projects:instances:list" type="ns" %}' class="small-box-footer">Open list <i
+ <a href='{% url "instances:list" type="ns" %}' class="small-box-footer">Open list <i
class="fa fa-arrow-circle-right"></i></a></div>
</div>
@@ -71,7 +71,7 @@
<div class="inner"><h3>{{ project_overview.vnf }}</h3>
<p>VNF Instances</p></div>
<div class="icon"><i class="far fa-hdd fa-fw"></i></div>
- <a href='{% url "projects:instances:list" type="vnf" %}' class="small-box-footer">Open list <i
+ <a href='{% url "instances:list" type="vnf" %}' class="small-box-footer">Open list <i
class="fa fa-arrow-circle-right"></i></a></div>
</div>
diff --git a/projecthandler/template/project/osm/osm_project_left_sidebar.html b/projecthandler/template/project/osm/osm_project_left_sidebar.html
index b07c432..82becc5 100644
--- a/projecthandler/template/project/osm/osm_project_left_sidebar.html
+++ b/projecthandler/template/project/osm/osm_project_left_sidebar.html
@@ -38,8 +38,8 @@
</ul>
</li>
- {% url "projects:instances:list" type='ns' as instance_ns_list_url %}
- {% url "projects:instances:list" type='vnf' as instance_vnf_list_url %}
+ {% url "instances:list" type='ns' as instance_ns_list_url %}
+ {% url "instances:list" type='vnf' as instance_vnf_list_url %}
<li {% if request.get_full_path == instance_ns_list_url or request.get_full_path == instance_vnf_list_url %}
class="active treeview menu-open" {% else %} class="treeview menu-open" {% endif %} >
<a href="#">
@@ -49,32 +49,32 @@
</span>
</a>
<ul class="treeview-menu" style="display: block;">
- {% url "projects:instances:list" type='ns' as instance_ns_list_url %}
+ {% url "instances:list" type='ns' as instance_ns_list_url %}
<li {% if request.get_full_path == instance_ns_list_url %} class="active" {% endif %} >
- <a href='{% url "projects:instances:list" type="ns" %}'>
+ <a href='{% url "instances:list" type="ns" %}'>
<i class="fa fa-sitemap fa-fw"></i> <span>NS Instances</span>
</a>
</li>
- {% url "projects:instances:list" type='vnf' as instance_vnf_list_url %}
+ {% url "instances:list" type='vnf' as instance_vnf_list_url %}
<li {% if request.get_full_path == instance_vnf_list_url %} class="active" {% endif %} >
- <a href='{% url "projects:instances:list" type="vnf" %}'>
+ <a href='{% url "instances:list" type="vnf" %}'>
<i class="far fa-hdd fa-fw"></i> <span>VNF Instances</span>
</a>
</li>
</ul>
</li>
- {% url "projects:sdns:list" as sdn_list_url %}
+ {% url "sdns:list" as sdn_list_url %}
<li {% if request.get_full_path == sdn_list_url %} class="active" {% endif %}>
- <a href='{% url "projects:sdns:list" %}'>
+ <a href='{% url "sdns:list" %}'>
<i class="fas fa-globe fa-fw"></i> <span>SDN Controllers</span>
</a>
</li>
- {% url "projects:vims:list" as vim_list_url %}
+ {% url "vims:list" as vim_list_url %}
<li {% if request.get_full_path == vim_list_url %} class="active" {% endif %}>
- <a href='{% url "projects:vims:list" %}'>
+ <a href='{% url "vims:list" %}'>
<i class="fa fa-server fa-fw"></i> <span>VIM Accounts</span>
</a>
</li>
diff --git a/projecthandler/urls/project.py b/projecthandler/urls/project.py
index 1e3b24e..e0395c8 100644
--- a/projecthandler/urls/project.py
+++ b/projecthandler/urls/project.py
@@ -36,8 +36,6 @@
name='new_descriptor'),
url(r'^composer$', views.open_composer, name='open_composer'),
url(r'^availablenodes', views.get_available_nodes, name='get_available_nodes'),
- url(r'^sdn/', include('sdnctrlhandler.urls', namespace='sdns'), name='sdns_base'),
- url(r'^vims/', include('vimhandler.urls', namespace='vims'), name='vims_base'),
- url(r'^instances/', include('instancehandler.urls', namespace='instances'), name='instances_base'),
+
]
\ No newline at end of file