Merge remote-tracking branch 'remotes/wim/master' into containerd

srl-labs · Jun 11, 2021 · 9d02826 · 9d02826
2 parents 3884a9f + 7a08664
commit 9d02826
Show file tree

Hide file tree

Showing 78 changed files with 440 additions and 26 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -28,6 +28,7 @@ jobs:
           filters: |
             code:
               - 'clab/**'
+              - 'runtime/**'
               - 'cmd/**'
               - 'tests/**'
               - '.github/workflows/cicd.yml'

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,3 +1,7 @@
+# Copyright 2020 Nokia
+# Licensed under the BSD 3-Clause License.
+# SPDX-License-Identifier: BSD-3-Clause
+
 project_name: containerlab
 builds:
   - env:

diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,5 @@
-BSD 3-Clause License
+Copyright (c) 2021 Nokia. All rights reserved.
 
-Copyright (c) 2021, SRL Labs
-All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

diff --git a/clab/ceos.go b/clab/ceos.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/cert.go b/clab/cert.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/clab.go b/clab/clab.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (
@@ -84,7 +88,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),

diff --git a/clab/config.go b/clab/config.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (
@@ -81,10 +85,10 @@ 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"`
-	Topology   Topology      `json:"topology,omitempty"`
-	ConfigPath string        `yaml:"config_path,omitempty"`
+	Name       string         `json:"name,omitempty"`
+	Mgmt       *types.MgmtNet `json:"mgmt,omitempty"`
+	Topology   Topology       `json:"topology,omitempty"`
+	ConfigPath string         `yaml:"config_path,omitempty"`
 }
 
 // Topology represents a lab topology
@@ -584,6 +588,10 @@ func (c *CLab) CheckTopologyDefinition(ctx context.Context) error {
 	if err := c.VerifyImages(ctx); err != nil {
 		return err
 	}
+	if err := c.VerifyImages(ctx); err != nil { // skipcq: RVV-B0005
+		return err
+	}
+
 	return nil
 }
 
@@ -648,6 +656,7 @@ func (c *CLab) VerifyImages(ctx context.Context) error {
 }
 
 // VerifyContainersUniqueness ensures that nodes defined in the topology do not have names of the existing containers
+// additionally it checks that the lab name is unique and no containers are currently running with the same lab name label
 func (c *CLab) VerifyContainersUniqueness(ctx context.Context) error {
 	nctx, cancel := context.WithTimeout(ctx, c.timeout)
 	defer cancel()
@@ -672,6 +681,16 @@ func (c *CLab) VerifyContainersUniqueness(ctx context.Context) error {
 	if len(dups) != 0 {
 		return fmt.Errorf("containers %q already exist. Add '--reconfigure' flag to the deploy command to first remove the containers and then deploy the lab", dups)
 	}
+
+	// check that none of the existing containers has a label that matches
+	// the lab name of a currently deploying lab
+	// this ensures lab uniqueness
+	for _, cnt := range containers {
+		if cnt.Labels["containerlab"] == c.Config.Name {
+			return fmt.Errorf("the '%s' lab has already been deployed. Destroy the lab before deploying a lab with the same name", c.Config.Name)
+		}
+	}
+
 	return err
 }
 
@@ -845,7 +864,7 @@ func (c *CLab) CheckResources() error {
 	}
 	freeMemG := sysMemory("free") / 1024 / 1024 / 1024
 	if freeMemG < 1 {
-		log.Warnf("it appears that container host has low memory available: ~%dGi. This might lead to runtimer errors. Consider freeing up more memory.", freeMemG)
+		log.Warnf("it appears that container host has low memory available: ~%dGi. This might lead to runtime errors. Consider freeing up more memory.", freeMemG)
 	}
 	return nil
 }

diff --git a/clab/config_test.go b/clab/config_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/crpd.go b/clab/crpd.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/file.go b/clab/file.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/graph.go b/clab/graph.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/inventory.go b/clab/inventory.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/inventory_test.go b/clab/inventory_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/linux.go b/clab/linux.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/mysocketio.go b/clab/mysocketio.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/mysocketio_test.go b/clab/mysocketio_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/netlink.go b/clab/netlink.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/ovs.go b/clab/ovs.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/sonic.go b/clab/sonic.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import "github.com/srl-labs/containerlab/types"

diff --git a/clab/srl.go b/clab/srl.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/tc.go b/clab/tc.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/vr-csr.go b/clab/vr-csr.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/vr-ros.go b/clab/vr-ros.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/vr-sros.go b/clab/vr-sros.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/vr-veos.go b/clab/vr-veos.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/vr-vmx.go b/clab/vr-vmx.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/vr-xrv.go b/clab/vr-xrv.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/vr-xrv9k.go b/clab/vr-xrv9k.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/clab/vxlan.go b/clab/vxlan.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package clab
 
 import (

diff --git a/cmd/completion.go b/cmd/completion.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (

diff --git a/cmd/deploy.go b/cmd/deploy.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (

diff --git a/cmd/destroy.go b/cmd/destroy.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (

diff --git a/cmd/disableTxOffload.go b/cmd/disableTxOffload.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (

diff --git a/cmd/exec.go b/cmd/exec.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (

diff --git a/cmd/generate.go b/cmd/generate.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (
@@ -11,6 +15,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/srl-labs/containerlab/clab"
+	"github.com/srl-labs/containerlab/types"
 	"gopkg.in/yaml.v2"
 )
 
@@ -129,6 +134,7 @@ func generateTopologyConfig(name, network, ipv4range, ipv6range string, images m
 	numStages := len(nodes)
 	config := &clab.Config{
 		Name: name,
+		Mgmt: new(types.MgmtNet),
 		Topology: clab.Topology{
 			Kinds: make(map[string]clab.NodeConfig),
 			Nodes: make(map[string]clab.NodeConfig),

diff --git a/cmd/generate_test.go b/cmd/generate_test.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (

diff --git a/cmd/graph.go b/cmd/graph.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (

diff --git a/cmd/inspect.go b/cmd/inspect.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (

diff --git a/cmd/mysocketio.go b/cmd/mysocketio.go
@@ -1,3 +1,7 @@
+// Copyright 2020 Nokia
+// Licensed under the BSD 3-Clause License.
+// SPDX-License-Identifier: BSD-3-Clause
+
 package cmd
 
 import (