unit test fixes

clab/clab.go

@@ -54,6 +54,7 @@ func WithTimeout(dur time.Duration) ClabOption {
 func WithRuntime(name string, d bool, dur time.Duration, gracefulShutdown bool) ClabOption {
 	return func(c *CLab) {
 		c.Runtime = runtime.NewRuntime(name, d, dur, gracefulShutdown)
+		c.Runtime.SetMgmtNet(c.Config.Mgmt)
 	}
 }
 
@@ -83,12 +84,44 @@ func NewContainerLab(opts ...ClabOption) *CLab {
 		Nodes:    make(map[string]*types.Node),
 		Links:    make(map[int]*Link),
 	}
+
+	err := c.initMgmtNetwork()
+	if err != nil {
+		log.Fatalf("initMgmtNetwork: %s", err)
+	}
+
 	for _, o := range opts {
 		o(c)
 	}
+
 	return c
 }
 
+// initMgmtNetwork sets management network config
+func (c *CLab) initMgmtNetwork() error {
+	if c.Config.Mgmt.Network == "" {
+		c.Config.Mgmt.Network = dockerNetName
+	}
+	if c.Config.Mgmt.IPv4Subnet == "" && c.Config.Mgmt.IPv6Subnet == "" {
+		if c.Config.Mgmt.IPv4Subnet == "" {
+			c.Config.Mgmt.IPv4Subnet = dockerNetIPv4Addr
+		}
+		if c.Config.Mgmt.IPv6Subnet == "" {
+			c.Config.Mgmt.IPv6Subnet = dockerNetIPv6Addr
+		}
+	}
+	// init docker network mtu
+	if c.Config.Mgmt.MTU == "" {
+		m, err := getDefaultDockerMTU()
+		if err != nil {
+			log.Warnf("Error occurred during getting the default docker MTU: %v", err)
+		}
+		c.Config.Mgmt.MTU = m
+	}
+
+	return nil
+}
+
 func (c *CLab) CreateNode(ctx context.Context, node *types.Node, certs *Certificates) error {
 	if certs != nil {
 		c.m.Lock()

clab/config.go

@@ -144,43 +144,10 @@ type Endpoint struct {
 	EndpointName string
 }
 
-// initMgmtNetwork sets management network config
-func (c *CLab) initMgmtNetwork() error {
-	if c.Config.Mgmt.Network == "" {
-		c.Config.Mgmt.Network = dockerNetName
-	}
-	if c.Config.Mgmt.IPv4Subnet == "" && c.Config.Mgmt.IPv6Subnet == "" {
-		if c.Config.Mgmt.IPv4Subnet == "" {
-			c.Config.Mgmt.IPv4Subnet = dockerNetIPv4Addr
-		}
-		if c.Config.Mgmt.IPv6Subnet == "" {
-			c.Config.Mgmt.IPv6Subnet = dockerNetIPv6Addr
-		}
-	}
-	// init docker network mtu
-	if c.Config.Mgmt.MTU == "" {
-		m, err := getDefaultDockerMTU()
-		if err != nil {
-			log.Warnf("Error occurred during getting the default docker MTU: %v", err)
-		}
-		c.Config.Mgmt.MTU = m
-	}
-
-	c.Runtime.SetMgmtNet(c.Config.Mgmt)
-
-	return nil
-}
-
 // ParseTopology parses the lab topology
 func (c *CLab) ParseTopology() error {
 	log.Infof("Parsing & checking topology file: %s", c.TopoFile.fullName)
 	log.Debugf("Lab name: %s", c.Config.Name)
-	// initialize Management network config
-	err := c.initMgmtNetwork()
-	if err != nil {
-		return err
-	}
-	log.Debugf("DockerInfo: %v", c.Config.Mgmt)
 
 	if c.Config.ConfigPath == "" {
 		c.Config.ConfigPath, _ = filepath.Abs(os.Getenv("PWD"))
@@ -199,7 +166,7 @@ func (c *CLab) ParseTopology() error {
 	// initialize the Node information from the topology map
 	idx := 0
 	for nodeName, node := range c.Config.Topology.Nodes {
-		if err = c.NewNode(nodeName, node, idx); err != nil {
+		if err := c.NewNode(nodeName, node, idx); err != nil {
 			return err
 		}
 		idx++

cmd/inspect.go

@@ -103,7 +103,7 @@ func toTableData(det []containerDetails) [][]string {
 	return tabData
 }
 
-func printContainerInspect(c *clab.CLab, containers []types.GenericContainer, bridgeName string, format string) {
+func printContainerInspect(c *clab.CLab, containers []types.GenericContainer, bridgeName, format string) {
 	contDetails := make([]containerDetails, 0, len(containers))
 	// do not print published ports unless mysocketio kind is found
 	printMysocket := false

runtime/docker/docker.go

@@ -472,7 +472,7 @@ func (c *DockerRuntime) DeleteContainer(ctx context.Context, name string) error
 
 // linkContainerNS creates a symlink for containers network namespace
 // so that it can be managed by iproute2 utility
-func (c *DockerRuntime) LinkContainerNS(nspath string, containerName string) error {
+func (c *DockerRuntime) LinkContainerNS(nspath, containerName string) error {
 	utils.CreateDirectory("/run/netns/", 0755)
 	dst := "/run/netns/" + containerName
 	err := os.Symlink(nspath, dst)