X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=cdffb4dd0f406cb4e3285e7032dbab9d5642feeb;hb=34acca9fec26818e5ca94e88c1c4c537458182d3;hp=ad151789a0a6788b4bb925ee25221de8376671d6;hpb=3767be0431acff930350879b9562688f31484163;p=myslice.git

diff --git a/myslice/urls.py b/myslice/urls.py
index ad151789..cdffb4dd 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -12,18 +12,27 @@ 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
 
+from unfold.loginrequired import LoginRequiredView
+
 import portal.about
+import portal.certificate
 import portal.institution
 import portal.registrationview
 import portal.accountview
 import portal.contactview
 import portal.termsview
 import portal.supportview
+import portal.omn
 
 import portal.platformsview
 import portal.dashboardview
@@ -37,7 +46,11 @@ platforms_view=portal.platformsview.PlatformsView.as_view()
 import portal.sliceview
 import portal.sliceresourceview
 
+# Testing sfa rest
+import portal.resources
+
 import portal.slicetabexperiment
+import portal.slicetabcloud
 import portal.slicetabinfo
 import portal.slicetabtestbeds
 import portal.slicetabusers
@@ -65,7 +78,7 @@ urls = [
     # seems to be what login_required uses to redirect ...
     (r'^accounts/login/$', portal.homeview.HomeView.as_view()),
     (r'^login/?$', portal.homeview.HomeView.as_view()),
-    (r'^logout/?$', 'auth.views.logout_user'),
+    (r'^logout/?$', 'localauth.views.logout_user'),
     #
     # the manifold proxy
     (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifoldapi.manifoldproxy.proxy'),
@@ -79,9 +92,12 @@ 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'^local_user/(?P<action>[^/]+)/?$', 'rest.local_user.dispatch'),
     (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'),
@@ -96,12 +112,18 @@ 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()),
+    (r'^my_url/?$', portal.omn.OMNView.as_view()),
+    (r'^ontology/?$', portal.omn.OMNView.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()),
     (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'^cloud/(?P<slicename>[^/]+)/?$', portal.slicetabcloud.CloudView.as_view()),
     
     
     url(r'^about/?$', portal.about.AboutView.as_view(), name='about'),
@@ -112,6 +134,7 @@ urls = [
     #
     url(r'^register/?$', portal.registrationview.RegistrationView.as_view(), name='registration'),
     url(r'^account/?$', portal.accountview.AccountView.as_view(), name='account'),
+    url(r'^get_cert/?$', portal.certificate.CertificateView.as_view(), name='certificate'),
     url(r'^account/account_process/?$', portal.accountview.account_process),
     url(r'^contact/?$', portal.contactview.ContactView.as_view(), name='contact'),
     url(r'^terms/?$', portal.termsview.TermsView.as_view(), name='terms'),
@@ -120,7 +143,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() )