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/srl1.cli b/hackfest/containerlab/srl1.cli
new file mode 100644
index 0000000000000000000000000000000000000000..088a85eac55f515f10611834272bac51d45b65bb
--- /dev/null
+++ b/hackfest/containerlab/srl1.cli
@@ -0,0 +1,16 @@
+set / interface ethernet-1/2 admin-state enable
+set / interface ethernet-1/2 subinterface 0 ipv4 admin-state enable
+set / interface ethernet-1/2 subinterface 0 ipv4 address 172.16.1.1/24
+
+set / interface ethernet-1/1 admin-state enable
+set / interface ethernet-1/1 subinterface 0 ipv4 admin-state enable
+set / interface ethernet-1/1 subinterface 0 ipv4 address 172.0.0.1/30
+
+set / network-instance default interface ethernet-1/1.0
+set / network-instance default interface ethernet-1/2.0
+
+set / network-instance default next-hop-groups group group1 nexthop 1 ip-address 172.0.0.2 admin-state enable
+set / network-instance default static-routes route 172.16.2.0/24 next-hop-group group1 admin-state enable
+
+set / system management openconfig admin-state enable
+set / system gnmi-server network-instance mgmt yang-models openconfig
\ No newline at end of file
diff --git a/hackfest/containerlab/srl2.cli b/hackfest/containerlab/srl2.cli
new file mode 100644
index 0000000000000000000000000000000000000000..1a71a7169af3659a87356d754fa19f6f485caafd
--- /dev/null
+++ b/hackfest/containerlab/srl2.cli
@@ -0,0 +1,16 @@
+set / interface ethernet-1/2 admin-state enable
+set / interface ethernet-1/2 subinterface 0 ipv4 admin-state enable
+set / interface ethernet-1/2 subinterface 0 ipv4 address 172.16.2.1/24
+
+set / interface ethernet-1/1 admin-state enable
+set / interface ethernet-1/1 subinterface 0 ipv4 admin-state enable
+set / interface ethernet-1/1 subinterface 0 ipv4 address 172.0.0.2/30
+
+set / network-instance default interface ethernet-1/1.0
+set / network-instance default interface ethernet-1/2.0
+
+set / network-instance default next-hop-groups group group1 nexthop 1 ip-address 172.0.0.1 admin-state enable
+set / network-instance default static-routes route 172.16.1.0/24 next-hop-group group1 admin-state enable
+
+set / system management openconfig admin-state enable
+set / system gnmi-server network-instance mgmt yang-models openconfig
\ No newline at end of file
diff --git a/hackfest/containerlab/tfs-scenario.clab.yml b/hackfest/containerlab/tfs-scenario.clab.yml
index f79378757827ff706be849b03277b947ee85f7fb..8b0ca61300a5f856a365fbc9a4d6a6496daf15db 100644
--- a/hackfest/containerlab/tfs-scenario.clab.yml
+++ b/hackfest/containerlab/tfs-scenario.clab.yml
@@ -20,38 +20,43 @@ name: tfs-scenario
mgmt:
network: mgmt-net
ipv4-subnet: 172.100.100.0/24
-
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: srl1.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: srl2.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"]