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

[unfold.git] / myslice / urls.py

diff --git a/myslice/urls.py b/myslice/urls.py
index 2638e4d..7b8dea1 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -17,6 +17,18 @@ 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
+from portal.institution             import InstitutionView
+
+from portal.supportview             import SupportView
+from portal.contactview             import ContactView
+
+from portal.termsview               import TermsView
+
 home_view=portal.homeview.HomeView.as_view()
 dashboard_view=portal.dashboardview.DashboardView.as_view()
 platforms_view=portal.platformsview.PlatformsView.as_view()
@@ -28,7 +40,11 @@ import portal.sliceresourceview
 import portal.slicetabexperiment
 import portal.slicetabinfo
 import portal.slicetabtestbeds
-import portal.slicetabusers 
+import portal.slicetabusers
+import portal.slicetabmeasurements 
+
+import portal.managementtababout
+import portal.managementtabrequests
 
 #### high level choices
 # main entry point (set to the / URL)
@@ -73,7 +89,10 @@ 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'^credentials/(?P<action>[^/]+)/?$', 'rest.credentials.dispatch'),
     #
+    # REST monitoring
+    (r'^monitor/services/?$', 'rest.monitor.servicesStatus'),
     #
     #(r'^view/?', include('view.urls')),
     #(r'^list/slices', 'view.list.slices')
@@ -87,8 +106,26 @@ urls = [
     (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()),
+    
+    url(r'^about/?$', AboutView.as_view(), name='about'),
+    
+    url(r'^institution/?$', InstitutionView.as_view(), name='institution'),
+    (r'^management/requests/?$', portal.managementtabrequests.ManagementRequestsView.as_view()),
+    (r'^management/about/?$', portal.managementtababout.ManagementAboutView.as_view()),
+    #
+    url(r'^register/?$', RegistrationView.as_view(), name='registration'),
+    url(r'^account/?$', AccountView.as_view(), name='account'),
+    url(r'^account/account_process/?$', account_process),
+    url(r'^contact/?$', ContactView.as_view(), name='contact'),
+    url(r'^terms/?$', TermsView.as_view(), name='terms'),
+    url(r'^support/?$', SupportView.as_view(), name='support'),
+    #
     url(r'^portal/', include('portal.urls')),
+
+    # SLA
+    url(r'^sla/', include('sla.urls')),
 ]
 
 #this one would not match the convention
@@ -99,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'),
+)
+