From 830b453ec67b3295066d57bab7b15511bc7dd63d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Ara=C3=BAjo?= <davidaraujo@av.it.pt>
Date: Mon, 29 Apr 2024 16:30:27 +0100
Subject: [PATCH] Revert "Container lab fixed"
This reverts commit 610f10e79f4d22d927239994e916ace3d61f8b9a.
---
hackfest/containerlab/srl1.cli | 14 --------------
hackfest/containerlab/srl2.cli | 14 --------------
hackfest/containerlab/tfs-scenario.clab.yml | 12 +++---------
3 files changed, 3 insertions(+), 37 deletions(-)
delete mode 100644 hackfest/containerlab/srl1.cli
delete mode 100644 hackfest/containerlab/srl2.cli
diff --git a/hackfest/containerlab/srl1.cli b/hackfest/containerlab/srl1.cli
deleted file mode 100644
index fd7144ca7..000000000
--- a/hackfest/containerlab/srl1.cli
+++ /dev/null
@@ -1,14 +0,0 @@
-set / interface ethernet-1/2 admin-state enable
-set / interface ethernet-1/2 subinterface 0 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 admin-state enable
-set / interface ethernet-1/1 subinterface 0 ipv4 address 172.0.0.1/30
-
-set / network-instance default
-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
\ No newline at end of file
diff --git a/hackfest/containerlab/srl2.cli b/hackfest/containerlab/srl2.cli
deleted file mode 100644
index 395d53c71..000000000
--- a/hackfest/containerlab/srl2.cli
+++ /dev/null
@@ -1,14 +0,0 @@
-set / interface ethernet-1/2 admin-state enable
-set / interface ethernet-1/2 subinterface 0 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 admin-state enable
-set / interface ethernet-1/1 subinterface 0 ipv4 address 172.0.0.2/30
-
-set / network-instance default
-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
\ No newline at end of file
diff --git a/hackfest/containerlab/tfs-scenario.clab.yml b/hackfest/containerlab/tfs-scenario.clab.yml
index 91467d2b9..f79378757 100644
--- a/hackfest/containerlab/tfs-scenario.clab.yml
+++ b/hackfest/containerlab/tfs-scenario.clab.yml
@@ -24,7 +24,7 @@ mgmt:
topology:
kinds:
srl:
- image: ghcr.io/nokia/srlinux:21.11.3
+ image: ghcr.io/nokia/srlinux:23.3.1
linux:
image: ghcr.io/hellt/network-multitool
nodes:
@@ -34,30 +34,24 @@ topology:
cpu: 0.5
memory: 1GB
mgmt-ipv4: 172.100.100.101
- startup-config: ./srl1.cli
+ #startup-config: srl1.cli
srl2:
kind: srl
type: ixr6
cpu: 0.5
memory: 1GB
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"]
--
GitLab