X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Furls.py;h=ad151789a0a6788b4bb925ee25221de8376671d6;hb=5976423e0a726cb636a67bd77d61c8f36b23e7ce;hp=2745f9528037185c46f5a71feafd9409dad50466;hpb=458c89d8cb6991775a7d680e61867fa84ec6627d;p=unfold.git

diff --git a/myslice/urls.py b/myslice/urls.py
index 2745f952..ad151789 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -1,5 +1,11 @@
 from django.conf.urls import patterns, include, url
 from django.conf      import settings
+from django.contrib import admin
+
+##
+# components module
+##
+import components
 
 # Uncomment the next two lines to enable the admin:
 # from django.contrib import admin
@@ -9,26 +15,38 @@ from django.conf      import settings
 from django.template.loader import add_to_builtins
 add_to_builtins('insert_above.templatetags.insert_tags')
 
+from settings import auxiliaries, INSTALLED_APPS
+
+import portal.about
+import portal.institution
+import portal.registrationview
+import portal.accountview
+import portal.contactview
+import portal.termsview
+import portal.supportview
+
 import portal.platformsview
 import portal.dashboardview
 import portal.homeview
+import portal.newsview
+import portal.loginwidget
 
-home_view=portal.homeview.HomeView.as_view()
-dashboard_view=portal.dashboardview.DashboardView.as_view()
 platforms_view=portal.platformsview.PlatformsView.as_view()
 
-#### high level choices
-# main entry point (set to the / URL)
-# beware that if this view is broken you end up in an endless cycle...
-# maybe platforms_view would be best on the longer run
-the_default_view=home_view
-# where to be redirected after login
-the_after_login_view=home_view #dashboard_view
-# where to redirect when login is required
-# might need another one ?
-the_login_view=home_view
+#import portal.testbedlist
+import portal.sliceview
+import portal.sliceresourceview
+
+import portal.slicetabexperiment
+import portal.slicetabinfo
+import portal.slicetabtestbeds
+import portal.slicetabusers
+import portal.slicetabmeasurements 
 
-urlpatterns = patterns(
+import portal.managementtababout
+import portal.managementtabrequests
+
+urls = [
     '',
     # Examples:
     # url(r'^$', 'myslice.views.home', name='home'),
@@ -36,33 +54,82 @@ urlpatterns = patterns(
     # 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),
+    (r'^/?$', portal.homeview.HomeView.as_view()),
     #
     # login / logout
+    (r'^login-ok/?$', portal.dashboardview.DashboardView.as_view(), {'state': 'Welcome to MySlice'} ),
     #
-    (r'^login-ok/?$', the_after_login_view, {'state': 'Welcome to MySlice'} ),
     # seems to be what login_required uses to redirect ...
-    (r'^accounts/login/$', the_login_view),
-    (r'^login/?$', the_login_view),
+    (r'^accounts/login/$', portal.homeview.HomeView.as_view()),
+    (r'^login/?$', portal.homeview.HomeView.as_view()),
     (r'^logout/?$', 'auth.views.logout_user'),
     #
     # the manifold proxy
+    (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifoldapi.manifoldproxy.proxy'),
     #
-    (r'^manifold/proxy/(?P<format>\w+)/?$', 'manifold.manifoldproxy.proxy'),
+    #
+    # RESTful interface
+    (r'^rest/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.get.dispatch'),
+    (r'^sfa/(?P<method>[^/]+)/?$', 'rest.sfa_api.dispatch'),
+    (r'^table/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.get.dispatch'),
+    (r'^datatable/(?P<object_type>[^/]+)/(?P<object_name>[^/]+)?/?$', 'rest.get.dispatch'),
+    (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'),
+    (r'^cache/(?P<action>[^/]+)/?$', 'rest.cache.dispatch'),
+    (r'^initscript/(?P<action>[^/]+)/?$', 'rest.initscript.dispatch'),
+    #
+    # REST monitoring
+    (r'^monitor/services/?$', 'rest.monitor.servicesStatus'),
+    #
+    #(r'^view/?', include('view.urls')),
+    #(r'^list/slices', 'view.list.slices')
+    #
+    # Login widget to be used in an iframe
+    (r'^loginwidget/?$', portal.loginwidget.LoginWidget.as_view()),
     #
     # Portal
-    url(r'^portal/', include('portal.urls')),
-    # Portal
-    url(r'^sample/', include('sample.urls')),
-    # Debug
-    url(r'^debug/', include('debug_platform.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'^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/?$', portal.about.AboutView.as_view(), name='about'),
+    
+    url(r'^institution/?$', portal.institution.InstitutionView.as_view(), name='institution'),
+    (r'^management/requests/?$', portal.managementtabrequests.ManagementRequestsView.as_view()),
+    (r'^management/about/?$', portal.managementtababout.ManagementAboutView.as_view()),
     #
-    # various trash views - bound to go away 
+    url(r'^register/?$', portal.registrationview.RegistrationView.as_view(), name='registration'),
+    url(r'^account/?$', portal.accountview.AccountView.as_view(), name='account'),
+    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'),
+    url(r'^support/?$', portal.supportview.SupportView.as_view(), name='support'),
     #
-    url(r'^trash/', include('trash.urls')),
+    url(r'^portal/', include('portal.urls')),
+
+    # SLA
+#    url(r'^sla/', include('sla.urls')),
+]
+
+urls.extend( components.urls() )
+
+#this one would not match the convention
+# url(r'^debug/', include('debug_platform.urls')),
+# but it was commented out anyways
+for aux in auxiliaries:
+    if aux in INSTALLED_APPS:
+        urls.append ( url ( r'^%s/'%aux, include ('%s.urls' % aux )))
 
-)
+urlpatterns = patterns(*urls)