use clean kind names in examples

srl-labs · Nov 12, 2023 · 45e69e1 · 45e69e1
1 parent 0474962
commit 45e69e1
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 37 deletions.
diff --git a/lab-examples/cvx01/topo.clab.yml b/lab-examples/cvx01/topo.clab.yml
@@ -3,15 +3,15 @@ name: cvx01
 topology:
   nodes:
     sw1:
-      kind: cvx
+      kind: cumulus_cvx
       image: networkop/cx:4.3.0
       binds:
         - sw1/interfaces:/etc/network/interfaces.d/host-mounts
     sw2:
       kind: linux
       image: frrouting/frr:v7.5.1
       binds:
-      - sw2/frr.conf:/etc/frr/frr.conf
+        - sw2/frr.conf:/etc/frr/frr.conf
 
   links:
-    - endpoints: ["sw1:swp12", "sw2:eth21"]
+    - endpoints: ["sw1:swp12", "sw2:eth21"]
diff --git a/lab-examples/cvx02/topo.clab.yml b/lab-examples/cvx02/topo.clab.yml
@@ -3,7 +3,7 @@ name: cvx02
 topology:
   nodes:
     sw1:
-      kind: cvx
+      kind: cumulus_cvx
       image: networkop/cx:4.3.0
       runtime: docker
       binds:
@@ -14,7 +14,7 @@ topology:
       image: networkop/host:ifreload
       binds:
         - h1/interfaces:/etc/network/interfaces
-      cmd: 2 # wait for 2 interfaces to be connected: eth0 + eth1
+      cmd: "2" # wait for 2 interfaces to be connected: eth0 + eth1
 
   links:
     - endpoints: ["sw1:swp12", "h1:eth1"]
diff --git a/lab-examples/srl01/srl01.clab.yml b/lab-examples/srl01/srl01.clab.yml
@@ -3,9 +3,9 @@ name: srl01
 
 topology:
   kinds:
-    srl:
+    nokia_srlinux:
       type: ixrd3
       image: ghcr.io/nokia/srlinux
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
diff --git a/lab-examples/srl02/srl02.clab.yml b/lab-examples/srl02/srl02.clab.yml
@@ -4,11 +4,11 @@ name: srl02
 topology:
   nodes:
     srl1:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
       startup-config: srl1.cfg
     srl2:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
       startup-config: srl2.cfg
 

diff --git a/lab-examples/srl03/srl03.clab.yml b/lab-examples/srl03/srl03.clab.yml
@@ -2,20 +2,20 @@ name: srl03
 
 topology:
   kinds:
-    srl:
+    nokia_srlinux:
       type: ixrd3
       image: ghcr.io/nokia/srlinux
     linux:
       image: ghcr.io/hellt/network-multitool
   nodes:
     wan1:
-      kind: srl
+      kind: nokia_srlinux
     wan2:
-      kind: srl
+      kind: nokia_srlinux
     wan3:
-      kind: srl
+      kind: nokia_srlinux
     wan4:
-      kind: srl
+      kind: nokia_srlinux
     client1:
       kind: "linux"
     client2:

diff --git a/lab-examples/srlceos01/srlceos01.clab.yml b/lab-examples/srlceos01/srlceos01.clab.yml
@@ -4,10 +4,10 @@ name: srlceos01
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
     ceos:
-      kind: ceos
+      kind: arista_ceos
       image: ceos:4.25.0F
 
   links:

diff --git a/lab-examples/srlcrpd01/srlcrpd01.clab.yml b/lab-examples/srlcrpd01/srlcrpd01.clab.yml
@@ -3,10 +3,10 @@ name: srlcrpd01
 topology:
   nodes:
     crpd:
-      kind: crpd
+      kind: juniper_crpd
       image: crpd:20.2R1.10
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
 
   links:

diff --git a/lab-examples/srlfrr01/srlfrr01.clab.yml b/lab-examples/srlfrr01/srlfrr01.clab.yml
@@ -3,7 +3,7 @@ name: srlfrr01
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
     frr:
       kind: linux

