added rest and new views urls

[unfold.git] / myslice / urls.py

diff --git a/myslice/urls.py b/myslice/urls.py
index 6419726..74cb7eb 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -1,5 +1,6 @@
 from django.conf.urls import patterns, include, url
 from django.conf      import settings
+from django.contrib import admin
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
@@ -19,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...
@@ -29,7 +34,7 @@ the_after_login_view=dashboard_view
 # where to redirect when login is required
 # might need another one ?
 the_login_view=home_view
-
+admin.autodiscover()
 urls = [
     '',
     # Examples:
@@ -38,7 +43,7 @@ urls = [
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     # Uncomment the next line to enable the admin:
-    # url(r'^admin/', include(admin.site.urls)),
+     url(r'^admin/', include(admin.site.urls)),
     #
     # default / view
     (r'^/?$', the_default_view),
@@ -52,9 +57,22 @@ 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'^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')
+    #
     #
     # Portal
+    (r'^testbed/?$', portal.testbedlist.TestbedList.as_view()),
+    (r'^slice/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
     url(r'^portal/', include('portal.urls')),
 ]