git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
monitoring not yet active
[myslice.git]
/
myslice
/
urls.py
diff --git
a/myslice/urls.py
b/myslice/urls.py
index
403db6a
..
e845259
100644
(file)
--- a/
myslice/urls.py
+++ b/
myslice/urls.py
@@
-17,6
+17,9
@@
import portal.dashboardview
import portal.homeview
import portal.newsview
import portal.homeview
import portal.newsview
+from portal.registrationview import RegistrationView
+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()
home_view=portal.homeview.HomeView.as_view()
dashboard_view=portal.dashboardview.DashboardView.as_view()
platforms_view=portal.platformsview.PlatformsView.as_view()
@@
-31,6
+34,7
@@
import portal.slicetabtestbeds
import portal.slicetabusers
import portal.slicetabmeasurements
import portal.slicetabusers
import portal.slicetabmeasurements
+import portal.managementtababout
import portal.managementtabrequests
#### high level choices
import portal.managementtabrequests
#### high level choices
@@
-76,7
+80,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'^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/sfa/getversion/?$', 'rest.monitor.sfaGetVersion'),
#
#(r'^view/?', include('view.urls')),
#(r'^list/slices', 'view.list.slices')
#
#(r'^view/?', include('view.urls')),
#(r'^list/slices', 'view.list.slices')
@@
-94,6
+101,10
@@
urls = [
(r'^experiment/(?P<slicename>[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()),
#
(r'^management/requests/?$', portal.managementtabrequests.ManagementRequestsView.as_view()),
(r'^experiment/(?P<slicename>[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()),
#
(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'^terms/?$', TermsView.as_view(), name='terms'),
#
url(r'^portal/', include('portal.urls')),
#
url(r'^portal/', include('portal.urls')),