Renamed file

Signed-off-by: Owais Kazi <[email protected]>

src/main/java/org/opensearch/flowframework/common/WorkflowResources.java

@@ -20,9 +20,9 @@
 import org.opensearch.flowframework.workflow.DeleteModelGroupStep;
 import org.opensearch.flowframework.workflow.DeleteModelStep;
 import org.opensearch.flowframework.workflow.DeployModelStep;
-import org.opensearch.flowframework.workflow.ModelGroupStep;
 import org.opensearch.flowframework.workflow.RegisterAgentStep;
 import org.opensearch.flowframework.workflow.RegisterLocalModelStep;
+import org.opensearch.flowframework.workflow.RegisterModelGroupStep;
 import org.opensearch.flowframework.workflow.RegisterRemoteModelStep;
 import org.opensearch.flowframework.workflow.UndeployModelStep;
 
@@ -41,8 +41,8 @@ public enum WorkflowResources {
     REGISTER_REMOTE_MODEL(RegisterRemoteModelStep.NAME, WorkflowResources.MODEL_ID, DeleteModelStep.NAME),
     /** Workflow steps for registering/deleting a local model and associated created resource */
     REGISTER_LOCAL_MODEL(RegisterLocalModelStep.NAME, WorkflowResources.MODEL_ID, DeleteModelStep.NAME),
-    /** Workflow steps for registering a model group and associated created resource */
-    REGISTER_MODEL_GROUP(ModelGroupStep.NAME, WorkflowResources.MODEL_GROUP_ID, DeleteModelGroupStep.NAME),
+    /** Workflow steps for registering/deleting a model group and associated created resource */
+    REGISTER_MODEL_GROUP(RegisterModelGroupStep.NAME, WorkflowResources.MODEL_GROUP_ID, DeleteModelGroupStep.NAME),
     /** Workflow steps for deploying/undeploying a model and associated created resource */
     DEPLOY_MODEL(DeployModelStep.NAME, WorkflowResources.MODEL_ID, UndeployModelStep.NAME),
     /** Workflow steps for creating an ingest-pipeline and associated created resource */

src/main/java/org/opensearch/flowframework/workflow/ModelGroupStep.java → src/main/java/org/opensearch/flowframework/workflow/RegisterModelGroupStep.java

@@ -39,23 +39,23 @@
 /**
  * Step to register a model group
  */
-public class ModelGroupStep implements WorkflowStep {
+public class RegisterModelGroupStep implements WorkflowStep {
 
-    private static final Logger logger = LogManager.getLogger(ModelGroupStep.class);
+    private static final Logger logger = LogManager.getLogger(RegisterModelGroupStep.class);
 
     private final MachineLearningNodeClient mlClient;
 
     private final FlowFrameworkIndicesHandler flowFrameworkIndicesHandler;
 
     /** The name of this step, used as a key in the template and the {@link WorkflowStepFactory} */
-    public static final String NAME = "model_group";
+    public static final String NAME = "register_model_group";
 
     /**
      * Instantiate this class
      * @param mlClient client to instantiate MLClient
      * @param flowFrameworkIndicesHandler FlowFrameworkIndicesHandler class to update system indices
      */
-    public ModelGroupStep(MachineLearningNodeClient mlClient, FlowFrameworkIndicesHandler flowFrameworkIndicesHandler) {
+    public RegisterModelGroupStep(MachineLearningNodeClient mlClient, FlowFrameworkIndicesHandler flowFrameworkIndicesHandler) {
         this.mlClient = mlClient;
         this.flowFrameworkIndicesHandler = flowFrameworkIndicesHandler;
     }

src/main/java/org/opensearch/flowframework/workflow/WorkflowStepFactory.java

@@ -62,7 +62,7 @@ public WorkflowStepFactory(
         stepMap.put(UndeployModelStep.NAME, () -> new UndeployModelStep(mlClient));
         stepMap.put(CreateConnectorStep.NAME, () -> new CreateConnectorStep(mlClient, flowFrameworkIndicesHandler));
         stepMap.put(DeleteConnectorStep.NAME, () -> new DeleteConnectorStep(mlClient));
-        stepMap.put(ModelGroupStep.NAME, () -> new ModelGroupStep(mlClient, flowFrameworkIndicesHandler));
+        stepMap.put(RegisterModelGroupStep.NAME, () -> new RegisterModelGroupStep(mlClient, flowFrameworkIndicesHandler));
         stepMap.put(DeleteModelGroupStep.NAME, DeleteModelGroupStep::new);
         stepMap.put(ToolStep.NAME, ToolStep::new);
         stepMap.put(RegisterAgentStep.NAME, () -> new RegisterAgentStep(mlClient, flowFrameworkIndicesHandler));

src/main/resources/mappings/workflow-steps.json

@@ -123,7 +123,7 @@
             "opensearch-ml"
         ]
     },
-    "model_group": {
+    "register_model_group": {
         "inputs":[
             "name"
         ],

src/test/java/org/opensearch/flowframework/workflow/ModelGroupStepTests.java

@@ -73,7 +73,7 @@ public void testRegisterModelGroup() throws ExecutionException, InterruptedExcep
         String modelGroupId = MODEL_GROUP_ID;
         String status = MLTaskState.CREATED.name();
 
-        ModelGroupStep modelGroupStep = new ModelGroupStep(machineLearningNodeClient, flowFrameworkIndicesHandler);
+        RegisterModelGroupStep modelGroupStep = new RegisterModelGroupStep(machineLearningNodeClient, flowFrameworkIndicesHandler);
 
         @SuppressWarnings("unchecked")
         ArgumentCaptor<ActionListener<MLRegisterModelGroupResponse>> actionListenerCaptor = ArgumentCaptor.forClass(ActionListener.class);
@@ -107,7 +107,7 @@ public void testRegisterModelGroup() throws ExecutionException, InterruptedExcep
     }
 
     public void testRegisterModelGroupFailure() throws IOException {
-        ModelGroupStep modelGroupStep = new ModelGroupStep(machineLearningNodeClient, flowFrameworkIndicesHandler);
+        RegisterModelGroupStep modelGroupStep = new RegisterModelGroupStep(machineLearningNodeClient, flowFrameworkIndicesHandler);
 
         @SuppressWarnings("unchecked")
         ArgumentCaptor<ActionListener<MLRegisterModelGroupResponse>> actionListenerCaptor = ArgumentCaptor.forClass(ActionListener.class);
@@ -135,7 +135,7 @@ public void testRegisterModelGroupFailure() throws IOException {
     }
 
     public void testRegisterModelGroupWithNoName() throws IOException {
-        ModelGroupStep modelGroupStep = new ModelGroupStep(machineLearningNodeClient, flowFrameworkIndicesHandler);
+        RegisterModelGroupStep modelGroupStep = new RegisterModelGroupStep(machineLearningNodeClient, flowFrameworkIndicesHandler);
 
         CompletableFuture<WorkflowData> future = modelGroupStep.execute(
             inputDataWithNoName.getNodeId(),