From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 25 Feb 2014 18:09:46 +0000 (+0100)
Subject: added rest and new views urls
X-Git-Tag: myslice-1.1~302
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1a3dbfcbb3c5afc7ee2fea8af75b9c3fca34ed97;p=myslice.git

added rest and new views urls
---

diff --git a/myslice/urls.py b/myslice/urls.py
index 1e84db59..74cb7eb7 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -20,6 +20,10 @@ 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
+
+
 #### high level choices
 # main entry point (set to the / URL)
 # beware that if this view is broken you end up in an endless cycle...
@@ -58,15 +62,17 @@ urls = [
     #
     # RESTful interface
     (r'^rest/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
+    (r'^table/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
     (r'^datatable/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.dispatch'),
     #
     #
     #(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'^testbed/?$', portal.testbedlist.TestbedList.as_view()),
+    (r'^slice/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
     url(r'^portal/', include('portal.urls')),
 ]