From c4c9cca2d3fb7e33e92a26ec741053a46bd2e3b0 Mon Sep 17 00:00:00 2001
From: networkop <mmkashin@gmail.com>
Date: Tue, 6 Jul 2021 08:13:18 +0100
Subject: [PATCH] updates lab examples

---
 lab-examples/cvx02/README.md      |  1 -
 lab-examples/cvx02/sw1/interfaces | 10 ++++++++++
 lab-examples/cvx02/topo.yml       |  2 +-
 nodes/cvx/cvx.go                  |  5 +++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lab-examples/cvx02/README.md b/lab-examples/cvx02/README.md
index 2b55b492b..ba3eb7bc2 100644
--- 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
index e97f6b139..f25c4779b 100644
--- 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
index c9c4348e1..e42e64089 100644
--- 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
index 8b5aa02fb..3d7b1b6f3 100644
--- 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