fix model access mode upper case bug (#937) (#939)

* fix upper case bug

Signed-off-by: Yaliang Wu <[email protected]>

* create shared public model group in SecureMLRestIT

Signed-off-by: Yaliang Wu <[email protected]>

---------

Signed-off-by: Yaliang Wu <[email protected]>
(cherry picked from commit 7c39b1b)

Co-authored-by: Yaliang Wu <[email protected]>

Author: opensearch-trigger-bot[bot]

common/src/main/java/org/opensearch/ml/common/transport/model_group/MLRegisterModelGroupInput.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 
@@ -123,7 +124,7 @@ public static MLRegisterModelGroupInput parse(XContentParser parser) throws IOEx
                     }
                     break;
                 case MODEL_ACCESS_MODE:
-                    modelAccessMode = ModelAccessMode.from(parser.text());
+                    modelAccessMode = ModelAccessMode.from(parser.text().toLowerCase(Locale.ROOT));
                     break;
                 case ADD_ALL_BACKEND_ROLES:
                     isAddAllBackendRoles = parser.booleanValue();

common/src/main/java/org/opensearch/ml/common/transport/model_group/MLUpdateModelGroupInput.java

@@ -18,6 +18,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
 
@@ -133,7 +134,7 @@ public static MLUpdateModelGroupInput parse(XContentParser parser) throws IOExce
                     }
                     break;
                 case MODEL_ACCESS_MODE:
-                    modelAccessMode = ModelAccessMode.from(parser.text());
+                    modelAccessMode = ModelAccessMode.from(parser.text().toLowerCase(Locale.ROOT));
                     break;
                 case ADD_ALL_BACKEND_ROLES_FIELD:
                     isAddAllBackendRoles = parser.booleanValue();

plugin/src/test/java/org/opensearch/ml/rest/SecureMLRestIT.java

@@ -29,7 +29,6 @@
 import org.opensearch.search.builder.SearchSourceBuilder;
 
 import com.google.common.base.Throwables;
-import com.google.common.collect.ImmutableList;
 
 public class SecureMLRestIT extends MLCommonsRestTestCase {
     private String irisIndex = "iris_data_secure_ml_it";
@@ -53,6 +52,8 @@ public class SecureMLRestIT extends MLCommonsRestTestCase {
     @Rule
     public ExpectedException exceptionRule = ExpectedException.none();
 
+    private String modelGroupId;
+
     @Before
     public void setup() throws IOException {
         if (!isHttps()) {
@@ -102,8 +103,13 @@ public void setup() throws IOException {
         searchSourceBuilder.size(1000);
         searchSourceBuilder.fetchSource(new String[] { "petal_length_in_cm", "petal_width_in_cm" }, null);
 
-        mlRegisterModelInput = createRegisterModelInput("testModelGroupID");
-        mlRegisterModelGroupInput = createRegisterModelGroupInput(ImmutableList.of("role-1"), ModelAccessMode.RESTRICTED, false);
+        // Create public model group
+        mlRegisterModelGroupInput = createRegisterModelGroupInput(null, ModelAccessMode.PUBLIC, false);
+
+        registerModelGroup(mlFullAccessClient, TestHelper.toJsonString(mlRegisterModelGroupInput), registerModelGroupResult -> {
+            this.modelGroupId = (String) registerModelGroupResult.get("model_group_id");
+        });
+        mlRegisterModelInput = createRegisterModelInput(modelGroupId);
     }
 
     @After
@@ -157,29 +163,26 @@ public void testRegisterModelWithReadOnlyMLAccess() throws IOException {
     }
 
     public void testRegisterModelWithFullAccess() throws IOException {
-        registerModelGroup(mlFullAccessClient, TestHelper.toJsonString(mlRegisterModelGroupInput), registerModelGroupResult -> {
-            try {
-                String modelGroupId = (String) registerModelGroupResult.get("model_group_id");
-                MLRegisterModelInput mlRegisterModelInput = createRegisterModelInput(modelGroupId);
-                registerModel(mlFullAccessClient, TestHelper.toJsonString(mlRegisterModelInput), registerModelResult -> {
-                    assertFalse(registerModelResult.containsKey("model_id"));
-                    String taskId = (String) registerModelResult.get("task_id");
-                    assertNotNull(taskId);
-                    String status = (String) registerModelResult.get("status");
-                    assertEquals(MLTaskState.CREATED.name(), status);
-                    try {
-                        getTask(mlFullAccessClient, taskId, task -> {
-                            String algorithm = (String) task.get("function_name");
-                            assertEquals(FunctionName.TEXT_EMBEDDING.name(), algorithm);
-                        });
-                    } catch (IOException e) {
-                        assertNull(e);
-                    }
-                });
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        });
+        try {
+            MLRegisterModelInput mlRegisterModelInput = createRegisterModelInput(modelGroupId);
+            registerModel(mlFullAccessClient, TestHelper.toJsonString(mlRegisterModelInput), registerModelResult -> {
+                assertFalse(registerModelResult.containsKey("model_id"));
+                String taskId = (String) registerModelResult.get("task_id");
+                assertNotNull(taskId);
+                String status = (String) registerModelResult.get("status");
+                assertEquals(MLTaskState.CREATED.name(), status);
+                try {
+                    getTask(mlFullAccessClient, taskId, task -> {
+                        String algorithm = (String) task.get("function_name");
+                        assertEquals(FunctionName.TEXT_EMBEDDING.name(), algorithm);
+                    });
+                } catch (IOException e) {
+                    assertNull(e);
+                }
+            });
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public void testDeployModelWithNoAccess() throws IOException, InterruptedException {