X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=projecthandler%2Furls%2Fproject.py;h=16606072a8c40ceaea430fa124f97ed6fdddfdb6;hb=3218b2b802b040b6110780eb95cf84a9f3101505;hp=2b2f82493c0cff92868dc9a6479277af5ce1e5c8;hpb=07db64f41b63d46ee033caed13bf4fcf5b329161;p=osm%2FLW-UI.git

diff --git a/projecthandler/urls/project.py b/projecthandler/urls/project.py
index 2b2f824..1660607 100644
--- a/projecthandler/urls/project.py
+++ b/projecthandler/urls/project.py
@@ -18,37 +18,16 @@ from django.conf.urls import url, include
 from projecthandler import views
 
 urlpatterns = [
+    url(r'^$', views.open_project, name='open_project'),
     url(r'^list/', views.user_projects, name='projects_list'),
     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+)/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'),
-    url(r'^(?P<project_id>\d+)/graph/graph_data(/$)', views.graph_data, name='graph_data'),
-    url(r'^(?P<project_id>\d+)/graph/graph_data/(?P<descriptor_id>[-\w]+)(/$)', views.graph_data, name='graph_data'),
-    url(r'^(?P<project_id>\d+)/graph/positions$', views.graph_positions, name='graph_positions'),
-    url(r'^(?P<project_id>\d+)/graph/unusedvnf/(?P<nsd_id>\w+)(/$)', views.unused_vnf, name='unused_vnf'),
-    url(r'^(?P<project_id>\d+)/graph/addelement$', views.add_element, name='addelement'),
-    url(r'^(?P<project_id>\d+)/graph/overviewelement$', views.overviewelement, name='overviewelement'),
-    url(r'^(?P<project_id>\d+)/graph/addnodetovnffg', views.add_node_to_vnffg, name='addnodetovnffg'),
-    url(r'^(?P<project_id>\d+)/graph/removeelement$', views.remove_element, name='removeelement'),
-    url(r'^(?P<project_id>\d+)/graph/addlink$', views.add_link, name='addlink'),
-    url(r'^(?P<project_id>\d+)/graph/removelink$', views.remove_link, name='removelink'),
-    url(r'^(?P<project_id>\d+)/graph/availablenodes', views.get_available_nodes, name='get_available_nodes'),
-    url(r'^(?P<project_id>\d+)/descriptors/(?P<descriptor_type>\w+)/list$', views.show_descriptors, name='list_descriptors'),
-    url(r'^(?P<project_id>\d+)/descriptors/(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)(/$)',
-        views.edit_descriptor, name='edit_descriptor'),
-    url(r'^(?P<project_id>\d+)/descriptors/(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/delete$',
-        views.delete_descriptor,
-        name='delete_descriptor'),
-    url(r'^(?P<project_id>\d+)/descriptors/(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/clone$',
-        views.clone_descriptor,
-        name='clone_descriptor'),
-    url(r'^(?P<project_id>\d+)/descriptors/(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/action/(?P<action_name>[-\w]+)',
-        views.custom_action,
-        name='custom_action'),
-    url(r'^(?P<project_id>\d+)/descriptors/(?P<descriptor_type>\w+)/new$', views.new_descriptor,
-        name='new_descriptor'),
+    url(r'^descriptors/', include('descriptorhandler.urls', namespace='descriptors'), name='descriptor_base'),
+    url(r'^(?P<project_id>[\w ]+)/delete$', views.delete_project, name='delete_project'),
+    url(r'^(?P<project_id>[\w ]+)/switch', views.switch_project, name='switch_project'),
+    url(r'^(?P<project_id>[\w ]+)/edit', views.edit_project, name='edit_project'),
+
+
+
 
 
 ]
\ No newline at end of file