updates lab examples

srl-labs · Jul 6, 2021 · c4c9cca · c4c9cca
1 parent 960513e
commit c4c9cca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/lab-examples/cvx02/README.md b/lab-examples/cvx02/README.md
@@ -1,3 +1,2 @@
 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.
diff --git a/lab-examples/cvx02/sw1/interfaces b/lab-examples/cvx02/sw1/interfaces
@@ -1,3 +1,13 @@
+auto lo
+iface lo inet loopback
+
+auto mgmt
+iface mgmt
+    vrf-table auto
+
+auto eth0
+iface eth0 
+    vrf mgmt
 
 auto swp12
 iface swp12 

diff --git a/lab-examples/cvx02/topo.yml b/lab-examples/cvx02/topo.yml
@@ -7,7 +7,7 @@ topology:
       image: networkop/cx:4.3.0
       runtime: docker
       binds:
-        - sw1/interfaces:/etc/network/interfaces.d/host-mounts
+        - sw1/interfaces:/etc/network/interfaces
     h1:
       kind: linux
       image: networkop/host:ifreload

diff --git a/nodes/cvx/cvx.go b/nodes/cvx/cvx.go
@@ -74,6 +74,11 @@ func (c *cvx) PostDeploy(ctx context.Context, ns map[string]nodes.Node) error {
 func (c *cvx) GetImages() map[string]string {
 	images := make(map[string]string)
 	images[nodes.ImageKey] = c.cfg.Image
+
+	if c.runtime.GetName() != runtime.IgniteRuntime {
+		return images
+	}
+
 	images[nodes.KernelKey] = c.cfg.Kernel
 	images[nodes.SandboxKey] = c.cfg.Sandbox
 	return images
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,2 @@
		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.