change srl to nokia_srlinux (#1796)

* change srl to nokia_srlinux * fix kind srl * more srl squashing * fix integration test * squash more default srl kinds
srl-labs · Dec 20, 2023 · ce1f20c · ce1f20c
1 parent ca9feca
commit ce1f20c
Show file tree

Hide file tree

Showing 31 changed files with 134 additions and 127 deletions.
diff --git a/clab/config_test.go b/clab/config_test.go
@@ -394,7 +394,7 @@ func TestLabelsInit(t *testing.T) {
 			want: map[string]string{
 				labels.Containerlab: "topo1",
 				labels.NodeName:     "node1",
-				labels.NodeKind:     "srl",
+				labels.NodeKind:     "nokia_srlinux",
 				labels.NodeType:     "ixrd2",
 				labels.NodeGroup:    "",
 				labels.NodeLabDir:   "../clab-topo1/node1",
@@ -407,7 +407,7 @@ func TestLabelsInit(t *testing.T) {
 			want: map[string]string{
 				labels.Containerlab: "topo1",
 				labels.NodeName:     "node2",
-				labels.NodeKind:     "srl",
+				labels.NodeKind:     "nokia_srlinux",
 				labels.NodeType:     "ixrd2",
 				labels.NodeGroup:    "",
 				labels.NodeLabDir:   "../clab-topo1/node2",
@@ -421,7 +421,7 @@ func TestLabelsInit(t *testing.T) {
 			want: map[string]string{
 				labels.Containerlab: "topo2",
 				labels.NodeName:     "node1",
-				labels.NodeKind:     "srl",
+				labels.NodeKind:     "nokia_srlinux",
 				labels.NodeType:     "ixrd2",
 				labels.NodeGroup:    "",
 				labels.NodeLabDir:   "../clab-topo2/node1",
@@ -435,7 +435,7 @@ func TestLabelsInit(t *testing.T) {
 			want: map[string]string{
 				labels.Containerlab: "topo3",
 				labels.NodeName:     "node2",
-				labels.NodeKind:     "srl",
+				labels.NodeKind:     "nokia_srlinux",
 				labels.NodeType:     "ixrd2",
 				labels.NodeGroup:    "",
 				labels.NodeLabDir:   "../clab-topo3/node2",

diff --git a/clab/inventory_test.go b/clab/inventory_test.go
@@ -25,7 +25,7 @@ func TestGenerateAnsibleInventory(t *testing.T) {
     # module does not attempt using any global http proxy.
     ansible_httpapi_use_proxy: false
   children:
-    srl:
+    nokia_srlinux:
       hosts:
         clab-topo1-node1:
           ansible_host: 172.100.100.11
@@ -45,7 +45,7 @@ func TestGenerateAnsibleInventory(t *testing.T) {
     linux:
       hosts:
         clab-topo8_ansible_groups-node4:
-    srl:
+    nokia_srlinux:
       hosts:
         clab-topo8_ansible_groups-node1:
           ansible_host: 172.100.100.11

diff --git a/clab/test_data/topo1.yml b/clab/test_data/topo1.yml
@@ -2,7 +2,7 @@ name: topo1
 topology:
   nodes:
     node1:
-      kind: srl
+      kind: nokia_srlinux
       license: node1.lic
       binds:
         - node1.lic:/dst
@@ -11,7 +11,7 @@ topology:
         env2: val2
       mgmt-ipv4: 172.100.100.11
     node2:
-      kind: srl
+      kind: nokia_srlinux
       license: node1.lic
       user: custom
       mgmt-ipv4: 172.100.100.12

diff --git a/clab/test_data/topo2.yml b/clab/test_data/topo2.yml
@@ -1,7 +1,7 @@
 name: topo2
 topology:
   kinds:
-    srl:
+    nokia_srlinux:
       license: kind.lic
       type: ixrd2
       env:
@@ -11,11 +11,11 @@ topology:
         kind-label: value
   nodes:
     node1:
-      kind: srl
+      kind: nokia_srlinux
       binds:
         - node1.lic:/dst1
         - kind.lic:/dst2
         - __clabNodeDir__/somefile:/somefile
     node2:
-      kind: srl
+      kind: nokia_srlinux
       type: ixr10
diff --git a/clab/test_data/topo3.yml b/clab/test_data/topo3.yml
@@ -12,7 +12,7 @@ topology:
       default-label: value
   nodes:
     node1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixrd3
     node2:
-      kind: srl
+      kind: nokia_srlinux
diff --git a/clab/test_data/topo4.yml b/clab/test_data/topo4.yml
@@ -10,7 +10,7 @@ topology:
       env3: global
     user: customglobal
   kinds:
-    srl:
+    nokia_srlinux:
       license: kind.lic
       binds:
         - kind.lic:/dst2
@@ -20,7 +20,7 @@ topology:
       user: customkind
   nodes:
     node1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixrd3
       license: node1.lic
       binds:

diff --git a/clab/test_data/topo5.yml b/clab/test_data/topo5.yml
@@ -1,12 +1,12 @@
 name: topo5
 topology:
   kinds:
-    srl:
+    nokia_srlinux:
       binds:
         - kind.lic:/dst
   nodes:
     node1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixrd3
       license: node1.lic
       binds:

diff --git a/clab/test_data/topo8_ansible_groups.yml b/clab/test_data/topo8_ansible_groups.yml
@@ -2,7 +2,7 @@ name: topo8_ansible_groups
 topology:
   nodes:
     node1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixrd3
       license: node1.lic
       binds:
@@ -14,7 +14,7 @@ topology:
       labels:
         ansible-group: spine
     node2:
-      kind: srl
+      kind: nokia_srlinux
       license: node1.lic
       user: custom
       mgmt-ipv4: 172.100.100.12
@@ -23,7 +23,7 @@ topology:
         ansible-group: extra_group
 
     node3:
-      kind: srl
+      kind: nokia_srlinux
       license: node1.lic
       user: custom
       mgmt-ipv4: 172.100.100.13

diff --git a/clab/test_data/topo9.yml b/clab/test_data/topo9.yml
@@ -10,7 +10,7 @@ topology:
       env3: global
     user: customglobal
   kinds:
-    srl:
+    nokia_srlinux:
       license: kind.lic
       binds:
         - kind.lic:/dst
@@ -20,7 +20,7 @@ topology:
       user: customkind
   nodes:
     node1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixrd3
       license: node1.lic
       binds:

diff --git a/docs/install.md b/docs/install.md
@@ -378,10 +378,10 @@ name: 2srl
 topology:
     nodes:
     srl1:
-        kind: srl
+        kind: nokia_srlinux
         image: ghcr.io/nokia/srlinux
     srl2:
-        kind: srl
+        kind: nokia_srlinux
         image: ghcr.io/nokia/srlinux
 
     links:

diff --git a/docs/manual/clabernetes/quickstart.md b/docs/manual/clabernetes/quickstart.md
@@ -169,11 +169,11 @@ kubectl get --namespace clabernetes Containerlabs srl02 -o yaml
         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
 
@@ -195,7 +195,7 @@ kubectl get --namespace clabernetes Containerlabs srl02 -o yaml
                         # here goes a list of exposed ports
                 nodes:
                     srl1:
-                        kind: srl
+                        kind: nokia_srlinux
                         startup-config: srl1.cfg
                         image: ghcr.io/nokia/srlinux
                 links:
@@ -213,7 +213,7 @@ kubectl get --namespace clabernetes Containerlabs srl02 -o yaml
                         # here goes a list of exposed ports
                 nodes:
                     srl2:
-                        kind: srl
+                        kind: nokia_srlinux
                         startup-config: srl2.cfg
                         image: ghcr.io/nokia/srlinux
                 links:

diff --git a/docs/manual/inventory.md b/docs/manual/inventory.md
@@ -141,9 +141,9 @@ Example of exported data when using default `auto.tmpl` template:
           image: ghcr.io/nokia/srlinux
       nodes:
         srl1:
-          kind: srl
+          kind: nokia_srlinux
         srl2:
-          kind: srl
+          kind: nokia_srlinux
 
       links:
         - endpoints: ["srl1:e1-1", "srl2:e1-1"]

diff --git a/docs/manual/kinds/bridge.md b/docs/manual/kinds/bridge.md
@@ -3,7 +3,9 @@ search:
   boost: 4
 ---
 <script type="text/javascript" src="https://viewer.diagrams.net/js/viewer-static.min.js" async></script>
+
 # Linux bridge
+
 Containerlab can connect its nodes to a Linux bridge instead of interconnecting the nodes directly. This connectivity option is enabled with `bridge` kind and opens a variety of integrations that containerlab labs can have with workloads of other types.
 
 For example, by connecting a lab node to a bridge we can:
@@ -13,10 +15,10 @@ For example, by connecting a lab node to a bridge we can:
 3. scale out containerlab labs by running separate labs in different hosts and get network reachability between them
 4. wiring nodes' data interfaces via a broadcast domain (linux bridge) and use vlans to making dynamic connections
 
-
 <div class="mxgraph" style="max-width:100%;border:1px solid transparent;margin:0 auto; display:block;" data-mxgraph="{&quot;page&quot;:8,&quot;zoom&quot;:1.5,&quot;highlight&quot;:&quot;#0000ff&quot;,&quot;nav&quot;:true,&quot;check-visible-state&quot;:true,&quot;resize&quot;:true,&quot;url&quot;:&quot;https://raw.githubusercontent.com/srl-labs/containerlab/diagrams/containerlab.drawio&quot;}"></div>
 
 ## Using bridge kind
+
 Containerlab doesn't create bridges on users behalf, that means that in order to use a bridge in the [topology definition file](../topo-def-file.md), the bridge needs to be created and enabled first.
 
 Once the bridge is created, it needs to be referenced as a node inside the topology file:
@@ -27,16 +29,16 @@ name: br01
 
 topology:
   kinds:
-    srl:
+    nokia_srlinux:
       type: ixrd2
       image: ghcr.io/nokia/srlinux
   nodes:
     srl1:
-      kind: srl
+      kind: nokia_srlinux
     srl2:
-      kind: srl
+      kind: nokia_srlinux
     srl3:
-      kind: srl
+      kind: nokia_srlinux
     # note, that the bridge br-clab must be created manually
     br-clab:
       kind: bridge
@@ -72,4 +74,4 @@ iptables -I FORWARD -i br-clab -j ACCEPT
 
 This will ensure that traffic is forwarded when passing this particular bridge. Note, that once you destroy the lab, the rule will stay.
 
-Check out ["External bridge"](../../lab-examples/ext-bridge.md) lab for a ready-made example on how to use bridges.
+Check out ["External bridge"](../../lab-examples/ext-bridge.md) lab for a ready-made example on how to use bridges.
diff --git a/docs/manual/kinds/ext-container.md b/docs/manual/kinds/ext-container.md
@@ -21,7 +21,7 @@ name: ext-cont
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
     external-node1: #(1)!
       kind: ext-container
@@ -44,7 +44,7 @@ For example, when deploying containerlab topology, users can execute commands in
 topology:
   nodes:
     srl:
-      kind: srl
+      kind: nokia_srlinux
       image: ghcr.io/nokia/srlinux
     external-node1: #(1)!
       kind: ext-container

diff --git a/docs/manual/kinds/index.md b/docs/manual/kinds/index.md
@@ -16,7 +16,7 @@ name: srlceos01
 topology:
   nodes:
     node1:
-      kind: srl              # node1 is of srl kind
+      kind: nokia_srlinux              # node1 is of srl kind
       type: ixrd2
       image: ghcr.io/nokia/srlinux
     node2:

diff --git a/docs/manual/kinds/srl.md b/docs/manual/kinds/srl.md
@@ -140,7 +140,7 @@ name: srl_lab
 topology:
   nodes:
     srl1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixrd3
 ```
 
@@ -215,7 +215,7 @@ name: srl_lab
 topology:
   nodes:
     srl1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixrd3
       image: ghcr.io/nokia/srlinux
       # a path to the partial config in CLI format relative to the current working directory
@@ -233,7 +233,7 @@ name: srl_lab
 topology:
   nodes:
     srl1:
-      kind: srl
+      kind: nokia_srlinux
       type: ixrd3
       image: ghcr.io/nokia/srlinux
       # a path to the full config in JSON format relative to the current working directory
@@ -271,7 +271,7 @@ name: srl_lab_with_custom_agents
 topology:
   nodes:
     srl1:
-      kind: srl
+      kind: nokia_srlinux
       ...
       extras:
         srl-agents: