Merge pull request #431 from srl-labs/fix-mgmt-net-reg

fix mgmt-net feature regression

clab/clab.go

@@ -84,7 +84,9 @@ func WithGracefulShutdown(gracefulShutdown bool) ClabOption {
 // NewContainerLab function defines a new container lab
 func NewContainerLab(opts ...ClabOption) *CLab {
 	c := &CLab{
-		Config:   new(Config),
+		Config: &Config{
+			Mgmt: new(types.MgmtNet),
+		},
 		TopoFile: new(TopoFile),
 		m:        new(sync.RWMutex),
 		Nodes:    make(map[string]*types.Node),

clab/config.go

@@ -82,7 +82,7 @@ var srlTypes = map[string]string{
 // Config defines lab configuration as it is provided in the YAML file
 type Config struct {
 	Name       string        `json:"name,omitempty"`
-	Mgmt       types.MgmtNet `json:"mgmt,omitempty"`
+	Mgmt       *types.MgmtNet `json:"mgmt,omitempty"`
 	Topology   Topology      `json:"topology,omitempty"`
 	ConfigPath string        `yaml:"config_path,omitempty"`
 }

runtime/docker/docker.go

@@ -28,7 +28,7 @@ const sysctlBase = "/proc/sys"
 type DockerRuntime struct {
 	Client           *dockerC.Client
 	timeout          time.Duration
-	Mgmt             types.MgmtNet
+	Mgmt             *types.MgmtNet
 	debug            bool
 	gracefulShutdown bool
 }
@@ -41,14 +41,15 @@ func NewDockerRuntime(d bool, dur time.Duration, gracefulShutdown bool) *DockerR
 
 	return &DockerRuntime{
 		Client: c,
+		Mgmt:   new(types.MgmtNet),
 		// TODO: undo this hard-coding
 		timeout:          dur,
 		debug:            d,
 		gracefulShutdown: gracefulShutdown,
 	}
 }
 
-func (c *DockerRuntime) SetMgmtNet(n types.MgmtNet) {
+func (c *DockerRuntime) SetMgmtNet(n *types.MgmtNet) {
 	c.Mgmt = n
 }
 

runtime/runtime.go

@@ -16,7 +16,7 @@ const (
 
 type ContainerRuntime interface {
 	// Set the network management details (generated by the config.go)
-	SetMgmtNet(types.MgmtNet)
+	SetMgmtNet(*types.MgmtNet)
 	// Create container (bridge) network
 	CreateNet(context.Context) error
 	// Delete container (bridge) network