diff --git a/cms/envs/bok_choy.auth.json b/cms/envs/bok_choy.auth.json index e0b60afbd3..79dbf904c1 100644 --- a/cms/envs/bok_choy.auth.json +++ b/cms/envs/bok_choy.auth.json @@ -81,14 +81,6 @@ } } }, - "OPEN_ENDED_GRADING_INTERFACE": { - "grading_controller": "grading_controller", - "password": "password", - "peer_grading": "peer_grading", - "staff_grading": "staff_grading", - "url": "http://localhost:18060/", - "username": "lms" - }, "DJFS": { "type": "s3fs", "bucket": "test", diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/common/lib/xmodule/xmodule/tests/__init__.py index d66e4b8e22..498e145479 100644 --- a/common/lib/xmodule/xmodule/tests/__init__.py +++ b/common/lib/xmodule/xmodule/tests/__init__.py @@ -41,16 +41,6 @@ MODULE_DIR = path(__file__).dirname() DATA_DIR = MODULE_DIR.parent.parent.parent.parent / "test" / "data" -open_ended_grading_interface = { - 'url': 'blah/', - 'username': 'incorrect_user', - 'password': 'incorrect_pass', - 'staff_grading': 'staff_grading', - 'peer_grading': 'peer_grading', - 'grading_controller': 'grading_controller', -} - - class TestModuleSystem(ModuleSystem): # pylint: disable=abstract-method """ ModuleSystem for testing @@ -150,7 +140,6 @@ def get_test_system(course_id=SlashSeparatedCourseKey('org', 'course', 'run')): }, node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules"), anonymous_student_id='student', - open_ended_grading_interface=open_ended_grading_interface, course_id=course_id, error_descriptor_class=ErrorDescriptor, get_user_role=Mock(name='get_test_system.get_user_role', is_staff=False), diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py index 0f926053b9..6bea61a777 100644 --- a/common/lib/xmodule/xmodule/x_module.py +++ b/common/lib/xmodule/xmodule/x_module.py @@ -1583,7 +1583,6 @@ class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): replace_urls, descriptor_runtime, user=None, filestore=None, debug=False, hostname="", xqueue=None, publish=None, node_path="", anonymous_student_id='', course_id=None, - open_ended_grading_interface=None, s3_interface=None, cache=None, can_execute_unsafe_code=None, replace_course_urls=None, replace_jump_to_id_urls=None, error_descriptor_class=None, get_real_user=None, field_data=None, get_user_role=None, rebind_noauth_module_to_user=None, @@ -1678,9 +1677,6 @@ class ModuleSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): if publish: self.publish = publish - self.open_ended_grading_interface = open_ended_grading_interface - self.s3_interface = s3_interface - self.cache = cache or DoNothingCache() self.can_execute_unsafe_code = can_execute_unsafe_code or (lambda: False) self.get_python_lib_zip = get_python_lib_zip or (lambda: None) diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py index 59ea974f8a..0620c0af7a 100644 --- a/lms/djangoapps/courseware/module_render.py +++ b/lms/djangoapps/courseware/module_render.py @@ -412,31 +412,6 @@ def get_module_system_for_user(user, student_data, # TODO # pylint: disable=to 'waittime': settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS } - # This is a hacky way to pass settings to the combined open ended xmodule - # It needs an S3 interface to upload images to S3 - # It needs the open ended grading interface in order to get peer grading to be done - # this first checks to see if the descriptor is the correct one, and only sends settings if it is - - # Get descriptor metadata fields indicating needs for various settings - needs_open_ended_interface = getattr(descriptor, "needs_open_ended_interface", False) - needs_s3_interface = getattr(descriptor, "needs_s3_interface", False) - - # Initialize interfaces to None - open_ended_grading_interface = None - s3_interface = None - - # Create interfaces if needed - if needs_open_ended_interface: - open_ended_grading_interface = settings.OPEN_ENDED_GRADING_INTERFACE - open_ended_grading_interface['mock_peer_grading'] = settings.MOCK_PEER_GRADING - open_ended_grading_interface['mock_staff_grading'] = settings.MOCK_STAFF_GRADING - if needs_s3_interface: - s3_interface = { - 'access_key': getattr(settings, 'AWS_ACCESS_KEY_ID', ''), - 'secret_access_key': getattr(settings, 'AWS_SECRET_ACCESS_KEY', ''), - 'storage_bucket_name': getattr(settings, 'AWS_STORAGE_BUCKET_NAME', 'openended') - } - def inner_get_module(descriptor): """ Delegate to get_module_for_descriptor_internal() with all values except `descriptor` set. @@ -725,8 +700,6 @@ def get_module_system_for_user(user, student_data, # TODO # pylint: disable=to publish=publish, anonymous_student_id=anonymous_student_id, course_id=course_id, - open_ended_grading_interface=open_ended_grading_interface, - s3_interface=s3_interface, cache=cache, can_execute_unsafe_code=(lambda: can_execute_unsafe_code(course_id)), get_python_lib_zip=(lambda: get_python_lib_zip(contentstore, course_id)), diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 5fcaa2f4f1..38d61de346 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -449,9 +449,6 @@ CONTENTSTORE = AUTH_TOKENS.get('CONTENTSTORE', CONTENTSTORE) DOC_STORE_CONFIG = AUTH_TOKENS.get('DOC_STORE_CONFIG', DOC_STORE_CONFIG) MONGODB_LOG = AUTH_TOKENS.get('MONGODB_LOG', {}) -OPEN_ENDED_GRADING_INTERFACE = AUTH_TOKENS.get('OPEN_ENDED_GRADING_INTERFACE', - OPEN_ENDED_GRADING_INTERFACE) - EMAIL_HOST_USER = AUTH_TOKENS.get('EMAIL_HOST_USER', '') # django default is '' EMAIL_HOST_PASSWORD = AUTH_TOKENS.get('EMAIL_HOST_PASSWORD', '') # django default is '' diff --git a/lms/envs/bok_choy.auth.json b/lms/envs/bok_choy.auth.json index 719f72ccf9..c8b83d25bd 100644 --- a/lms/envs/bok_choy.auth.json +++ b/lms/envs/bok_choy.auth.json @@ -108,14 +108,6 @@ } } }, - "OPEN_ENDED_GRADING_INTERFACE": { - "grading_controller": "grading_controller", - "password": "password", - "peer_grading": "peer_grading", - "staff_grading": "staff_grading", - "url": "** OVERRIDDEN **", - "username": "lms" - }, "SECRET_KEY": "", "DJFS": { "type": "s3fs", diff --git a/lms/envs/bok_choy.py b/lms/envs/bok_choy.py index af4fcc007b..9fafef82c0 100644 --- a/lms/envs/bok_choy.py +++ b/lms/envs/bok_choy.py @@ -87,9 +87,6 @@ GRADES_DOWNLOAD = { # Configure the LMS to use our stub XQueue implementation XQUEUE_INTERFACE['url'] = 'http://localhost:8040' -# Configure the LMS to use our stub ORA implementation -OPEN_ENDED_GRADING_INTERFACE['url'] = 'http://localhost:8041/' - # Configure the LMS to use our stub EdxNotes implementation EDXNOTES_PUBLIC_API = 'http://localhost:8042/api/v1' EDXNOTES_INTERNAL_API = 'http://localhost:8042/api/v1' diff --git a/lms/envs/dev.py b/lms/envs/dev.py index c9d7d98d3b..5c48e6ca0b 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -175,17 +175,6 @@ if os.path.isdir(DATA_DIR): EDX_PLATFORM_VERSION_STRING = os.popen('cd %s; git describe' % REPO_ROOT).read().strip() -############################ Open ended grading config ##################### - -OPEN_ENDED_GRADING_INTERFACE = { - 'url': 'http://127.0.0.1:3033/', - 'username': 'lms', - 'password': 'abcd', - 'staff_grading': 'staff_grading', - 'peer_grading': 'peer_grading', - 'grading_controller': 'grading_controller' -} - ############################## LMS Migration ################################## FEATURES['ENABLE_LMS_MIGRATION'] = True FEATURES['XQA_SERVER'] = 'http://xqa:server@content-qa.edX.mit.edu/xqa'