Commit d28cd4f4 by Victor Shnayder

use a dict for backend config. Load it on aws.

parent b48b389a
...@@ -45,14 +45,14 @@ class StaffGradingService(object): ...@@ -45,14 +45,14 @@ class StaffGradingService(object):
""" """
Interface to staff grading backend. Interface to staff grading backend.
""" """
def __init__(self, url, username, password): def __init__(self, config):
self.username = username self.username = config['username']
self.password = password self.password = config['password']
self.url = url self.url = config['url']
self.login_url = url + '/login/' self.login_url = self.url + '/login/'
self.get_next_url = url + '/get_next_submission/' self.get_next_url = self.url + '/get_next_submission/'
self.save_grade_url = url + '/save_grade/' self.save_grade_url = self.url + '/save_grade/'
# TODO: add auth # TODO: add auth
self.session = requests.session() self.session = requests.session()
...@@ -140,10 +140,7 @@ class StaffGradingService(object): ...@@ -140,10 +140,7 @@ class StaffGradingService(object):
return r.text return r.text
_service = StaffGradingService(settings.STAFF_GRADING_BACKEND_URL, _service = StaffGradingService(settings.STAFF_GRADING_INTERFACE)
settings.STAFF_GRADING_BACKEND_USERNAME,
settings.STAFF_GRADING_BACKEND_PASSWORD,
)
#_service = MockStaffGradingService() #_service = MockStaffGradingService()
def _err_response(msg): def _err_response(msg):
......
...@@ -76,5 +76,8 @@ DATABASES = AUTH_TOKENS['DATABASES'] ...@@ -76,5 +76,8 @@ DATABASES = AUTH_TOKENS['DATABASES']
XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE'] XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
STAFF_GRADING_BACKEND = AUTH_TOKENS.get('STAFF_GRADING_INTERFACE')
PEARSON_TEST_USER = "pearsontest" PEARSON_TEST_USER = "pearsontest"
PEARSON_TEST_PASSWORD = AUTH_TOKENS.get("PEARSON_TEST_PASSWORD") PEARSON_TEST_PASSWORD = AUTH_TOKENS.get("PEARSON_TEST_PASSWORD")
...@@ -324,9 +324,7 @@ WIKI_LINK_DEFAULT_LEVEL = 2 ...@@ -324,9 +324,7 @@ WIKI_LINK_DEFAULT_LEVEL = 2
################################# Staff grading config ##################### ################################# Staff grading config #####################
STAFF_GRADING_BACKEND_URL = None STAFF_GRADING_INTERFACE = None
STAFF_GRADING_BACKEND_USERNAME = None
STAFF_GRADING_BACKEND_PASSWORD = None
################################# Jasmine ################################### ################################# Jasmine ###################################
JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee' JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee'
......
...@@ -104,10 +104,11 @@ COMMENTS_SERVICE_KEY = "PUT_YOUR_API_KEY_HERE" ...@@ -104,10 +104,11 @@ COMMENTS_SERVICE_KEY = "PUT_YOUR_API_KEY_HERE"
################################# Staff grading config ##################### ################################# Staff grading config #####################
STAFF_GRADING_BACKEND_URL = "http://127.0.0.1:3033/staff_grading" STAFF_GRADING_INTERFACE = {
STAFF_GRADING_BACKEND_USERNAME = "lms" 'url': 'http://127.0.0.1:3033/staff_grading',
STAFF_GRADING_BACKEND_PASSWORD = "abcd" 'username': 'lms',
'password': 'abcd',
}
################################ LMS Migration ################################# ################################ LMS Migration #################################
MITX_FEATURES['ENABLE_LMS_MIGRATION'] = True MITX_FEATURES['ENABLE_LMS_MIGRATION'] = True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment