X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=fa72cb9f2b8b148093c643ae7f8ce5fb45e427c2;hb=ff2d326c9f0ef02fd70e3b0c312d6ec5c5af0ca4;hp=30a29deed6266ec96a9bb07d43121931946fc3f6;hpb=a35d2c13ef668fb46200e4ca8ed52a5fbb9596ab;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 30a29dee..fa72cb9f 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -15,11 +15,30 @@ from settings import auxiliaries, INSTALLED_APPS
 import portal.platformsview
 import portal.dashboardview
 import portal.homeview
+import portal.newsview
+
+from portal.registrationview        import RegistrationView
+from portal.contactview             import ContactView
+
+from portal.termsview               import TermsView
 
 home_view=portal.homeview.HomeView.as_view()
 dashboard_view=portal.dashboardview.DashboardView.as_view()
 platforms_view=portal.platformsview.PlatformsView.as_view()
 
+#import portal.testbedlist
+import portal.sliceview
+import portal.sliceresourceview
+
+import portal.slicetabexperiment
+import portal.slicetabinfo
+import portal.slicetabtestbeds
+import portal.slicetabusers
+import portal.slicetabmeasurements 
+
+import portal.managementtababout
+import portal.managementtabrequests
+
 #### high level choices
 # main entry point (set to the / URL)
 # beware that if this view is broken you end up in an endless cycle...
@@ -53,21 +72,47 @@ urls = [
     (r'^logout/?$', 'auth.views.logout_user'),
     #
     # the manifold proxy
-    (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifold.manifoldproxy.proxy'),
+    (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifoldapi.manifoldproxy.proxy'),
     #
     #
     # RESTful interface
-    (r'^rest/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
-    (r'^datatable/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
+    (r'^rest/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.get.dispatch'),
+    (r'^table/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.get.dispatch'),
+    (r'^datatable/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.get.dispatch'),
+    (r'^update/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.update.dispatch'),
+    (r'^create/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.create.dispatch'),
+    (r'^delete/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.delete.dispatch'),
+    (r'^credentials/(?P<action>[^/]+)/?$', 'rest.credentials.dispatch'),
     #
+    # REST monitoring
+    #(r'^monitor/sfa/getversion/?$', 'rest.monitor.sfaGetVersion'),
     #
     #(r'^view/?', include('view.urls')),
-    #(r'^list/slices', 'view.list.slices'),
-    (r'^list/(?P<object_type>[^/]+)', 'rest.list'),
+    #(r'^list/slices', 'view.list.slices')
     #
     #
     # Portal
+    (r'^news/?$', portal.newsview.NewsView.as_view()),
+    (r'^resources/(?P<slicename>[^/]+)/?$', portal.sliceresourceview.SliceResourceView.as_view()),
+    (r'^users/(?P<slicename>[^/]+)/?$', portal.slicetabusers.SliceUserView.as_view()),
+    
+    (r'^slice/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
+    (r'^info/(?P<slicename>[^/]+)/?$', portal.slicetabinfo.SliceInfoView.as_view()),
+    (r'^testbeds/(?P<slicename>[^/]+)/?$', portal.slicetabtestbeds.SliceTabTestbeds.as_view()),
+    (r'^measurements/(?P<slicename>[^/]+)/?$', portal.slicetabmeasurements.SliceTabMeasurements.as_view()),
+    (r'^experiment/(?P<slicename>[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()),
+    #
+    (r'^management/requests/?$', portal.managementtabrequests.ManagementRequestsView.as_view()),
+    (r'^management/about/?$', portal.managementtababout.ManagementAboutView.as_view()),
+    #
+    url(r'^register/?$', RegistrationView.as_view(), name='registration'),
+    url(r'^contact/?$', ContactView.as_view(), name='contact'),
+    url(r'^terms/?$', TermsView.as_view(), name='terms'),
+    #
     url(r'^portal/', include('portal.urls')),
+
+    # SLA
+    url(r'^sla/', include('sla.urls')),
 ]
 
 #this one would not match the convention