exec from topology as part of node schedule

clab/clab.go

@@ -18,6 +18,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/srl-labs/containerlab/cert"
 	"github.com/srl-labs/containerlab/clab/dependency_manager"
+	"github.com/srl-labs/containerlab/clab/exec"
 	errs "github.com/srl-labs/containerlab/errors"
 	"github.com/srl-labs/containerlab/links"
 	"github.com/srl-labs/containerlab/nodes"
@@ -303,6 +304,7 @@ func NewContainerLab(opts ...ClabOption) (*CLab, error) {
 
 	// init a new NodeRegistry
 	c.Reg = nodes.NewNodeRegistry()
+	c.RegisterNodes()
 
 	for _, opt := range opts {
 		err := opt(c)
@@ -355,7 +357,7 @@ func (c *CLab) GlobalRuntime() runtime.ContainerRuntime {
 
 // CreateNodes schedules nodes creation and returns a waitgroup for all nodes.
 // Nodes interdependencies are created in this function.
-func (c *CLab) CreateNodes(ctx context.Context, maxWorkers uint, skipPostDeploy bool) (*sync.WaitGroup, error) {
+func (c *CLab) CreateNodes(ctx context.Context, maxWorkers uint, skipPostDeploy bool) (*sync.WaitGroup, *exec.ExecCollection, error) {
 
 	for nodeName := range c.Nodes {
 		c.dependencyManager.AddNode(nodeName)
@@ -364,19 +366,19 @@ func (c *CLab) CreateNodes(ctx context.Context, maxWorkers uint, skipPostDeploy
 	// nodes with static mgmt IP should be scheduled before the dynamic ones
 	err := c.createStaticDynamicDependency()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// create user-defined node dependencies done with `wait-for` node property
 	err = c.createWaitForDependency()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// create a set of dependencies, that makes the ignite nodes start one after the other
 	err = c.createIgniteSerialDependency()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// make network namespace shared containers start in the right order
@@ -387,13 +389,13 @@ func (c *CLab) CreateNodes(ctx context.Context, maxWorkers uint, skipPostDeploy
 	// make sure that there are no unresolvable dependencies, which would deadlock.
 	err = c.dependencyManager.CheckAcyclicity()
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
 	// start scheduling
-	NodesWg := c.scheduleNodes(ctx, int(maxWorkers), skipPostDeploy)
+	NodesWg, execCollection := c.scheduleNodes(ctx, int(maxWorkers), skipPostDeploy)
 
-	return NodesWg, nil
+	return NodesWg, execCollection, nil
 }
 
 // create a set of dependencies, that makes the ignite nodes start one after the other.
@@ -489,9 +491,11 @@ func (c *CLab) createWaitForDependency() error {
 	return nil
 }
 
-func (c *CLab) scheduleNodes(ctx context.Context, maxWorkers int, skipPostDeploy bool) *sync.WaitGroup {
+func (c *CLab) scheduleNodes(ctx context.Context, maxWorkers int, skipPostDeploy bool) (*sync.WaitGroup, *exec.ExecCollection) {
 	concurrentChan := make(chan nodes.Node)
 
+	execCollection := exec.NewExecCollection()
+
 	workerFunc := func(i int, input chan nodes.Node, wg *sync.WaitGroup,
 		dm dependency_manager.DependencyManager,
 	) {
@@ -589,6 +593,12 @@ func (c *CLab) scheduleNodes(ctx context.Context, maxWorkers int, skipPostDeploy
 
 				dm.SignalDone(node.GetShortName(), types.WaitForConfigure)
 
+				// run execs
+				err = node.RunExecFromConfig(ctx, execCollection)
+				if err != nil {
+					log.Errorf("failed to run exec commands for %s: %v", node.GetShortName(), err)
+				}
+
 				// health state processing
 				count, err = dm.GetDependerCount(node.GetShortName(), types.WaitForHealthy)
 				if err != nil {
@@ -680,7 +690,7 @@ func (c *CLab) scheduleNodes(ctx context.Context, maxWorkers int, skipPostDeploy
 		// close the channel and thereby terminate the workerFuncs
 		close(concurrentChan)
 	}()
-	return wg
+	return wg, execCollection
 }
 
 // WaitForExternalNodeDependencies makes nodes that have a reference to an external container network-namespace (network-mode: container:<NAME>)

clab/config_test.go

@@ -75,9 +75,6 @@ func TestLicenseInit(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			// fmt.Println(c.Config.Topology.Defaults)
-			// fmt.Println(c.Config.Topology.Kinds)
-			// fmt.Println(c.Config.Topology.Nodes)
 			if filepath.Base(c.Nodes["node1"].Config().License) != tc.want {
 				t.Fatalf("wanted '%s' got '%s'", tc.want, c.Nodes["node1"].Config().License)
 			}

cmd/deploy.go

@@ -17,7 +17,6 @@ import (
 	"github.com/srl-labs/containerlab/cert"
 	"github.com/srl-labs/containerlab/clab"
 	"github.com/srl-labs/containerlab/clab/dependency_manager"
-	"github.com/srl-labs/containerlab/clab/exec"
 	"github.com/srl-labs/containerlab/links"
 	"github.com/srl-labs/containerlab/runtime"
 	"github.com/srl-labs/containerlab/utils"
@@ -217,7 +216,7 @@ func deployFn(_ *cobra.Command, _ []string) error {
 		n.Config().ExtraHosts = extraHosts
 	}
 
-	nodesWg, err := c.CreateNodes(ctx, nodeWorkers, skipPostDeploy)
+	nodesWg, execCollection, err := c.CreateNodes(ctx, nodeWorkers, skipPostDeploy)
 	if err != nil {
 		return err
 	}
@@ -226,6 +225,9 @@ func deployFn(_ *cobra.Command, _ []string) error {
 		nodesWg.Wait()
 	}
 
+	// write to log
+	execCollection.Log()
+
 	if err := c.GenerateInventories(); err != nil {
 		return err
 	}
@@ -258,28 +260,6 @@ func deployFn(_ *cobra.Command, _ []string) error {
 		log.Errorf("failed to create ssh config file: %v", err)
 	}
 
-	// execute commands specified for nodes with `exec` node parameter
-	execCollection := exec.NewExecCollection()
-	for _, n := range c.Nodes {
-		for _, e := range n.Config().Exec {
-			exec, err := exec.NewExecCmdFromString(e)
-			if err != nil {
-				log.Warnf("Failed to parse the command string: %s, %v", e, err)
-			}
-
-			res, err := n.RunExec(ctx, exec)
-			if err != nil {
-				// kinds which do not support exec functionality are skipped
-				continue
-			}
-
-			execCollection.Add(n.Config().ShortName, res)
-		}
-	}
-
-	// write to log
-	execCollection.Log()
-
 	// log new version availability info if ready
 	newVerNotification(vCh)
 

nodes/default_node.go

@@ -187,6 +187,24 @@ func (d *DefaultNode) GetContainers(ctx context.Context) ([]runtime.GenericConta
 	return cnts, err
 }
 
+func (d *DefaultNode) RunExecFromConfig(ctx context.Context, ec *exec.ExecCollection) error {
+	for _, e := range d.Config().Exec {
+		exec, err := exec.NewExecCmdFromString(e)
+		if err != nil {
+			log.Warnf("Failed to parse the command string: %s, %v", e, err)
+		}
+
+		res, err := d.OverwriteNode.RunExec(ctx, exec)
+		if err != nil {
+			// kinds which do not support exec functionality are skipped
+			continue
+		}
+
+		ec.Add(d.GetShortName(), res)
+	}
+	return nil
+}
+
 func (d *DefaultNode) UpdateConfigWithRuntimeInfo(ctx context.Context) error {
 	cnts, err := d.OverwriteNode.GetContainers(ctx)
 	if err != nil {
@@ -305,6 +323,7 @@ type NodeOverwrites interface {
 	GetContainers(ctx context.Context) ([]runtime.GenericContainer, error)
 	GetContainerName() string
 	VerifyLicenseFileExists(context.Context) error
+	RunExec(context.Context, *exec.ExecCmd) (*exec.ExecResult, error)
 }
 
 // LoadStartupConfigFileVr templates a startup-config using the file specified for VM-based nodes in the topo

nodes/node.go

@@ -108,7 +108,10 @@ type Node interface {
 	GetState() state.NodeState
 	SetState(state.NodeState)
 	GetSSHConfig() *types.SSHConfig
+	// WaitForAllLinksCreated will block until all the nodes links are created
 	WaitForAllLinksCreated()
+	// RunExecFromConfig executes the topologyfile defined exec commands
+	RunExecFromConfig(context.Context, *exec.ExecCollection) error
 }
 
 type NodeOption func(Node)

tests/02-basic-srl/01-two-srls.robot

@@ -133,7 +133,7 @@ Verify TLS works with JSON-RPC and certificate check
 
 Verify TLS works with JSON-RPC, certificate check and IP address as SAN
     ${rc}    ${output} =    Run And Return Rc And Output
-    ...    curl --cacert ./clab-${lab-name}/.tls/ca/ca.pem 'https://admin:[email protected].2/jsonrpc' -d '{"jsonrpc":"2.0","id":0,"method":"get","params":{"commands":[{"path":"/system/information/version","datastore":"state"}]}}'
+    ...    curl --cacert ./clab-${lab-name}/.tls/ca/ca.pem 'https://admin:[email protected].200/jsonrpc' -d '{"jsonrpc":"2.0","id":0,"method":"get","params":{"commands":[{"path":"/system/information/version","datastore":"state"}]}}'
     Log    ${output}
     Should Be Equal As Integers    ${rc}    0
     Should Not Contain    ${output}    error