Updates examples

cmd/destroy.go

@@ -174,9 +174,6 @@ func destroyLab(ctx context.Context, c *clab.CLab) (err error) {
 		}
 	}
 
-	log.Infof("Candidates %+v", c.Nodes)
-	// get lab directory used by this lab to remove it later if cleanup is used
-
 	if cleanup {
 		labDir = filepath.Dir(labDir)
 	}

docs/manual/kinds/cvx.md

@@ -11,8 +11,8 @@ CVX nodes launched with containerlab comes up with:
 
 CVX supports two modes of operation:
 
-* Using Firecracker micro-VMs -- this mode runs Cumulus VX inside a micro-VM on top of the native Cumulus kernel. This should be the default way of running CVX nodes and requires `-r ignite` flag to be passed to containerlab for deploy and destroy actions.
-* Using only the container runtime -- this mode runs Cumulus VX container image directly inside the container runtime (e.g. Docker). Due to the lack of Cumulus VX kernel modules, some features are not supported, most notable one being MLAG.
+* Using Firecracker micro-VMs -- this mode runs Cumulus VX inside a micro-VM on top of the native Cumulus kernel. This is the default way of running CVX nodes.
+* Using only the container runtime -- this mode runs Cumulus VX container image directly inside the container runtime (e.g. Docker). Due to the lack of Cumulus VX kernel modules, some features are not supported, most notable one being MLAG. In order to use this mode add `runtime: docker` under the cvx node definition (see also this example).
 
 
 ## Managing cvx nodes
@@ -68,3 +68,4 @@ This will be addressed in the future releases.
 The following labs feature CVX node:
 
 - [Cumulus Linux Test Drive](../../lab-examples/cvx03.md)
+- [Cumulus and FRR](../../lab-examples/cvx01.md)

lab-examples/cvx01/README.md

@@ -0,0 +1 @@
+Example of how to run `cvx` inside `ignite` runtime together with nodes running in `docker` runtime.

lab-examples/cvx02/README.md

@@ -0,0 +1,4 @@
+Example of how to run `cvx` nodes inside docker runtime.
+
+> **Note 1** : cvx may take up to a minute to configure IP on swp12. This is due to it defaulting to DHCP'ing first.
+> **Node 2**: `h1` node requires `ifreload -a` before the IP is configured on its `eth1` interface

lab-examples/cvx02/topo.yml

@@ -5,6 +5,7 @@ topology:
     sw1:
       kind: cvx
       image: networkop/cx:4.3.0
+      runtime: docker
       binds:
         - sw1/interfaces:/etc/network/interfaces.d/host-mounts
     h1:

lab-examples/cvx03/README.md

@@ -0,0 +1 @@
+[Cumulus Test Drive Topology](https://www.nvidia.com/en-gb/networking/linux-on-demand/)