diff --git a/lms/djangoapps/instructor/staff_grading_service.py b/lms/djangoapps/instructor/staff_grading_service.py index 5bff10bcda..05c131ed56 100644 --- a/lms/djangoapps/instructor/staff_grading_service.py +++ b/lms/djangoapps/instructor/staff_grading_service.py @@ -45,14 +45,14 @@ class StaffGradingService(object): """ Interface to staff grading backend. """ - def __init__(self, url, username, password): - self.username = username - self.password = password - self.url = url + def __init__(self, config): + self.username = config['username'] + self.password = config['password'] + self.url = config['url'] - self.login_url = url + '/login/' - self.get_next_url = url + '/get_next_submission/' - self.save_grade_url = url + '/save_grade/' + self.login_url = self.url + '/login/' + self.get_next_url = self.url + '/get_next_submission/' + self.save_grade_url = self.url + '/save_grade/' # TODO: add auth self.session = requests.session() @@ -140,10 +140,7 @@ class StaffGradingService(object): return r.text -_service = StaffGradingService(settings.STAFF_GRADING_BACKEND_URL, - settings.STAFF_GRADING_BACKEND_USERNAME, - settings.STAFF_GRADING_BACKEND_PASSWORD, - ) +_service = StaffGradingService(settings.STAFF_GRADING_INTERFACE) #_service = MockStaffGradingService() def _err_response(msg): diff --git a/lms/envs/aws.py b/lms/envs/aws.py index b58bc5602b..d1abce8a6d 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -76,5 +76,8 @@ DATABASES = AUTH_TOKENS['DATABASES'] XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE'] +STAFF_GRADING_BACKEND = AUTH_TOKENS.get('STAFF_GRADING_INTERFACE') + + PEARSON_TEST_USER = "pearsontest" PEARSON_TEST_PASSWORD = AUTH_TOKENS.get("PEARSON_TEST_PASSWORD") diff --git a/lms/envs/common.py b/lms/envs/common.py index 005d333e09..3d26cb54c9 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -324,9 +324,7 @@ WIKI_LINK_DEFAULT_LEVEL = 2 ################################# Staff grading config ##################### -STAFF_GRADING_BACKEND_URL = None -STAFF_GRADING_BACKEND_USERNAME = None -STAFF_GRADING_BACKEND_PASSWORD = None +STAFF_GRADING_INTERFACE = None ################################# Jasmine ################################### JASMINE_TEST_DIRECTORY = PROJECT_ROOT + '/static/coffee' diff --git a/lms/envs/dev.py b/lms/envs/dev.py index f3cc3e4c63..0ad42f67d3 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -39,7 +39,7 @@ DATABASES = { } CACHES = { - # This is the cache used for most things. + # This is the cache used for most things. # In staging/prod envs, the sessions also live here. 'default': { 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', @@ -104,10 +104,11 @@ COMMENTS_SERVICE_KEY = "PUT_YOUR_API_KEY_HERE" ################################# Staff grading config ##################### -STAFF_GRADING_BACKEND_URL = "http://127.0.0.1:3033/staff_grading" -STAFF_GRADING_BACKEND_USERNAME = "lms" -STAFF_GRADING_BACKEND_PASSWORD = "abcd" - +STAFF_GRADING_INTERFACE = { + 'url': 'http://127.0.0.1:3033/staff_grading', + 'username': 'lms', + 'password': 'abcd', + } ################################ LMS Migration ################################# MITX_FEATURES['ENABLE_LMS_MIGRATION'] = True