From 7bcd935e69c8b532688648e701e6ecc86d8557f6 Mon Sep 17 00:00:00 2001
From: darnodo <sepales.pret0h@icloud.com>
Date: Sun, 30 Mar 2025 14:18:59 +0200
Subject: [PATCH] chore(cleaning) : Remove useless information on README -
 Adapt devcontainer to used dood instead of dind - Re-organize template

---
 .devcontainer/devcontainer.json |  7 ++++++-
 documentation/INSTALLATION.md   | 15 ---------------
 templates/leaves.j2             | 10 ++++++----
 templates/spines.j2             |  5 ++++-
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e010018..206ebf3 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,5 +1,10 @@
 {
-    "image": "ghcr.io/srl-labs/containerlab/devcontainer-dind:latest",
+    "image": "ghcr.io/srl-labs/containerlab/devcontainer-dood:latest",
+    "runArgs": [
+        "--network=host",
+        "--pid=host",
+        "--privileged"
+    ],
     "forwardPorts": [
         50080,
         5001
diff --git a/documentation/INSTALLATION.md b/documentation/INSTALLATION.md
index 58b1533..4c739dc 100755
--- a/documentation/INSTALLATION.md
+++ b/documentation/INSTALLATION.md
@@ -71,21 +71,6 @@ To add this new image to docker, please use the docker CLI command :
 docker import cEOS64-lab-4.33.2F.tar.xz ceos:4.33.2F
 ```
 
-### Nokia SR Linux
-
-```bash
-docker pull ghcr.io/nokia/srlinux
-```
-
-Now you should see images available to use :
-
-```bash
-➜  projet-vxlan-automation git:(main) ✗ docker images
-REPOSITORY              TAG       IMAGE ID       CREATED       SIZE
-ceos                    4.32.0.1F   63870e68ff8d   2 days ago    1.95GB
-ghcr.io/nokia/srlinux   latest    801eb020ad70   11 days ago   2.59GB
-```
-
 ## Install Netbox and plugins
 
   For this project, we need to install specific plugin :  
diff --git a/templates/leaves.j2 b/templates/leaves.j2
index 5f014f6..9f03f4f 100644
--- a/templates/leaves.j2
+++ b/templates/leaves.j2
@@ -1,4 +1,9 @@
-{# Leaf Configuration Template #}
+
+{# Routing and VXLAN functionnalities #}
+service routing protocols model multi-agent
+ip routing
+
+{# Interfaces configuration #}
 {%- for interface in device.interfaces.all() %}
 interface {{ interface.name }}
 {%- if interface.description %}
@@ -23,9 +28,6 @@ interface {{ interface.name }}
 !
 {%- endfor %}
 
-service routing protocols model multi-agent
-ip routing
-
 {# BGP Route-Maps and Prefix Lists #}
 {%- set loopback_ip = device.interfaces.get(name='Loopback0').ip_addresses.first().address %}
 ip prefix-list VTEP_PREFIX seq 10 permit {{ loopback_ip }}
diff --git a/templates/spines.j2 b/templates/spines.j2
index 11662a9..04396ef 100644
--- a/templates/spines.j2
+++ b/templates/spines.j2
@@ -1,3 +1,7 @@
+{# Routing functionnality #}
+ip routing
+
+{# Interfaces configuration #}
 {%- for interface in device.interfaces.all() %}
 interface {{ interface.name }}
 {%- if interface.description %}
@@ -14,7 +18,6 @@ interface {{ interface.name }}
 {%- endfor %}
 
 {# BGP Configuration #}
-ip routing
 {%- set loopback_interface = device.interfaces.get(name='Loopback0') %}
 {%- set router_id = loopback_interface.ip_addresses.first().address.ip %}
 router bgp {{ device.custom_field_data.ASN }}