diff --git a/lab-examples/srlvjunos01/srlvjunos01.clab.yml b/lab-examples/srlvjunos01/srlvjunos01.clab.yml
@@ -3,12 +3,12 @@ name: srlvjunos01
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux:23.7.1
       startup-config: srl.cli
 
     vswitch:
-      kind: vr-juniper_vjunosswitch
+      kind: juniper_vjunosswitch
       image: vrnetlab/vr-vjunosswitch:23.2R1.14
       startup-config: vjunos.cfg
 

diff --git a/lab-examples/templated01/templated01.clab.gotmpl b/lab-examples/templated01/templated01.clab.gotmpl
@@ -2,9 +2,9 @@ name: templated01
 
 topology:
   defaults:
-    kind: srl
+    kind: nokia_srlinux
   kinds:
-    srl:
+    nokia_srlinux:
       image: ghcr.io/nokia/srlinux
 
   nodes:

diff --git a/lab-examples/templated02/templated02.clab.gotmpl b/lab-examples/templated02/templated02.clab.gotmpl
@@ -2,9 +2,9 @@ name: templated02
 
 topology:
   defaults:
-    kind: srl
+    kind: nokia_srlinux
   kinds:
-    srl:
+    nokia_srlinux:
       image: ghcr.io/nokia/srlinux
 
   nodes:

diff --git a/lab-examples/vr01/vr01.clab.yml b/lab-examples/vr01/vr01.clab.yml
@@ -3,7 +3,7 @@ name: vr01
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
     sros:
       kind: nokia_sros

diff --git a/lab-examples/vr02/vr02.clab.yml b/lab-examples/vr02/vr02.clab.yml
@@ -3,10 +3,10 @@ name: vr02
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
     vmx:
-      kind: vr-vmx
+      kind: juniper_vmx
       image: vrnetlab/vr-vmx:20.2R1.10
 
   links:

diff --git a/lab-examples/vr03/vr03.clab.yml b/lab-examples/vr03/vr03.clab.yml
@@ -3,10 +3,10 @@ name: vr03
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
     xrv:
-      kind: vr-xrv
+      kind: cisco_xrv
       image: vrnetlab/vr-xrv:6.1.2
 
   links:

diff --git a/lab-examples/vr04/vr04.clab.yml b/lab-examples/vr04/vr04.clab.yml
@@ -3,11 +3,11 @@ name: vr04
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
     xrv9k:
-      kind: vr-xrv9k
-      image: vr-xrv:7.2.1 # do not forget to re-tag the image if needed
+      kind: cisco_xrv9k
+      image: vr-xrv9k:7.2.1 # do not forget to re-tag the image if needed
 
   links:
     - endpoints: ["srl:e1-1", "xrv9k:eth1"]
diff --git a/lab-examples/vr05/vr01.clab.yml b/lab-examples/vr05/vr01.clab.yml
@@ -3,7 +3,7 @@ name: vr01
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
       config:
         vars:

diff --git a/lab-examples/vsrx01/vsrx01.yml b/lab-examples/vsrx01/vsrx01.yml
@@ -2,9 +2,9 @@ name: vsrx1
 topology:
   nodes:
     srx1:
-      kind: vr-vsrx
+      kind: juniper_vsrx
       image: vrnetlab/vr-vsrx:23.2R1.13
-      startup-config: srx1.txt 
+      startup-config: srx1.txt
     client1:
       kind: "linux"
       image: wbitt/network-multitool:alpine-extra

diff --git a/lab-examples/vxlan01/vxlan-vmx.clab.yml b/lab-examples/vxlan01/vxlan-vmx.clab.yml
@@ -3,7 +3,7 @@ name: vxlan
 topology:
   nodes:
     vmx:
-      kind: nokia_sros
+      kind: juniper_vmx
       image: vrnetlab/vr-vmx:20.4R1.12
     # sros node is defined in a `vxlan-sros.clab.yml` topo file
     # that is launched on another VM