Node Stages and Dependency Manager

Makefile

@@ -61,7 +61,7 @@ robot-test: build-debug
 MOCKDIR = ./mocks
 .PHONY: mocks-gen
 mocks-gen: mocks-rm ## Generate mocks for all the defined interfaces.
-	go install github.com/golang/mock/mockgen@v1.6.0
+	go install go.uber.org/mock/mockgen@latest
 	mockgen -package=mocknodes -source=nodes/node.go -destination=$(MOCKDIR)/mocknodes/node.go
 	mockgen -package=mocks -source=clab/dependency_manager/dependency_manager.go -destination=$(MOCKDIR)/dependency_manager.go
 	mockgen -package=mockruntime -source=runtime/runtime.go -destination=$(MOCKDIR)/mockruntime/runtime.go

border0_api/border0_test.go

@@ -10,11 +10,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/mock/gomock"
 	"github.com/h2non/gock"
 	"github.com/srl-labs/containerlab/mocks/mocknodes"
 	"github.com/srl-labs/containerlab/nodes"
 	"github.com/srl-labs/containerlab/types"
+	"go.uber.org/mock/gomock"
 )
 
 func TestLogin(t *testing.T) {
@@ -226,7 +226,18 @@ func getNodeMap(mockCtrl *gomock.Controller) map[string]nodes.Node {
 		&types.NodeConfig{
 			Image:     "alpine:3",
 			ShortName: "node2",
-			WaitFor:   []string{"node1"},
+			Stages: &types.Stages{
+				Configure: &types.StageConfigure{
+					StageBase: types.StageBase{
+						WaitFor: types.WaitForList{
+							&types.WaitFor{
+								Node:  "node1",
+								State: types.WaitForCreate,
+							},
+						},
+					},
+				},
+			},
 			Publish: []string{
 				"tls/22",
 				"tls/23/myfunnypolicy",
@@ -242,8 +253,23 @@ func getNodeMap(mockCtrl *gomock.Controller) map[string]nodes.Node {
 			Image:       "alpine:3",
 			NetworkMode: "container:node2",
 			ShortName:   "node3",
-			WaitFor:     []string{"node1", "node2"},
-			LongName:    "clab-TestTopo-node3",
+			Stages: &types.Stages{
+				Configure: &types.StageConfigure{
+					StageBase: types.StageBase{
+						WaitFor: types.WaitForList{
+							&types.WaitFor{
+								Node:  "node1",
+								State: types.WaitForCreate,
+							},
+							&types.WaitFor{
+								Node:  "node2",
+								State: types.WaitForCreate,
+							},
+						},
+					},
+				},
+			},
+			LongName: "clab-TestTopo-node3",
 		},
 	).AnyTimes()
 
@@ -265,7 +291,22 @@ func getNodeMap(mockCtrl *gomock.Controller) map[string]nodes.Node {
 			Image:           "alpine:3",
 			MgmtIPv4Address: "172.10.10.2",
 			ShortName:       "node5",
-			WaitFor:         []string{"node3", "node4"},
+			Stages: &types.Stages{
+				Configure: &types.StageConfigure{
+					StageBase: types.StageBase{
+						WaitFor: types.WaitForList{
+							&types.WaitFor{
+								Node:  "node3",
+								State: types.WaitForCreate,
+							},
+							&types.WaitFor{
+								Node:  "node4",
+								State: types.WaitForCreate,
+							},
+						},
+					},
+				},
+			},
 			Publish: []string{
 				"tls/22",
 				"tls/25/test,additionalpolicy",