diff --git a/src/executor/executor.go b/src/executor/executor.go index b5672a81..5848189e 100644 --- a/src/executor/executor.go +++ b/src/executor/executor.go @@ -221,13 +221,13 @@ func topologyFromDeployment(testId lib.TestId, constructor func(string) lib.Reac return topologyCooked, nil } -func DeployRaw(srv *http.Server, testId lib.TestId, topology map[string]string, m lib.Marshaler, constructor func(string) lib.Reactor) { - topologyCooked, err := topologyFromDeployment(testId, constructor) +func DeployRaw(srv *http.Server, testId lib.TestId, m lib.Marshaler, constructor func(string) lib.Reactor) { + topology, err := topologyFromDeployment(testId, constructor) if err != nil { panic(err) } - fmt.Printf("Deploying topology: %+v\n", topologyCooked) - Deploy(srv, topologyCooked, m) + fmt.Printf("Deploying topology: %+v\n", topology) + Deploy(srv, topology, m) } type LogWriter struct { diff --git a/src/sut/register/cmd/main.go b/src/sut/register/cmd/main.go index 7f765306..4aeaa4be 100644 --- a/src/sut/register/cmd/main.go +++ b/src/sut/register/cmd/main.go @@ -46,13 +46,7 @@ func main() { }() marshaler := sut.NewMarshaler() - eventLog := lib.EventLogEmitter{ - Component: "Register cmd", - TestId: &testId, - RunId: nil, - } - // TODO(stevan): nil below should be topology? - executor.DeployRaw(&srv, testId, eventLog, nil, marshaler, constructor) + executor.DeployRaw(&srv, testId, marshaler, constructor) <-idleConnsClosed }