diff --git a/clipper_admin/clipper_admin/clipper_admin.py b/clipper_admin/clipper_admin/clipper_admin.py index b640af0a2..ab5cb96f0 100644 --- a/clipper_admin/clipper_admin/clipper_admin.py +++ b/clipper_admin/clipper_admin/clipper_admin.py @@ -236,6 +236,11 @@ def register_application(self, name, input_type, default_output, app=name)) def delete_application(self, name): + # See: https://github.com/ucbrise/clipper/issues/603 + self.logger.warning("[DEPRECATED] Use 'unregister_application' API instead of this.") + self.unregister_application(name) + + def unregister_application(self, name): if not self.connected: raise UnconnectedException() @@ -252,7 +257,7 @@ def delete_application(self, name): raise ClipperException(msg) else: self.logger.info( - "Application {app} was successfully deleted".format(app=name)) + "Application {app} was successfully unregistered".format(app=name)) def link_model_to_app(self, app_name, model_name): """Routes requests from the specified app to be evaluted by the specified model. diff --git a/integration-tests/clipper_admin_tests.py b/integration-tests/clipper_admin_tests.py index 797e8b06b..3d10e4cbc 100644 --- a/integration-tests/clipper_admin_tests.py +++ b/integration-tests/clipper_admin_tests.py @@ -91,14 +91,14 @@ def test_link_not_registered_model_to_app_fails(self): self.clipper_conn.link_model_to_app(app_name, not_deployed_model) self.assertTrue("No model with name" in str(context.exception)) - def test_delete_application_correct(self): + def test_unregister_application_correct(self): input_type = "doubles" default_output = "DEFAULT" slo_micros = 30000 app_name = "testapp" self.clipper_conn.register_application(app_name, input_type, default_output, slo_micros) - self.clipper_conn.delete_application(app_name) + self.clipper_conn.unregister_application(app_name) registered_applications = self.clipper_conn.get_all_apps() self.assertEqual(len(registered_applications), 0) self.assertTrue(app_name not in registered_applications) @@ -850,8 +850,8 @@ def test_remove_inactive_container(self): 'test_register_py_endpoint', 'test_test_predict_function', 'test_build_model_with_custom_packages', - 'test_delete_application_correct', - 'test_query_specific_model_version' + 'test_unregister_application_correct', + 'test_query_specific_model_version', ] LONG_TEST_ORDERING = [