X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=61f779f3834d781e0064fc11c6d1eb2bbdbecc07;hb=9fb4e38d727d9f6d3e1fbc60742a5ee433d7d3b6;hp=0d0e1cce9f1e725edcd0ace8e092073268aea1fd;hpb=2a8e0a73ca07126470cca0fd845979f62693af8b;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 0d0e1cce..61f779f3 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -12,7 +12,12 @@ import components
 # admin.autodiscover()
 
 # to enable insert_above stuff
-from django.template.loader import add_to_builtins
+# add_to_builtins has changed location with django-1.7
+# also note this will probably go away some day
+try:
+    from django.template.loader import add_to_builtins
+except:
+    from django.template.base import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
 from settings import auxiliaries, INSTALLED_APPS
@@ -37,6 +42,9 @@ platforms_view=portal.platformsview.PlatformsView.as_view()
 import portal.sliceview
 import portal.sliceresourceview
 
+# Testing sfa rest
+import portal.resources
+
 import portal.slicetabexperiment
 import portal.slicetabinfo
 import portal.slicetabtestbeds
@@ -83,6 +91,8 @@ urls = [
     (r'^credentials/(?P<action>[^/]+)/?$', 'rest.credentials.dispatch'),
     (r'^cache/(?P<action>[^/]+)/?$', 'rest.cache.dispatch'),
     (r'^initscript/(?P<action>[^/]+)/?$', 'rest.initscript.dispatch'),
+    (r'^authority/(?P<action>[^/]+)/?$', 'rest.authority.dispatch'),
+    (r'^portal_version/?$', 'rest.portal_version.dispatch'),
     #
     # REST monitoring
     (r'^monitor/services/?$', 'rest.monitor.servicesStatus'),
@@ -97,6 +107,9 @@ urls = [
     (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()),
+
+    # Testing sfa rest
+    (r'^sfa_resources/(?P<slicename>[^/]+)/?$', portal.resources.ResourcesView.as_view()),
     
     (r'^slice/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
     (r'^info/(?P<slicename>[^/]+)/?$', portal.slicetabinfo.SliceInfoView.as_view()),
@@ -121,7 +134,7 @@ urls = [
     url(r'^portal/', include('portal.urls')),
 
     # SLA
-#    url(r'^sla/', include('sla.urls')),
+    #url(r'^sla/', include('sla.urls')),
 ]
 
 urls.extend( components.urls() )