X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=e84525933b38e07a983cf1cbb48fb8a3e31a1ed9;hb=af8400d08628917ac20abca26801a8666eaaff9e;hp=15121bfc618836ad117bdf3e2ab8a74c081a90e0;hpb=3decb43fcae0a5df9d9c0ccee50e208956453d12;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 15121bfc..e8452593 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -15,6 +15,10 @@ 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.termsview               import TermsView
 
 home_view=portal.homeview.HomeView.as_view()
 dashboard_view=portal.dashboardview.DashboardView.as_view()
@@ -27,7 +31,11 @@ import portal.sliceresourceview
 import portal.slicetabexperiment
 import portal.slicetabinfo
 import portal.slicetabtestbeds
-import portal.slicetabusers 
+import portal.slicetabusers
+import portal.slicetabmeasurements 
+
+import portal.managementtababout
+import portal.managementtabrequests
 
 #### high level choices
 # main entry point (set to the / URL)
@@ -72,22 +80,36 @@ urls = [
     (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')
     #
     #
     # 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'^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