From e86046812a021f72cbb10daeb006117a7b7a5454 Mon Sep 17 00:00:00 2001 From: Amit Galitzky Date: Fri, 12 Jan 2024 16:30:05 -0800 Subject: [PATCH] removing deprovisioning Signed-off-by: Amit Galitzky --- .../rest/FlowFrameworkRestApiIT.java | 54 ++++++------------- 1 file changed, 17 insertions(+), 37 deletions(-) diff --git a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java index 814b23751..ba369be08 100644 --- a/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java +++ b/src/test/java/org/opensearch/flowframework/rest/FlowFrameworkRestApiIT.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static org.opensearch.flowframework.common.CommonValue.CREDENTIAL_FIELD; @@ -133,14 +134,12 @@ public void testCreateAndProvisionLocalModelWorkflow() throws Exception { assertEquals("deploy_model", resourcesCreated.get(1).workflowStepName()); assertNotNull(resourcesCreated.get(1).resourceId()); - // Deprovision the workflow to avoid opening circut breaker when running additional tests - Response deprovisionResponse = deprovisionWorkflow(workflowId); - - // wait for deprovision to complete - Thread.sleep(5000); + // We aren't deprovisiong the template because this is flaky on a multi node cluster. + // Deprovision the workflow to avoid opening circuit breaker when running additional tests + // Response deprovisionResponse = deprovisionWorkflow(workflowId); } - public void testCreateAndProvisionRemoteModelWorkflow() throws Exception { + public void testCreateAndProvisionCyclicalTemplate() throws Exception { // Using a 3 step template to create a connector, register remote model and deploy model Template template = TestHelpers.createTemplateFromFile("createconnector-registerremotemodel-deploymodel.json"); @@ -169,6 +168,12 @@ public void testCreateAndProvisionRemoteModelWorkflow() throws Exception { assertTrue(exception.getMessage().contains("Cycle detected")); assertTrue(exception.getMessage().contains("workflow_step_2->workflow_step_3")); assertTrue(exception.getMessage().contains("workflow_step_3->workflow_step_2")); + } + + public void testCreateAndProvisionRemoteModelWorkflow() throws Exception { + + // Using a 3 step template to create a connector, register remote model and deploy model + Template template = TestHelpers.createTemplateFromFile("createconnector-registerremotemodel-deploymodel.json"); // Hit Create Workflow API with original template Response response = createWorkflow(template); @@ -176,26 +181,18 @@ public void testCreateAndProvisionRemoteModelWorkflow() throws Exception { Map responseMap = entityAsMap(response); String workflowId = (String) responseMap.get(WORKFLOW_ID); - // Thread.sleep(1000); - // assertBusy( - // () -> { getAndAssertWorkflowStatus(workflowId, State.NOT_STARTED, ProvisioningProgress.NOT_STARTED); }, - // 30, - // TimeUnit.SECONDS - // ); + Thread.sleep(1000); + assertBusy( + () -> { getAndAssertWorkflowStatus(workflowId, State.NOT_STARTED, ProvisioningProgress.NOT_STARTED); }, + 30, + TimeUnit.SECONDS + ); // Hit Provision API and assert status response = provisionWorkflow(workflowId); assertEquals(RestStatus.OK, TestHelpers.restStatus(response)); Thread.sleep(1000); - // waitForProvisioningStatus(workflowId, ProvisioningProgress.DONE); - - // assertBusy( - // () -> { getAndAssertWorkflowStatus(workflowId, State.PROVISIONING, ProvisioningProgress.IN_PROGRESS); }, - // 30, - // TimeUnit.SECONDS - // ); - // Wait until provisioning has completed successfully before attempting to retrieve created resources List resourcesCreated = getResourcesCreated(workflowId, 90); @@ -208,11 +205,6 @@ public void testCreateAndProvisionRemoteModelWorkflow() throws Exception { assertEquals("deploy_model", resourcesCreated.get(2).workflowStepName()); assertNotNull(resourcesCreated.get(2).resourceId()); - // // Deprovision the workflow to avoid opening circut breaker when running additional tests - Response deprovisionResponse = deprovisionWorkflow(workflowId); - - // wait for deprovision to complete - Thread.sleep(5000); } public void testCreateAndProvisionAgentFrameworkWorkflow() throws Exception { @@ -245,18 +237,6 @@ public void testCreateAndProvisionAgentFrameworkWorkflow() throws Exception { assertEquals(5, resourcesCreated.size()); assertEquals(stepNames, expectedStepNames); assertNotNull(resourcesCreated.get(0).resourceId()); - - // Hit Deprovision API - Response deprovisionResponse = deprovisionWorkflow(workflowId); - // assertBusy( - // () -> { getAndAssertWorkflowStatus(workflowId, State.NOT_STARTED, ProvisioningProgress.NOT_STARTED); }, - // 60, - // TimeUnit.SECONDS - // ); - waitForProvisioningStatus(workflowId, ProvisioningProgress.NOT_STARTED); - // Hit Delete API - Response deleteResponse = deleteWorkflow(workflowId); - assertEquals(RestStatus.OK, TestHelpers.restStatus(deleteResponse)); } }