X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=a49156e159ace96d0bee0bfbf163779df0ed9b5e;hb=37f257599d0d5d754b10c33f4362c1f3cbb563da;hp=b1cb78ebe5f724f2e8a92a390a8136afd02962a3;hpb=ca08d77b6fbda4c2d94dc22eaa26b5d2e2458548;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index b1cb78eb..a49156e1 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -15,20 +15,21 @@ from settings import auxiliaries, INSTALLED_APPS
 import portal.platformsview
 import portal.dashboardview
 import portal.homeview
+import portal.newsview
 
 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.testbedlist
 import portal.sliceview
 import portal.sliceresourceview
 
 import portal.slicetabexperiment
 import portal.slicetabinfo
 import portal.slicetabtestbeds
-
-from portal.sliceuserview import SliceUserView 
+import portal.slicetabusers
+import portal.slicetabmeasurements 
 
 #### high level choices
 # main entry point (set to the / URL)
@@ -80,16 +81,19 @@ urls = [
     #
     #
     # 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'^users/(?P<slicename>[^/]+)/?$', SliceUserView.as_view()),
+    (r'^measurements/(?P<slicename>[^/]+)/?$', portal.slicetabmeasurements.SliceTabMeasurements.as_view()),
     (r'^experiment/(?P<slicename>[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()),
     url(r'^portal/', include('portal.urls')),
+
+    # SLA
+    url(r'^sla/', include('sla.urls')),
 ]
 
 #this one would not match the convention