Minor fix

Author: grussorusso

internal/api/workflow.go

@@ -171,6 +171,8 @@ func ResumeWorkflow(e echo.Context) error {
 
 	if clientReq.Plan.ToExecute != nil {
 		req.Plan = &workflow.ExecutionPlan{ToExecute: clientReq.Plan.ToExecute}
+	} else {
+		req.Plan = nil
 	}
 
 	log.Printf("Resuming workflow '%s'", workflowName)
@@ -201,6 +203,7 @@ func InvokeWorkflow(e echo.Context) error {
 	req.QoS = clientReq.QoS
 	req.CanDoOffloading = clientReq.CanDoOffloading
 	req.Async = clientReq.Async
+	req.Plan = nil
 	req.Resuming = false
 	req.Id = fmt.Sprintf("%v-%s%d", wflow.Name, node.NodeIdentifier[len(node.NodeIdentifier)-5:], req.Arrival.Nanosecond())
 	req.ExecReport.Reports = map[string]*function.ExecutionReport{}
@@ -222,6 +225,7 @@ func handleWorkflowInvocation(e echo.Context, req *workflow.Request) error {
 				return
 			}
 
+			log.Printf("Invocation succeeded. Publishing: %v", req.ExecReport)
 			req.ExecReport.ResponseTime = time.Now().Sub(req.Arrival).Seconds()
 			workflow.PublishAsyncInvocationResponse(req.Id, workflow.InvocationResponse{
 				Success:      true,

internal/test/api_test.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/spf13/cast"
 	"strings"
 	"testing"
 	"time"
@@ -209,6 +210,8 @@ func TestAsyncInvokeWorkflow(t *testing.T) {
 		t.Skip("Skipping integration test")
 	}
 	fcName := "sequence"
+	//deleteWorkflowApiTest(t, fcName, HOST, PORT)
+
 	fn, err := InitializePyFunction("inc", "handler", function.NewSignature().
 		AddInput("input", function.Int{}).
 		AddOutput("result", function.Int{}).
@@ -238,8 +241,9 @@ func TestAsyncInvokeWorkflow(t *testing.T) {
 	for {
 		pollResult := pollWorkflowTest(t, reqIdStruct.ReqId, HOST, PORT)
 
-		var compExecReport workflow.ExecutionReport
-		errUnmarshalExecResult := json.Unmarshal([]byte(pollResult), &compExecReport)
+		fmt.Println(pollResult)
+		var response workflow.InvocationResponse
+		errUnmarshalExecResult := json.Unmarshal([]byte(pollResult), &response)
 
 		if errUnmarshalExecResult != nil {
 			var unmarshalError *json.UnmarshalTypeError
@@ -249,17 +253,11 @@ func TestAsyncInvokeWorkflow(t *testing.T) {
 			i++
 			time.Sleep(200 * time.Millisecond)
 		} else {
-			result, err := GetSingleResult(&compExecReport)
-			utils.AssertNilMsg(t, err, "failed to get single result")
-			utils.AssertEquals(t, "4", result)
+			utils.AssertEquals(t, 4, cast.ToInt(response.Result["result"]))
 			break
 		}
 	}
 
-	// here we do not use REST API
-	getFC, b := workflow.Get(fcName)
-	utils.AssertTrue(t, b)
-	utils.AssertTrueMsg(t, wflow.Equals(getFC), "composition comparison failed")
 	err = wflow.Delete()
 	utils.AssertNilMsg(t, err, "failed to delete composition")
 }

internal/workflow/workflow.go

@@ -29,7 +29,7 @@ type WorkflowInvocationResumeRequest struct {
 	Plan ExecutionPlan
 }
 
-var offloadingPolicy OffloadingPolicy = &SimpleOffloadingPolicy{}
+var offloadingPolicy OffloadingPolicy = &NoOffloadingPolicy{}
 
 //&NoOffloadingPolicy{} // TODO: handle initialization elsewhere
 
@@ -466,6 +466,8 @@ func (workflow *Workflow) Invoke(r *Request) error {
 				return fmt.Errorf("Could not save partial data: %v", err)
 			}
 
+			log.Printf("Offloading request: %v", requestId)
+
 			shouldContinue, err = offload(r, &decision)
 			if err != nil {
 				return err