Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

[myslice.git] / myslice / urls.py

diff --git a/myslice/urls.py b/myslice/urls.py
index e64eb59..7b8dea1 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -17,6 +17,8 @@ import portal.dashboardview
 import portal.homeview
 import portal.newsview
 
+import plugins.cafe.edelberto
+
 from portal.about                   import AboutView
 from portal.registrationview        import RegistrationView
 from portal.accountview             import AccountView, account_process
@@ -90,7 +92,7 @@ urls = [
     (r'^credentials/(?P<action>[^/]+)/?$', 'rest.credentials.dispatch'),
     #
     # REST monitoring
-    #(r'^monitor/sfa/getversion/?$', 'rest.monitor.sfaGetVersion'),
+    (r'^monitor/services/?$', 'rest.monitor.servicesStatus'),
     #
     #(r'^view/?', include('view.urls')),
     #(r'^list/slices', 'view.list.slices')
@@ -134,3 +136,10 @@ for aux in auxiliaries:
         urls.append ( url ( r'^%s/'%aux, include ('%s.urls'%aux )))
 
 urlpatterns = patterns(*urls)
+
+# Shibboleth - Edelberto
+urlpatterns += patterns('',
+   url(r'^cafe/', plugins.cafe.edelberto.EdelbertoView.as_view()),
+   #url(r'^cafe/', 'plugins.cafe.edelberto.index'),
+)
+