moved external-access handling to initMgmtNetwork

srl-labs · Feb 22, 2022 · 858076d · 858076d
1 parent 99cab72
commit 858076d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/clab/clab.go b/clab/clab.go
@@ -142,11 +142,18 @@ func (c *CLab) initMgmtNetwork() error {
 	if c.Config.Mgmt.Network == "" {
 		c.Config.Mgmt.Network = dockerNetName
 	}
+
 	if c.Config.Mgmt.IPv4Subnet == "" && c.Config.Mgmt.IPv6Subnet == "" {
 		c.Config.Mgmt.IPv4Subnet = dockerNetIPv4Addr
 		c.Config.Mgmt.IPv6Subnet = dockerNetIPv6Addr
 	}
-	log.Debugf("New mgmt params are %+v", c.Config.Mgmt)
+
+	// by default external access is enabled if not set by a user
+	if c.Config.Mgmt.ExternalAccess == nil {
+		c.Config.Mgmt.ExternalAccess = new(bool)
+		*c.Config.Mgmt.ExternalAccess = true
+	}
+
 	// init docker network mtu
 	if c.Config.Mgmt.MTU == "" {
 		m, err := utils.DefaultNetMTU()
@@ -156,6 +163,8 @@ func (c *CLab) initMgmtNetwork() error {
 		c.Config.Mgmt.MTU = m
 	}
 
+	log.Debugf("New mgmt params are %+v", c.Config.Mgmt)
+
 	return nil
 }
 

diff --git a/clab/config.go b/clab/config.go
@@ -648,12 +648,6 @@ func (*CLab) CheckResources() error {
 
 // sets defaults after the topology has been parsed
 func (c *CLab) setDefaults() {
-	// by default external access is enabled if not set by a user
-	if c.Config.Mgmt.ExternalAccess == nil {
-		c.Config.Mgmt.ExternalAccess = new(bool)
-		*c.Config.Mgmt.ExternalAccess = true
-	}
-
 	for _, n := range c.Nodes {
 		// Injecting the env var with expected number of links
 		numLinks := map[string]string{