From: Loic Baron <loic.baron@lip6.fr>
Date: Wed, 17 Dec 2014 10:46:51 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~15^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=36a55939d5f370f1ff2b6021796e31edad21d1ff;hp=-c;p=unfold.git

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

Conflicts:
	myslice/settings.py
---

36a55939d5f370f1ff2b6021796e31edad21d1ff
diff --combined myslice/settings.py
index 6cca7f26,fe71e108..bd1474bd
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@@ -2,9 -2,6 +2,9 @@@
  
  import os.path
  
 +import djcelery
 +djcelery.setup_loader()
 +
  ### detect if we're in a build environment
  try:
      import manifold
@@@ -236,9 -233,6 +236,9 @@@ INSTALLED_APPS = 
      'south', 
      # Uncomment the next line to enable the admin:
       'django.contrib.admin',
 +	# FORGE Plugin app
 +	'djcelery',
 +	'forge',
      # Uncomment the next line to enable admin documentation:
      # 'django.contrib.admindocs',
      'portal',
@@@ -248,8 -242,6 +248,8 @@@
  # this app won't load in a build environment
  if not building: INSTALLED_APPS.append ('rest')
  
 +BROKER_URL = "amqp://myslice:myslice@localhost:5672/myslice"
 +
  for aux in auxiliaries:
      if os.path.isdir(os.path.join(ROOT,aux)): 
          print "Using devel auxiliary",aux
@@@ -286,7 -278,8 +286,8 @@@ LOGGING = 
      }
  }
  
- AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend','django.contrib.auth.backends.ModelBackend' )
+ AUTHENTICATION_BACKENDS = ('auth.manifoldbackend.ManifoldBackend',
+                            'django.contrib.auth.backends.ModelBackend')
  
  ### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
  # without this setting django will return a 403 forbidden error, which is fine
@@@ -300,6 -293,7 +301,7 @@@ CSRF_FAILURE_VIEW = 'manifoldapi.manifo
  
  ####SLA#####
  
- SLA_MANAGER_URL = "http://157.193.215.125:4000/sla-service"
- SLA_MANAGER_USER = "normal_user"
+ SLA_MANAGER_URL = "http://157.193.215.125:4001/sla-collector/sla"
+ #SLA_MANAGER_URL = "http://172.24.76.28:8000/sla"
+ SLA_MANAGER_USER = "portal"
  SLA_MANAGER_PASSWORD = "password"
diff --combined myslice/urls.py
index c50c08ff,af9a8007..5f4c7d4f
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@@ -44,8 -44,6 +44,8 @@@ import portal.slicetabmeasurement
  import portal.managementtababout
  import portal.managementtabrequests
  
 +import forge.views
 +
  #### high level choices
  # main entry point (set to the / URL)
  # beware that if this view is broken you end up in an endless cycle...
@@@ -84,6 -82,7 +84,7 @@@ urls = 
      #
      # 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'),
@@@ -108,7 -107,6 +109,7 @@@
      (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'^studentslabs/(?P<slicename>[^/]+)/?$', forge.views.CreateCourseViev.as_view()),
      
      url(r'^about/?$', AboutView.as_view(), name='about'),