diff --git a/hackfest/containerlab/README.md b/hackfest/containerlab/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..e08e944e991d8cb8599e89fab63f4b8b664ed73c
--- /dev/null
+++ b/hackfest/containerlab/README.md
@@ -0,0 +1,35 @@
+# ContainerLab
+
+The setup consists of a management network for configuring and managing nodes.
+srl1 and srl2 are interconnected.
+client1 is connected to srl1 and client2 to srl2.
+Routing between client1 and client2 is set up via the Nokia SR Linux nodes.
+
+## Management Network
+Name: mgmt-net
+Subnet: 172.100.100.0/24
+
+## Node Kinds
+Nokia SR Linux: Image ghcr.io/nokia/srlinux:23.10.3
+Linux: Image ghcr.io/hellt/network-multitool
+
+## Nodes
+
+### Nokia SR Linux
+- Type: ixr6
+- CPU: 0.5
+- Memory: 2GB
+- Management IP: 172.100.100.101
+
+The provided SR Linux CLI commands in the _srl.cli_ enables system management and configures the GNMI server with OpenConfig models.
+
+### Linux
+
+Assigns IP 172.16.1.10/24 to eth1 and adds route to 172.16.2.0/24 via 172.16.1.1
+
+In this topology file, the clients are pre-configured with the respectivly IP addresses in their interfaces and routes in their IP tables.
+
+### Links
+- Connect srl1:e1-1 to srl2:e1-1
+- Connect client1:eth1 to srl1:e1-2
+- Connect client2:eth1 to srl2:e1-2
\ No newline at end of file
diff --git a/hackfest/containerlab/commands.txt b/hackfest/containerlab/commands.txt
index df5fbc0ce0163f4ce06b862e90e29854dbae204a..ac91d4b08b913209151e4024eb04b31384ed641a 100644
--- a/hackfest/containerlab/commands.txt
+++ b/hackfest/containerlab/commands.txt
@@ -83,19 +83,19 @@ $ssh admin@clab-tfs-scenario-srl1
# Check configurations done:
-gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/network-instances' > srl1-nis.json
-gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/interfaces' > srl1-ifs.json
-gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/network-instances' > srl2-nis.json
-gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/interfaces' > srl2-ifs.json
+gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/network-instances' > srl1-nis.json
+gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/interfaces' > srl1-ifs.json
+gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/network-instances' > srl2-nis.json
+gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/interfaces' > srl2-ifs.json
# Delete elements:
-gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/network-instances/network-instance[name=b19229e8]'
-gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/1]/subinterfaces/subinterface[index=0]'
-gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/2]/subinterfaces/subinterface[index=0]'
-gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/network-instances/network-instance[name=b19229e8]'
-gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/1]/subinterfaces/subinterface[index=0]'
-gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/2]/subinterfaces/subinterface[index=0]'
+gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/network-instances/network-instance[name=b19229e8]'
+gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/1]/subinterfaces/subinterface[index=0]'
+gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/2]/subinterfaces/subinterface[index=0]'
+gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/network-instances/network-instance[name=b19229e8]'
+gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/1]/subinterfaces/subinterface[index=0]'
+gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/2]/subinterfaces/subinterface[index=0]'
# Run gNMI Driver in standalone mode (advanced)
PYTHONPATH=./src python -m src.device.tests.test_gnmi
diff --git a/hackfest/containerlab/srl.cli b/hackfest/containerlab/srl.cli
new file mode 100644
index 0000000000000000000000000000000000000000..7d4987e22795ddd4667e030abddbc11827b9dc66
--- /dev/null
+++ b/hackfest/containerlab/srl.cli
@@ -0,0 +1,2 @@
+set / system management openconfig admin-state enable
+set / system gnmi-server network-instance mgmt yang-models openconfig
diff --git a/hackfest/containerlab/tfs-scenario.clab.yml b/hackfest/containerlab/tfs-scenario.clab.yml
index f79378757827ff706be849b03277b947ee85f7fb..c715a1a539b59d807cd13c03f75f7de2e7bae084 100644
--- a/hackfest/containerlab/tfs-scenario.clab.yml
+++ b/hackfest/containerlab/tfs-scenario.clab.yml
@@ -23,35 +23,41 @@ mgmt:
topology:
kinds:
- srl:
- image: ghcr.io/nokia/srlinux:23.3.1
+ nokia_srlinux:
+ image: ghcr.io/nokia/srlinux:23.10.3
linux:
image: ghcr.io/hellt/network-multitool
nodes:
srl1:
- kind: srl
+ kind: nokia_srlinux
type: ixr6
cpu: 0.5
- memory: 1GB
+ memory: 2GB
mgmt-ipv4: 172.100.100.101
- #startup-config: srl1.cli
+ startup-config: srl.cli
srl2:
- kind: srl
+ kind: nokia_srlinux
type: ixr6
cpu: 0.5
- memory: 1GB
+ memory: 2GB
mgmt-ipv4: 172.100.100.102
- #startup-config: srl2.cli
+ startup-config: srl.cli
client1:
kind: linux
cpu: 0.1
memory: 100MB
mgmt-ipv4: 172.100.100.201
+ exec:
+ - ip address add 172.16.1.10/24 dev eth1
+ - ip route add 172.16.2.0/24 via 172.16.1.1
client2:
kind: linux
cpu: 0.1
memory: 100MB
mgmt-ipv4: 172.100.100.202
+ exec:
+ - ip address add 172.16.2.10/24 dev eth1
+ - ip route add 172.16.1.0/24 via 172.16.2.1
links:
- endpoints: ["srl1:e1-1", "srl2:e1-1"]