From 566304494a1a5447c7c9771b9f93b6130090d037 Mon Sep 17 00:00:00 2001 From: Dennis Fanshaw <64549250+hyposcaler-bot@users.noreply.github.com> Date: Mon, 14 Oct 2024 13:08:10 +0000 Subject: [PATCH 1/2] change default ipv6 mgmt prefix to use 3fff:172:20:20::/64 --- clab/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clab/config.go b/clab/config.go index ae2806293..3928628c5 100644 --- a/clab/config.go +++ b/clab/config.go @@ -28,7 +28,7 @@ const ( // a name of a docker network that nodes management interfaces connect to. dockerNetName = "clab" dockerNetIPv4Addr = "172.20.20.0/24" - dockerNetIPv6Addr = "2001:172:20:20::/64" + dockerNetIPv6Addr = "3fff:172:20:20::/64" // veth link mtu. DefaultVethLinkMTU = 9500 From eddaea9a5c56a8f1eed274330573695aa2b14693 Mon Sep 17 00:00:00 2001 From: Roman Dodin Date: Mon, 14 Oct 2024 16:34:36 +0300 Subject: [PATCH 2/2] change v6 prefix in the docs --- docs/cmd/inspect.md | 26 ++++++++-------- docs/install.md | 6 ++-- docs/lab-examples/cvx02.md | 2 +- docs/lab-examples/min-5clos.md | 28 ++++++++--------- docs/lab-examples/peering-lab.md | 16 +++++----- docs/manual/clabernetes/quickstart.md | 2 +- docs/manual/inventory.md | 6 ++-- docs/manual/kinds/ceos.md | 4 +-- docs/manual/kinds/crpd.md | 4 +-- docs/manual/kinds/srl.md | 2 +- docs/manual/network.md | 26 ++++++++-------- docs/manual/nodes.md | 2 +- docs/quickstart.md | 4 +-- docs/rn/0.26.md | 2 +- lab-examples/clos02/README.md | 28 ++++++++--------- lab-examples/clos02/setup.clos02.clab.yml | 30 +++++++++---------- .../templated01/topology_config.gotmpl | 4 +-- .../templated02/topology_config.gotmpl | 8 ++--- schemas/clab.schema.json | 8 ++--- tests/01-smoke/01-basic-flow.robot | 2 +- tests/01-smoke/01-linux-nodes.clab.yml | 4 +-- 21 files changed, 107 insertions(+), 107 deletions(-) diff --git a/docs/cmd/inspect.md b/docs/cmd/inspect.md index 45c1ecd04..1695adba0 100644 --- a/docs/cmd/inspect.md +++ b/docs/cmd/inspect.md @@ -51,10 +51,10 @@ The local `-w | --wide` flag adds all available columns to the `inspect` output +---+------------+----------+-----------------+--------------+--------------------+------+-------+---------+----------------+----------------------+ | # | Topo Path | Lab Name | Name | Container ID | Image | Kind | Group | State | IPv4 Address | IPv6 Address | +---+------------+----------+-----------------+--------------+--------------------+------+-------+---------+----------------+----------------------+ -| 1 | newlab.yml | newlab | clab-newlab-n1 | 3c8262034088 | srlinux:20.6.3-145 | srl | | running | 172.20.20.4/24 | 2001:172:20:20::4/80 | -| 2 | | | clab-newlab-n2 | 79c562b71997 | srlinux:20.6.3-145 | srl | | running | 172.20.20.5/24 | 2001:172:20:20::5/80 | -| 3 | srl02.yml | srl01 | clab-srl01-srl | 13c9e7543771 | srlinux:20.6.3-145 | srl | | running | 172.20.20.2/24 | 2001:172:20:20::2/80 | -| 4 | | | clab-srl01-srl2 | 8cfca93b7b6f | srlinux:20.6.3-145 | srl | | running | 172.20.20.3/24 | 2001:172:20:20::3/80 | +| 1 | newlab.yml | newlab | clab-newlab-n1 | 3c8262034088 | srlinux:20.6.3-145 | srl | | running | 172.20.20.4/24 | 3fff:172:20:20::4/80 | +| 2 | | | clab-newlab-n2 | 79c562b71997 | srlinux:20.6.3-145 | srl | | running | 172.20.20.5/24 | 3fff:172:20:20::5/80 | +| 3 | srl02.yml | srl01 | clab-srl01-srl | 13c9e7543771 | srlinux:20.6.3-145 | srl | | running | 172.20.20.2/24 | 3fff:172:20:20::2/80 | +| 4 | | | clab-srl01-srl2 | 8cfca93b7b6f | srlinux:20.6.3-145 | srl | | running | 172.20.20.3/24 | 3fff:172:20:20::3/80 | +---+------------+----------+-----------------+--------------+--------------------+------+-------+---------+----------------+----------------------+ ``` @@ -67,8 +67,8 @@ Provide information about the running lab named `srlceos01` +---+---------------------+--------------+---------+------+-------+---------+----------------+----------------------+ | # | Name | Container ID | Image | Kind | Group | State | IPv4 Address | IPv6 Address | +---+---------------------+--------------+---------+------+-------+---------+----------------+----------------------+ -| 1 | clab-srlceos01-ceos | 90bebb1e2c5f | ceos | ceos | | running | 172.20.20.4/24 | 2001:172:20:20::4/80 | -| 2 | clab-srlceos01-srl | 82e9aa3c7e6b | srlinux | srl | | running | 172.20.20.3/24 | 2001:172:20:20::3/80 | +| 1 | clab-srlceos01-ceos | 90bebb1e2c5f | ceos | ceos | | running | 172.20.20.4/24 | 3fff:172:20:20::4/80 | +| 2 | clab-srlceos01-srl | 82e9aa3c7e6b | srlinux | srl | | running | 172.20.20.3/24 | 3fff:172:20:20::3/80 | +---+---------------------+--------------+---------+------+-------+---------+----------------+----------------------+ ``` @@ -80,8 +80,8 @@ INFO[0000] Parsing & checking topology file: srl02.clab.yml +---+-----------------+--------------+-----------------------+------+---------+----------------+----------------------+ | # | Name | Container ID | Image | Kind | State | IPv4 Address | IPv6 Address | +---+-----------------+--------------+-----------------------+------+---------+----------------+----------------------+ -| 1 | clab-srl02-srl1 | 7a7c101be7d8 | ghcr.io/nokia/srlinux | srl | running | 172.20.20.4/24 | 2001:172:20:20::4/64 | -| 2 | clab-srl02-srl2 | 5e3737621753 | ghcr.io/nokia/srlinux | srl | running | 172.20.20.5/24 | 2001:172:20:20::5/64 | +| 1 | clab-srl02-srl1 | 7a7c101be7d8 | ghcr.io/nokia/srlinux | srl | running | 172.20.20.4/24 | 3fff:172:20:20::4/64 | +| 2 | clab-srl02-srl2 | 5e3737621753 | ghcr.io/nokia/srlinux | srl | running | 172.20.20.5/24 | 3fff:172:20:20::5/64 | +---+-----------------+--------------+-----------------------+------+---------+----------------+----------------------+ ``` @@ -94,9 +94,9 @@ clab inspect --all --wide +---+-----------------------------------+----------+-------+-----------------+--------------+-----------------------+---------------+---------+----------------+----------------------+ | # | Topo Path | Lab Name | Owner | Name | Container ID | Image | Kind | State | IPv4 Address | IPv6 Address | +---+-----------------------------------+----------+-------+-----------------+--------------+-----------------------+---------------+---------+----------------+----------------------+ -| 1 | lab-examples/srl01/srl01.clab.yml | srl01 | user1 | clab-srl01-srl | ea86f40b412a | ghcr.io/nokia/srlinux | nokia_srlinux | running | 172.20.20.2/24 | 2001:172:20:20::2/64 | -| 2 | lab-examples/srl02/srl02.clab.yml | srl02 | user2 | clab-srl02-srl1 | ba7e807235b6 | ghcr.io/nokia/srlinux | nokia_srlinux | running | 172.20.20.4/24 | 2001:172:20:20::4/64 | -| 3 | | | | clab-srl02-srl2 | 71006155b70a | ghcr.io/nokia/srlinux | nokia_srlinux | running | 172.20.20.3/24 | 2001:172:20:20::3/64 | +| 1 | lab-examples/srl01/srl01.clab.yml | srl01 | user1 | clab-srl01-srl | ea86f40b412a | ghcr.io/nokia/srlinux | nokia_srlinux | running | 172.20.20.2/24 | 3fff:172:20:20::2/64 | +| 2 | lab-examples/srl02/srl02.clab.yml | srl02 | user2 | clab-srl02-srl1 | ba7e807235b6 | ghcr.io/nokia/srlinux | nokia_srlinux | running | 172.20.20.4/24 | 3fff:172:20:20::4/64 | +| 3 | | | | clab-srl02-srl2 | 71006155b70a | ghcr.io/nokia/srlinux | nokia_srlinux | running | 172.20.20.3/24 | 3fff:172:20:20::3/64 | +---+-----------------------------------+----------+-------+-----------------+--------------+-----------------------+---------------+---------+----------------+----------------------+ ``` @@ -113,7 +113,7 @@ clab inspect --all --wide "kind": "srl", "state": "running", "ipv4_address": "172.20.20.3/24", - "ipv6_address": "2001:172:20:20::3/80" + "ipv6_address": "3fff:172:20:20::3/80" }, { "lab_name": "srlceos01", @@ -123,7 +123,7 @@ clab inspect --all --wide "kind": "ceos", "state": "running", "ipv4_address": "172.20.20.4/24", - "ipv6_address": "2001:172:20:20::4/80" + "ipv6_address": "3fff:172:20:20::4/80" } ] ``` diff --git a/docs/install.md b/docs/install.md index e2ac6c258..8bd5ab211 100644 --- a/docs/install.md +++ b/docs/install.md @@ -463,7 +463,7 @@ root@docker-desktop:/Users/romandodin/clab# clab dep -t 2srl.clab.yml INFO[0000] Parsing & checking topology file: 2srl.clab.yml INFO[0000] Creating lab directory: /Users/romandodin/clab/clab-2srl INFO[0000] Creating root CA -INFO[0000] Creating docker network: Name='clab', IPv4Subnet='172.20.20.0/24', IPv6Subnet='2001:172:20:20::/64', MTU='1500' +INFO[0000] Creating docker network: Name='clab', IPv4Subnet='172.20.20.0/24', IPv6Subnet='3fff:172:20:20::/64', MTU='1500' INFO[0000] Creating container: srl1 INFO[0000] Creating container: srl2 INFO[0001] Creating virtual wire: srl1:e1-1 <--> srl2:e1-1 @@ -471,8 +471,8 @@ INFO[0001] Adding containerlab host entries to /etc/hosts file +---+----------------+--------------+-----------------------+------+-------+---------+----------------+----------------------+ | # | Name | Container ID | Image | Kind | Group | State | IPv4 Address | IPv6 Address | +---+----------------+--------------+-----------------------+------+-------+---------+----------------+----------------------+ -| 1 | clab-2srl-srl1 | 574bf836fb40 | ghcr.io/nokia/srlinux | srl | | running | 172.20.20.2/24 | 2001:172:20:20::2/64 | -| 2 | clab-2srl-srl2 | f88531a74ffb | ghcr.io/nokia/srlinux | srl | | running | 172.20.20.3/24 | 2001:172:20:20::3/64 | +| 1 | clab-2srl-srl1 | 574bf836fb40 | ghcr.io/nokia/srlinux | srl | | running | 172.20.20.2/24 | 3fff:172:20:20::2/64 | +| 2 | clab-2srl-srl2 | f88531a74ffb | ghcr.io/nokia/srlinux | srl | | running | 172.20.20.3/24 | 3fff:172:20:20::3/64 | +---+----------------+--------------+-----------------------+------+-------+---------+----------------+----------------------+ ``` diff --git a/docs/lab-examples/cvx02.md b/docs/lab-examples/cvx02.md index 7eaab22ea..4464a4734 100644 --- a/docs/lab-examples/cvx02.md +++ b/docs/lab-examples/cvx02.md @@ -21,7 +21,7 @@ Once the lab is started, the nodes will be able to ping each other: ``` $ clab-cvx02-sw1 -Warning: Permanently added 'clab-cvx02-sw1,2001:172:20:20::3' (ECDSA) to the list of known hosts. +Warning: Permanently added 'clab-cvx02-sw1,3fff:172:20:20::3' (ECDSA) to the list of known hosts. root@clab-cvx02-sw1's password: Linux sw1 5.10.16.3-networkop+ #17 SMP Mon May 24 15:22:51 BST 2021 x86_64 root@sw1:mgmt:~# ping 12.12.12.2 diff --git a/docs/lab-examples/min-5clos.md b/docs/lab-examples/min-5clos.md index dad91e3d2..2aad65ad5 100644 --- a/docs/lab-examples/min-5clos.md +++ b/docs/lab-examples/min-5clos.md @@ -56,61 +56,61 @@ The following table outlines the addressing plan used in this lab: | Source | Interface | Towards | IPv4 | IPv6 | | ----------- | -------------- | ----------- | ------------------- | ------------------------- | -| leaf1 | mgmt0.0 | - | `172.100.100.2/24` | `2001:172:100:100::2/64` | +| leaf1 | mgmt0.0 | - | `172.100.100.2/24` | `3fff:172:100:100::2/64` | | | system0.0 | - | `30.0.0.1/32` | `3000:30:0:0::1/128` | | | ethernet-1/1.0 | spine1 | `10.0.0.0/31` | `1000:10:0:0::0/127` | | | ethernet-1/2.0 | spine2 | `10.0.0.2/31` | `1000:10:0:0::2/127` | | | ethernet-1/3.0 | client1 | `10.0.0.24/31` | `1000:10:0:0::24/127` | -| leaf2 | mgmt0.0 | - | `172.100.100.3/24` | `2001:172:100:100::3/64` | +| leaf2 | mgmt0.0 | - | `172.100.100.3/24` | `3fff:172:100:100::3/64` | | | system0.0 | - | `30.0.0.2/32` | `3000:30:0:0::2/128` | | | ethernet-1/1.0 | spine1 | `10.0.0.4/31` | `1000:10:0:0::4/127` | | | ethernet-1/2.0 | spine2 | `10.0.0.6/31` | `1000:10:0:0::6/127` | | | ethernet-1/3.0 | client2 | `10.0.0.26/31` | `1000:10:0:0::26/127` | -| leaf3 | mgmt0.0 | - | `172.100.100.4/24` | `2001:172:100:100::4/64` | +| leaf3 | mgmt0.0 | - | `172.100.100.4/24` | `3fff:172:100:100::4/64` | | | system0.0 | - | `30.0.0.3/32` | `3000:30:0:0::3/128` | | | ethernet-1/1.0 | spine3 | `10.0.0.12/31` | `1000:10:0:0::12/127` | | | ethernet-1/2.0 | spine4 | `10.0.0.14/31` | `1000:10:0:0::14/127` | | | ethernet-1/3.0 | client3 | `10.0.0.28/31` | `1000:10:0:0::28/127` | -| leaf4 | mgmt0.0 | - | `172.100.100.5/24` | `2001:172:100:100::5/64` | +| leaf4 | mgmt0.0 | - | `172.100.100.5/24` | `3fff:172:100:100::5/64` | | | system0.0 | - | `30.0.0.4/32` | `3000:30:0:0::4/128` | | | ethernet-1/1.0 | spine3 | `10.0.0.16/31` | `1000:10:0:0::16/127` | | | ethernet-1/2.0 | spine4 | `10.0.0.18/31` | `1000:10:0:0::18/127` | | | ethernet-1/3.0 | client4 | `10.0.0.30/31` | `1000:10:0:0::30/127` | -| spine1 | mgmt0.0 | - | `172.100.100.6/24` | `2001:172:100:100::6/64` | +| spine1 | mgmt0.0 | - | `172.100.100.6/24` | `3fff:172:100:100::6/64` | | | system0.0 | - | `30.0.0.5/32` | `3000:30:0:0::5/128` | | | ethernet-1/1.0 | leaf1 | `10.0.0.1/31` | `1000:10:0:0::1/127` | | | ethernet-1/2.0 | leaf2 | `10.0.0.5/31` | `1000:10:0:0::5/127` | | | ethernet-1/3.0 | superspine1 | `10.0.0.8/31` | `1000:10:0:0::8/127` | -| spine2 | mgmt0.0 | - | `172.100.100.7/24` | `2001:172:100:100::7/64` | +| spine2 | mgmt0.0 | - | `172.100.100.7/24` | `3fff:172:100:100::7/64` | | | system0.0 | - | `30.0.0.6/32` | `3000:30:0:0::6/128` | | | ethernet-1/1.0 | leaf1 | `10.0.0.3/31` | `1000:10:0:0::3/127` | | | ethernet-1/2.0 | leaf2 | `10.0.0.7/31` | `1000:10:0:0::7/127` | | | ethernet-1/3.0 | superspine2 | `10.0.0.10/31` | `1000:10:0:0::10/127` | -| spine3 | mgmt0.0 | - | `172.100.100.8/24` | `2001:172:100:100::8/64` | +| spine3 | mgmt0.0 | - | `172.100.100.8/24` | `3fff:172:100:100::8/64` | | | system0.0 | - | `30.0.0.7/32` | `3000:30:0:0::7/128` | | | ethernet-1/1.0 | leaf3 | `10.0.0.13/31` | `1000:10:0:0::13/127` | | | ethernet-1/2.0 | leaf4 | `10.0.0.17/31` | `1000:10:0:0::17/127` | | | ethernet-1/3.0 | superspine1 | `10.0.0.20/31` | `1000:10:0:0::20/127` | -| spine4 | mgmt0.0 | - | `172.100.100.9/24` | `2001:172:100:100::9/64` | +| spine4 | mgmt0.0 | - | `172.100.100.9/24` | `3fff:172:100:100::9/64` | | | system0.0 | - | `30.0.0.8/32` | `3000:30:0:0::8/128` | | | ethernet-1/1.0 | leaf3 | `10.0.0.15/31` | `1000:10:0:0::15/127` | | | ethernet-1/2.0 | leaf4 | `10.0.0.19/31` | `1000:10:0:0::19/127` | | | ethernet-1/3.0 | superspine2 | `10.0.0.22/31` | `1000:10:0:0::22/127` | -| superspine1 | mgmt0.0 | - | `172.100.100.10/24` | `2001:172:100:100::10/64` | +| superspine1 | mgmt0.0 | - | `172.100.100.10/24` | `3fff:172:100:100::10/64` | | | system0.0 | - | `30.0.0.9/32` | `3000:30:0:0::9/128` | | | ethernet-1/1.0 | spine1 | `10.0.0.9/31` | `1000:10:0:0::9/127` | | | ethernet-1/2.0 | spine3 | `10.0.0.21/31` | `1000:10:0:0::21/127` | -| superspine2 | mgmt0.0 | - | `172.100.100.11/24` | `2001:172:100:100::11/64` | +| superspine2 | mgmt0.0 | - | `172.100.100.11/24` | `3fff:172:100:100::11/64` | | | system0.0 | - | `30.0.0.10/32` | `3000:30:0:0::10/128` | | | ethernet-1/1.0 | spine2 | `10.0.0.11/31` | `1000:10:0:0::11/127` | | | ethernet-1/2.0 | spine4 | `10.0.0.23/31` | `1000:10:0:0::23/127` | -| client1 | eth0 | - | `172.100.100.12/24` | `2001:172:100:100::12/64` | +| client1 | eth0 | - | `172.100.100.12/24` | `3fff:172:100:100::12/64` | | | eth1 | leaf1 | `10.0.0.25/31` | `1000:10:0:0::25/127` | -| client2 | eth0 | - | `172.100.100.13/24` | `2001:172:100:100::13/64` | +| client2 | eth0 | - | `172.100.100.13/24` | `3fff:172:100:100::13/64` | | | eth1 | leaf2 | `10.0.0.27/31` | `1000:10:0:0::27/127` | -| client3 | eth0 | - | `172.100.100.14/24` | `2001:172:100:100::14/64` | +| client3 | eth0 | - | `172.100.100.14/24` | `3fff:172:100:100::14/64` | | | eth1 | leaf3 | `10.0.0.29/31` | `1000:10:0:0::29/127` | -| client4 | eth0 | - | `172.100.100.15/24` | `2001:172:100:100::15/64` | +| client4 | eth0 | - | `172.100.100.15/24` | `3fff:172:100:100::15/64` | | | eth1 | leaf4 | `10.0.0.31/31` | `1000:10:0:0::31/127` | Configuration snippets that are used to provision the nodes are contained within the [`configs`](https://github.com/srl-labs/containerlab/tree/main/lab-examples/clos02/configs) subdirectory. diff --git a/docs/lab-examples/peering-lab.md b/docs/lab-examples/peering-lab.md index 7f11c7641..111e32bb8 100644 --- a/docs/lab-examples/peering-lab.md +++ b/docs/lab-examples/peering-lab.md @@ -185,10 +185,10 @@ Upon successful deployment, containerlab presents the lab summary table that con +---+----------------+--------------+-------------------------------+---------------+---------+----------------+----------------------+ | # | Name | Container ID | Image | Kind | State | IPv4 Address | IPv6 Address | +---+----------------+--------------+-------------------------------+---------------+---------+----------------+----------------------+ -| 1 | clab-ixp-peer1 | c9f5301899fb | sros:23.3.R1 | vr-nokia_sros | running | 172.20.20.5/24 | 2001:172:20:20::5/64 | -| 2 | clab-ixp-peer2 | 83da54ce9f7b | quay.io/frrouting/frr:8.4.1 | linux | running | 172.20.20.3/24 | 2001:172:20:20::3/64 | -| 3 | clab-ixp-rs1 | 701ee906f03f | quay.io/openbgpd/openbgpd:7.9 | linux | running | 172.20.20.4/24 | 2001:172:20:20::4/64 | -| 4 | clab-ixp-rs2 | 7de1a2f30d52 | ghcr.io/srl-labs/bird:2.13 | linux | running | 172.20.20.2/24 | 2001:172:20:20::2/64 | +| 1 | clab-ixp-peer1 | c9f5301899fb | sros:23.3.R1 | vr-nokia_sros | running | 172.20.20.5/24 | 3fff:172:20:20::5/64 | +| 2 | clab-ixp-peer2 | 83da54ce9f7b | quay.io/frrouting/frr:8.4.1 | linux | running | 172.20.20.3/24 | 3fff:172:20:20::3/64 | +| 3 | clab-ixp-rs1 | 701ee906f03f | quay.io/openbgpd/openbgpd:7.9 | linux | running | 172.20.20.4/24 | 3fff:172:20:20::4/64 | +| 4 | clab-ixp-rs2 | 7de1a2f30d52 | ghcr.io/srl-labs/bird:2.13 | linux | running | 172.20.20.2/24 | 3fff:172:20:20::2/64 | +---+----------------+--------------+-------------------------------+---------------+---------+----------------+----------------------+ ``` @@ -203,10 +203,10 @@ $ containerlab inspect --all +---+--------------+----------+----------------+--------------+-------------------------------+---------------+---------+----------------+----------------------+ | # | Topo Path | Lab Name | Name | Container ID | Image | Kind | State | IPv4 Address | IPv6 Address | +---+--------------+----------+----------------+--------------+-------------------------------+---------------+---------+----------------+----------------------+ -| 1 | ixp.clab.yml | ixp | clab-ixp-peer1 | c9f5301899fb | sros:23.3.R1 | vr-nokia_sros | running | 172.20.20.5/24 | 2001:172:20:20::5/64 | -| 2 | | | clab-ixp-peer2 | 83da54ce9f7b | quay.io/frrouting/frr:8.4.1 | linux | running | 172.20.20.3/24 | 2001:172:20:20::3/64 | -| 3 | | | clab-ixp-rs1 | 701ee906f03f | quay.io/openbgpd/openbgpd:7.9 | linux | running | 172.20.20.4/24 | 2001:172:20:20::4/64 | -| 4 | | | clab-ixp-rs2 | 7de1a2f30d52 | ghcr.io/srl-labs/bird:2.13 | linux | running | 172.20.20.2/24 | 2001:172:20:20::2/64 | +| 1 | ixp.clab.yml | ixp | clab-ixp-peer1 | c9f5301899fb | sros:23.3.R1 | vr-nokia_sros | running | 172.20.20.5/24 | 3fff:172:20:20::5/64 | +| 2 | | | clab-ixp-peer2 | 83da54ce9f7b | quay.io/frrouting/frr:8.4.1 | linux | running | 172.20.20.3/24 | 3fff:172:20:20::3/64 | +| 3 | | | clab-ixp-rs1 | 701ee906f03f | quay.io/openbgpd/openbgpd:7.9 | linux | running | 172.20.20.4/24 | 3fff:172:20:20::4/64 | +| 4 | | | clab-ixp-rs2 | 7de1a2f30d52 | ghcr.io/srl-labs/bird:2.13 | linux | running | 172.20.20.2/24 | 3fff:172:20:20::2/64 | +---+--------------+----------+----------------+--------------+-------------------------------+---------------+---------+----------------+----------------------+ ``` diff --git a/docs/manual/clabernetes/quickstart.md b/docs/manual/clabernetes/quickstart.md index eb4f788c7..f8d4bb855 100644 --- a/docs/manual/clabernetes/quickstart.md +++ b/docs/manual/clabernetes/quickstart.md @@ -422,7 +422,7 @@ INFO[0000] Parsing & checking topology file: topo.clab.yaml +---+---------+--------------+-------------------------+-------+---------+----------------+----------------------+ | # | Name | Container ID | Image | Kind | State | IPv4 Address | IPv6 Address | +---+---------+--------------+-------------------------+-------+---------+----------------+----------------------+ -| 1 | client1 | dbde60209a3b | ghcr.io/srl-labs/alpine | linux | running | 172.20.20.2/24 | 2001:172:20:20::2/64 | +| 1 | client1 | dbde60209a3b | ghcr.io/srl-labs/alpine | linux | running | 172.20.20.2/24 | 3fff:172:20:20::2/64 | +---+---------+--------------+-------------------------+-------+---------+----------------+----------------------+ ``` diff --git a/docs/manual/inventory.md b/docs/manual/inventory.md index 16b84005e..9e9877cc1 100644 --- a/docs/manual/inventory.md +++ b/docs/manual/inventory.md @@ -179,7 +179,7 @@ Example of exported data when using default `auto.tmpl` template: "network": "clab", "bridge": "br-<...>", "ipv4-subnet": "172.20.20.0/24", - "ipv6-subnet": "2001:172:20:20::/64", + "ipv6-subnet": "3fff:172:20:20::/64", "mtu": "1500", "external-access": true }, @@ -200,7 +200,7 @@ Example of exported data when using default `auto.tmpl` template: "mgmt-intf": "", "mgmt-ipv4-address": "172.20.20.3", "mgmt-ipv4-prefix-length": 24, - "mgmt-ipv6-address": "2001:172:20:20::3", + "mgmt-ipv6-address": "3fff:172:20:20::3", "mgmt-ipv6-prefix-length": 64, "mac-address": "", "labels": { @@ -227,7 +227,7 @@ Example of exported data when using default `auto.tmpl` template: "mgmt-intf": "", "mgmt-ipv4-address": "172.20.20.2", "mgmt-ipv4-prefix-length": 24, - "mgmt-ipv6-address": "2001:172:20:20::2", + "mgmt-ipv6-address": "3fff:172:20:20::2", "mgmt-ipv6-prefix-length": 64, "mac-address": "", "labels": { diff --git a/docs/manual/kinds/ceos.md b/docs/manual/kinds/ceos.md index 077a978a1..919f7b31e 100644 --- a/docs/manual/kinds/ceos.md +++ b/docs/manual/kinds/ceos.md @@ -79,7 +79,7 @@ When containerlab launches ceos node, it will set IPv4/6 addresses as assigned b link/ether 02:42:ac:14:14:02 brd ff:ff:ff:ff:ff:ff link-netnsid 0 inet 172.20.20.2/24 brd 172.20.20.255 scope global eth0 valid_lft forever preferred_lft forever - inet6 2001:172:20:20::2/80 scope global + inet6 3fff:172:20:20::2/80 scope global valid_lft forever preferred_lft forever inet6 fe80::42:acff:fe14:1402/64 scope link valid_lft forever preferred_lft forever @@ -96,7 +96,7 @@ When containerlab launches ceos node, it will set IPv4/6 addresses as assigned b Interface Status MTU IPv6 Address Addr State Addr Source --------------- ------------ ---------- -------------------------------- ---------------- ----------- Ma0 up 1500 fe80::42:acff:fe14:1402/64 up link local - 2001:172:20:20::2/80 up config + 3fff:172:20:20::2/80 up config ``` As you see, the management interface `Ma0` inherits the IP address that docker assigned to ceos container management interface. diff --git a/docs/manual/kinds/crpd.md b/docs/manual/kinds/crpd.md index 84377ee76..2de7d2022 100644 --- a/docs/manual/kinds/crpd.md +++ b/docs/manual/kinds/crpd.md @@ -64,7 +64,7 @@ When containerlab launches cRPD node, it will assign IPv4/6 address to the `eth0 link/ether 02:42:ac:14:14:03 brd ff:ff:ff:ff:ff:ff link-netnsid 0 inet 172.20.20.3/24 brd 172.20.20.255 scope global eth0 valid_lft forever preferred_lft forever - inet6 2001:172:20:20::3/80 scope global nodad + inet6 3fff:172:20:20::3/80 scope global nodad valid_lft forever preferred_lft forever inet6 fe80::42:acff:fe14:1403/64 scope link valid_lft forever preferred_lft forever @@ -92,7 +92,7 @@ When containerlab launches cRPD node, it will assign IPv4/6 address to the `eth0 INET6 fe80::b4d3:63ff:fef1:cb7b eth0 Up ISO enabled INET 172.20.20.3 - INET6 2001:172:20:20::3 + INET6 3fff:172:20:20::3 INET6 fe80::42:acff:fe14:1403 ``` As you see, the management interface `eth0` inherits the IP address that docker assigned to cRPD container. diff --git a/docs/manual/kinds/srl.md b/docs/manual/kinds/srl.md index 2d91dc922..bce00f817 100644 --- a/docs/manual/kinds/srl.md +++ b/docs/manual/kinds/srl.md @@ -332,7 +332,7 @@ The certificate is generated for the following subjects (assuming node name is ` DNS:srl DNS:clab-srl-srl DNS:srl.srl.io -IP Address:172.20.20.3, IP Address:2001:172:20:20:0:0:0:3 +IP Address:172.20.20.3, IP Address:3fff:172:20:20:0:0:0:3 ``` Nokia SR Linux nodes support setting of [SANs](../nodes.md#subject-alternative-names-san). diff --git a/docs/manual/network.md b/docs/manual/network.md index 30e6d4713..29905ecf9 100644 --- a/docs/manual/network.md +++ b/docs/manual/network.md @@ -52,7 +52,7 @@ When no information about the management network is provided within the topo def The addressing information that containerlab will use on this network: * IPv4: subnet 172.20.20.0/24, gateway 172.20.20.1 -* IPv6: subnet 2001:172:20:20::/64, gateway 2001:172:20:20::1 +* IPv6: subnet 3fff:172:20:20::/64, gateway 3fff:172:20:20::1 This management network will be configured with MTU value matching the value of a `docker0` host interface to match docker configuration on the system. This option is [configurable](#mtu). @@ -65,8 +65,8 @@ With these defaults in place, the two containers from this lab will get connecte +---+-----------------+--------------+---------+------+-------+---------+----------------+----------------------+ | # | Name | Container ID | Image | Kind | Group | State | IPv4 Address | IPv6 Address | +---+-----------------+--------------+---------+------+-------+---------+----------------+----------------------+ -| 1 | clab-srl02-srl1 | ca24bf3d23f7 | srlinux | srl | | running | 172.20.20.3/24 | 2001:172:20:20::3/80 | -| 2 | clab-srl02-srl2 | ee585eac9e65 | srlinux | srl | | running | 172.20.20.2/24 | 2001:172:20:20::2/80 | +| 1 | clab-srl02-srl1 | ca24bf3d23f7 | srlinux | srl | | running | 172.20.20.3/24 | 3fff:172:20:20::3/80 | +| 2 | clab-srl02-srl2 | ee585eac9e65 | srlinux | srl | | running | 172.20.20.2/24 | 3fff:172:20:20::2/80 | +---+-----------------+--------------+---------+------+-------+---------+----------------+----------------------+ # addresses can also be fetched afterwards with `inspect` command @@ -74,12 +74,12 @@ With these defaults in place, the two containers from this lab will get connecte +---+----------+-----------------+--------------+---------+------+-------+---------+----------------+----------------------+ | # | Lab Name | Name | Container ID | Image | Kind | Group | State | IPv4 Address | IPv6 Address | +---+----------+-----------------+--------------+---------+------+-------+---------+----------------+----------------------+ -| 1 | srl02 | clab-srl02-srl1 | ca24bf3d23f7 | srlinux | srl | | running | 172.20.20.3/24 | 2001:172:20:20::3/80 | -| 2 | srl02 | clab-srl02-srl2 | ee585eac9e65 | srlinux | srl | | running | 172.20.20.2/24 | 2001:172:20:20::2/80 | +| 1 | srl02 | clab-srl02-srl1 | ca24bf3d23f7 | srlinux | srl | | running | 172.20.20.3/24 | 3fff:172:20:20::3/80 | +| 2 | srl02 | clab-srl02-srl2 | ee585eac9e65 | srlinux | srl | | running | 172.20.20.2/24 | 3fff:172:20:20::2/80 | +---+----------+-----------------+--------------+---------+------+-------+---------+----------------+----------------------+ ``` -The output above shows that srl1 container has been assigned `172.20.20.3/24 / 2001:172:20:20::3/80` IPv4/6 address. We can ensure this by querying the srl1 management interfaces address info: +The output above shows that srl1 container has been assigned `172.20.20.3/24 / 3fff:172:20:20::3/80` IPv4/6 address. We can ensure this by querying the srl1 management interfaces address info: ```bash ❯ docker exec clab-srl02-srl1 ip address show dummy-mgmt0 @@ -87,7 +87,7 @@ The output above shows that srl1 container has been assigned `172.20.20.3/24 / 2 link/ether 2a:66:2b:09:2e:4d brd ff:ff:ff:ff:ff:ff inet 172.20.20.3/24 brd 172.20.20.255 scope global dummy-mgmt0 valid_lft forever preferred_lft forever - inet6 2001:172:20:20::3/80 scope global + inet6 3fff:172:20:20::3/80 scope global valid_lft forever preferred_lft forever ``` @@ -121,7 +121,7 @@ name: srl02 mgmt: network: custom_mgmt # management network name ipv4-subnet: 172.100.100.0/24 # ipv4 range - ipv6-subnet: 2001:172:100:100::/80 # ipv6 range (optional) + ipv6-subnet: 3fff:172:100:100::/80 # ipv6 range (optional) topology: # the rest of the file is omitted for brevity @@ -139,14 +139,14 @@ For such cases, users can define the desired IPv4/6 addresses on a per-node basi mgmt: network: fixedips ipv4-subnet: 172.100.100.0/24 - ipv6-subnet: 2001:172:100:100::/80 + ipv6-subnet: 3fff:172:100:100::/80 topology: nodes: n1: kind: nokia_srlinux mgmt-ipv4: 172.100.100.11 # set ipv4 address on management network - mgmt-ipv6: 2001:172:100:100::11 # set ipv6 address on management network + mgmt-ipv6: 3fff:172:100:100::11 # set ipv6 address on management network ``` Users can specify either IPv4 or IPv6 or both addresses. If one of the addresses is omitted, it will be assigned by container runtime in an arbitrary fashion. @@ -158,7 +158,7 @@ Users can specify either IPv4 or IPv6 or both addresses. If one of the addresses #### auto-assigned addresses -The default network addresses chosen by containerlab - 172.20.20.0/24 and 2001:172:20:20::/64 - may clash with the existing addressing scheme on the lab host. With the [user-defined addresses](#user-defined-addresses) discussed above, users can avoid such conflicts, but this requires manual changes to the lab topology file and may not be convenient. +The default network addresses chosen by containerlab - 172.20.20.0/24 and 3fff:172:20:20::/64 - may clash with the existing addressing scheme on the lab host. With the [user-defined addresses](#user-defined-addresses) discussed above, users can avoid such conflicts, but this requires manual changes to the lab topology file and may not be convenient. To address this issue, containerlab provides a way to automatically assign the management network v4/v6 addresses. This is achieved by setting the `ipv4-subnet` and/or `ipv6-subnet` to `auto`: @@ -494,8 +494,8 @@ For a lab named `demo` with two nodes named `l1` and `l2` containerlab will crea ###### CLAB-demo-START ###### 172.20.20.2 clab-demo-l1 172.20.20.3 clab-demo-l2 -2001:172:20:20::2 clab-demo-l1 -2001:172:20:20::3 clab-demo-l2 +3fff:172:20:20::2 clab-demo-l1 +3fff:172:20:20::3 clab-demo-l2 ###### CLAB-demo-END ###### ``` diff --git a/docs/manual/nodes.md b/docs/manual/nodes.md index 9cb5c1178..0a9de97d8 100644 --- a/docs/manual/nodes.md +++ b/docs/manual/nodes.md @@ -451,7 +451,7 @@ Read more about user-defined management addresses [here](network.md#user-defined nodes: r1: kind: nokia_srlinux - mgmt_ipv6: 2001:172:20:20::100 + mgmt_ipv6: 3fff:172:20:20::100 ``` ### DNS diff --git a/docs/quickstart.md b/docs/quickstart.md index b6494ce8f..f39edd175 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -130,8 +130,8 @@ The table will show the node name (which equals to container name), node kind, i +---+---------------------+--------------+-----------------------+---------------+---------+-----------------+----------------------+ | # | Name | Container ID | Image | Kind | State | IPv4 Address | IPv6 Address | +---+---------------------+--------------+-----------------------+---------------+---------+-----------------+----------------------+ -| 1 | clab-srlceos01-ceos | 6ec1b1367a77 | ceos:4.32.0F | arista_ceos | running | 172.20.20.11/24 | 2001:172:20:20::b/64 | -| 2 | clab-srlceos01-srl | 6af1e33f4573 | ghcr.io/nokia/srlinux | nokia_srlinux | running | 172.20.20.10/24 | 2001:172:20:20::a/64 | +| 1 | clab-srlceos01-ceos | 6ec1b1367a77 | ceos:4.32.0F | arista_ceos | running | 172.20.20.11/24 | 3fff:172:20:20::b/64 | +| 2 | clab-srlceos01-srl | 6af1e33f4573 | ghcr.io/nokia/srlinux | nokia_srlinux | running | 172.20.20.10/24 | 3fff:172:20:20::a/64 | +---+---------------------+--------------+-----------------------+---------------+---------+-----------------+----------------------+ ``` diff --git a/docs/rn/0.26.md b/docs/rn/0.26.md index 05fafd87d..e3d7f3cec 100644 --- a/docs/rn/0.26.md +++ b/docs/rn/0.26.md @@ -12,7 +12,7 @@ Little things with big impact - this is what SR Linux banner addition is. Starti ``` ❯ ssh admin@clab-srl-srl -Warning: Permanently added 'clab-srl-srl,2001:172:20:20::f' (ECDSA) to the list of known hosts. +Warning: Permanently added 'clab-srl-srl,3fff:172:20:20::f' (ECDSA) to the list of known hosts. ................................................................ : Welcome to Nokia SR Linux! : : Open Network OS for the NetOps era. : diff --git a/lab-examples/clos02/README.md b/lab-examples/clos02/README.md index 4c7aa845f..6bf1b82d1 100644 --- a/lab-examples/clos02/README.md +++ b/lab-examples/clos02/README.md @@ -24,59 +24,59 @@ $ ./setup.sh | Source | Interface | Towards | IPv4 | IPv4 Prefix | IPv6 | IPv6 Prefix | | ----------- | -------------- | ----------- | ---------------- | ----------- | ---------------------- | ----------- | -| leaf1 | mgmt0.0 | - | `172.100.100.2 ` | 24 | `2001:172:100:100::2 ` | 64 | +| leaf1 | mgmt0.0 | - | `172.100.100.2 ` | 24 | `3fff:172:100:100::2 ` | 64 | | | system0.0 | - | `30.0.0.1 ` | 32 | `3000:30:0:0::1 ` | 128 | | | ethernet-1/1.0 | spine1 | `10.0.0.0 ` | 31 | `1000:10:0:0::0 ` | 127 | | | ethernet-1/2.0 | spine2 | `10.0.0.2 ` | 31 | `1000:10:0:0::2 ` | 127 | | | ethernet-1/3.0 | client1 | `10.0.0.24 ` | 31 | `1000:10:0:0::24 ` | 127 | -| leaf2 | mgmt0.0 | - | `172.100.100.3 ` | 24 | `2001:172:100:100::3 ` | 64 | +| leaf2 | mgmt0.0 | - | `172.100.100.3 ` | 24 | `3fff:172:100:100::3 ` | 64 | | | system0.0 | - | `30.0.0.2 ` | 32 | `3000:30:0:0::2 ` | 128 | | | ethernet-1/1.0 | spine1 | `10.0.0.4 ` | 31 | `1000:10:0:0::4 ` | 127 | | | ethernet-1/2.0 | spine2 | `10.0.0.6 ` | 31 | `1000:10:0:0::6 ` | 127 | | | ethernet-1/3.0 | client2 | `10.0.0.26 ` | 31 | `1000:10:0:0::26 ` | 127 | -| leaf3 | mgmt0.0 | - | `172.100.100.4 ` | 24 | `2001:172:100:100::4 ` | 64 | +| leaf3 | mgmt0.0 | - | `172.100.100.4 ` | 24 | `3fff:172:100:100::4 ` | 64 | | | system0.0 | - | `30.0.0.3 ` | 32 | `3000:30:0:0::3 ` | 128 | | | ethernet-1/1.0 | spine3 | `10.0.0.12 ` | 31 | `1000:10:0:0::12 ` | 127 | | | ethernet-1/2.0 | spine4 | `10.0.0.14 ` | 31 | `1000:10:0:0::14 ` | 127 | | | ethernet-1/3.0 | client3 | `10.0.0.28 ` | 31 | `1000:10:0:0::28 ` | 127 | -| leaf4 | mgmt0.0 | - | `172.100.100.5 ` | 24 | `2001:172:100:100::5 ` | 64 | +| leaf4 | mgmt0.0 | - | `172.100.100.5 ` | 24 | `3fff:172:100:100::5 ` | 64 | | | system0.0 | - | `30.0.0.4 ` | 32 | `3000:30:0:0::4 ` | 128 | | | ethernet-1/1.0 | spine3 | `10.0.0.16 ` | 31 | `1000:10:0:0::16 ` | 127 | | | ethernet-1/2.0 | spine4 | `10.0.0.18 ` | 31 | `1000:10:0:0::18 ` | 127 | | | ethernet-1/3.0 | client4 | `10.0.0.30 ` | 31 | `1000:10:0:0::30 ` | 127 | -| spine1 | mgmt0.0 | - | `172.100.100.6 ` | 24 | `2001:172:100:100::6 ` | 64 | +| spine1 | mgmt0.0 | - | `172.100.100.6 ` | 24 | `3fff:172:100:100::6 ` | 64 | | | system0.0 | - | `30.0.0.5 ` | 32 | `3000:30:0:0::5 ` | 128 | | | ethernet-1/1.0 | leaf1 | `10.0.0.1 ` | 31 | `1000:10:0:0::1 ` | 127 | | | ethernet-1/2.0 | leaf2 | `10.0.0.5 ` | 31 | `1000:10:0:0::5 ` | 127 | | | ethernet-1/3.0 | superspine1 | `10.0.0.8 ` | 31 | `1000:10:0:0::8 ` | 127 | -| spine2 | mgmt0.0 | - | `172.100.100.7 ` | 24 | `2001:172:100:100::7 ` | 64 | +| spine2 | mgmt0.0 | - | `172.100.100.7 ` | 24 | `3fff:172:100:100::7 ` | 64 | | | system0.0 | - | `30.0.0.6 ` | 32 | `3000:30:0:0::6 ` | 128 | | | ethernet-1/1.0 | leaf1 | `10.0.0.3 ` | 31 | `1000:10:0:0::3 ` | 127 | | | ethernet-1/2.0 | leaf2 | `10.0.0.7 ` | 31 | `1000:10:0:0::7 ` | 127 | | | ethernet-1/3.0 | superspine2 | `10.0.0.10 ` | 31 | `1000:10:0:0::10 ` | 127 | -| spine3 | mgmt0.0 | - | `172.100.100.8 ` | 24 | `2001:172:100:100::8 ` | 64 | +| spine3 | mgmt0.0 | - | `172.100.100.8 ` | 24 | `3fff:172:100:100::8 ` | 64 | | | system0.0 | - | `30.0.0.7 ` | 32 | `3000:30:0:0::7 ` | 128 | | | ethernet-1/1.0 | leaf3 | `10.0.0.13 ` | 31 | `1000:10:0:0::13 ` | 127 | | | ethernet-1/2.0 | leaf4 | `10.0.0.17 ` | 31 | `1000:10:0:0::17 ` | 127 | | | ethernet-1/3.0 | superspine1 | `10.0.0.20 ` | 31 | `1000:10:0:0::20 ` | 127 | -| spine4 | mgmt0.0 | - | `172.100.100.9 ` | 24 | `2001:172:100:100::9 ` | 64 | +| spine4 | mgmt0.0 | - | `172.100.100.9 ` | 24 | `3fff:172:100:100::9 ` | 64 | | | system0.0 | - | `30.0.0.8 ` | 32 | `3000:30:0:0::8 ` | 128 | | | ethernet-1/1.0 | leaf3 | `10.0.0.15 ` | 31 | `1000:10:0:0::15 ` | 127 | | | ethernet-1/2.0 | leaf4 | `10.0.0.19 ` | 31 | `1000:10:0:0::19 ` | 127 | | | ethernet-1/3.0 | superspine2 | `10.0.0.22 ` | 31 | `1000:10:0:0::22 ` | 127 | -| superspine1 | mgmt0.0 | - | `172.100.100.10` | 24 | `2001:172:100:100::10` | 64 | +| superspine1 | mgmt0.0 | - | `172.100.100.10` | 24 | `3fff:172:100:100::10` | 64 | | | system0.0 | - | `30.0.0.9 ` | 32 | `3000:30:0:0::9 ` | 128 | | | ethernet-1/1.0 | spine1 | `10.0.0.9 ` | 31 | `1000:10:0:0::9 ` | 127 | | | ethernet-1/2.0 | spine3 | `10.0.0.21 ` | 31 | `1000:10:0:0::21 ` | 127 | -| superspine2 | mgmt0.0 | - | `172.100.100.11` | 24 | `2001:172:100:100::11` | 64 | +| superspine2 | mgmt0.0 | - | `172.100.100.11` | 24 | `3fff:172:100:100::11` | 64 | | | system0.0 | - | `30.0.0.10 ` | 32 | `3000:30:0:0::10 ` | 128 | | | ethernet-1/1.0 | spine2 | `10.0.0.11 ` | 31 | `1000:10:0:0::11 ` | 127 | | | ethernet-1/2.0 | spine4 | `10.0.0.23 ` | 31 | `1000:10:0:0::23 ` | 127 | -| client1 | eth0 | - | `172.100.100.12` | 24 | `2001:172:100:100::12` | 64 | +| client1 | eth0 | - | `172.100.100.12` | 24 | `3fff:172:100:100::12` | 64 | | | eth1 | leaf1 | `10.0.0.25 ` | 31 | `1000:10:0:0::25 ` | 127 | -| client2 | eth0 | - | `172.100.100.13` | 24 | `2001:172:100:100::13` | 64 | +| client2 | eth0 | - | `172.100.100.13` | 24 | `3fff:172:100:100::13` | 64 | | | eth1 | leaf2 | `10.0.0.27 ` | 31 | `1000:10:0:0::27 ` | 127 | -| client3 | eth0 | - | `172.100.100.14` | 24 | `2001:172:100:100::14` | 64 | +| client3 | eth0 | - | `172.100.100.14` | 24 | `3fff:172:100:100::14` | 64 | | | eth1 | leaf3 | `10.0.0.29 ` | 31 | `1000:10:0:0::29 ` | 127 | -| client4 | eth0 | - | `172.100.100.15` | 24 | `2001:172:100:100::15` | 64 | +| client4 | eth0 | - | `172.100.100.15` | 24 | `3fff:172:100:100::15` | 64 | | | eth1 | leaf4 | `10.0.0.31 ` | 31 | `1000:10:0:0::31 ` | 127 | diff --git a/lab-examples/clos02/setup.clos02.clab.yml b/lab-examples/clos02/setup.clos02.clab.yml index 893449f45..ab4b671ad 100644 --- a/lab-examples/clos02/setup.clos02.clab.yml +++ b/lab-examples/clos02/setup.clos02.clab.yml @@ -3,7 +3,7 @@ name: clos02 mgmt: network: br-clos02 ipv4-subnet: 172.100.100.0/24 - ipv6-subnet: 2001:172:100:100::0/64 + ipv6-subnet: 3fff:172:100:100::0/64 topology: kinds: @@ -15,68 +15,68 @@ topology: leaf1: kind: nokia_srlinux mgmt-ipv4: 172.100.100.2 - mgmt-ipv6: 2001:172:100:100::2 + mgmt-ipv6: 3fff:172:100:100::2 leaf2: kind: nokia_srlinux mgmt-ipv4: 172.100.100.3 - mgmt-ipv6: 2001:172:100:100::3 + mgmt-ipv6: 3fff:172:100:100::3 leaf3: kind: nokia_srlinux mgmt-ipv4: 172.100.100.4 - mgmt-ipv6: 2001:172:100:100::4 + mgmt-ipv6: 3fff:172:100:100::4 leaf4: kind: nokia_srlinux mgmt-ipv4: 172.100.100.5 - mgmt-ipv6: 2001:172:100:100::5 + mgmt-ipv6: 3fff:172:100:100::5 spine1: kind: nokia_srlinux type: ixrd3 mgmt-ipv4: 172.100.100.6 - mgmt-ipv6: 2001:172:100:100::6 + mgmt-ipv6: 3fff:172:100:100::6 spine2: kind: nokia_srlinux type: ixrd3 mgmt-ipv4: 172.100.100.7 - mgmt-ipv6: 2001:172:100:100::7 + mgmt-ipv6: 3fff:172:100:100::7 spine3: kind: nokia_srlinux type: ixrd3 mgmt-ipv4: 172.100.100.8 - mgmt-ipv6: 2001:172:100:100::8 + mgmt-ipv6: 3fff:172:100:100::8 spine4: kind: nokia_srlinux type: ixrd3 mgmt-ipv4: 172.100.100.9 - mgmt-ipv6: 2001:172:100:100::9 + mgmt-ipv6: 3fff:172:100:100::9 superspine1: kind: nokia_srlinux type: ixrd3 mgmt-ipv4: 172.100.100.10 - mgmt-ipv6: 2001:172:100:100::10 + mgmt-ipv6: 3fff:172:100:100::10 superspine2: kind: nokia_srlinux type: ixrd3 mgmt-ipv4: 172.100.100.11 - mgmt-ipv6: 2001:172:100:100::11 + mgmt-ipv6: 3fff:172:100:100::11 client1: kind: linux mgmt-ipv4: 172.100.100.12 - mgmt-ipv6: 2001:172:100:100::12 + mgmt-ipv6: 3fff:172:100:100::12 client2: kind: linux mgmt-ipv4: 172.100.100.13 - mgmt-ipv6: 2001:172:100:100::13 + mgmt-ipv6: 3fff:172:100:100::13 client3: kind: linux mgmt-ipv4: 172.100.100.14 - mgmt-ipv6: 2001:172:100:100::14 + mgmt-ipv6: 3fff:172:100:100::14 client4: kind: linux mgmt-ipv4: 172.100.100.15 - mgmt-ipv6: 2001:172:100:100::15 + mgmt-ipv6: 3fff:172:100:100::15 links: - endpoints: ["leaf1:e1-1", "spine1:e1-1"] diff --git a/lab-examples/templated01/topology_config.gotmpl b/lab-examples/templated01/topology_config.gotmpl index fe79299e7..f320adf1b 100644 --- a/lab-examples/templated01/topology_config.gotmpl +++ b/lab-examples/templated01/topology_config.gotmpl @@ -10,7 +10,7 @@ clab-templated01-{{ $input.spines.prefix }}{{ $spineIndex }}: - admin_state: "enable" ip_mtu: 1500 ipv4_address: 75.{{ $spineIndex }}.{{ $leafIndex }}.0/31 - ipv6_address: 2001:75:{{ $spineIndex }}:{{ $leafIndex }}::0/127 + ipv6_address: 3fff:75:{{ $spineIndex }}:{{ $leafIndex }}::0/127 {{- end }} - name: lo0 admin_state: "enable" @@ -32,7 +32,7 @@ clab-templated01-{{ $input.leaves.prefix }}{{ $leafIndex }}: - admin_state: "enable" ip_mtu: 1500 ipv4_address: 75.{{ $spineIndex }}.{{ $leafIndex }}.1/31 - ipv6_address: 2001:75:{{ $spineIndex }}:{{ $leafIndex }}::1/127 + ipv6_address: 3fff:75:{{ $spineIndex }}:{{ $leafIndex }}::1/127 {{- end }} - name: lo0 admin_state: "enable" diff --git a/lab-examples/templated02/topology_config.gotmpl b/lab-examples/templated02/topology_config.gotmpl index 7420e8c01..59b1a0956 100644 --- a/lab-examples/templated02/topology_config.gotmpl +++ b/lab-examples/templated02/topology_config.gotmpl @@ -12,7 +12,7 @@ clab-templated02-{{ $input.super_spines.prefix }}{{ $ssIndex }}: - admin_state: "enable" ip_mtu: 1500 ipv4_address: 75.{{ $ssIndex }}.{{ add (mul (add $podIndex -1) $input.pods.spines.num) $spineIndex }}.0/31 - ipv6_address: 2001:75:{{ $ssIndex }}:{{ add (mul (add $podIndex -1) $input.pods.spines.num) $spineIndex }}::0/127 + ipv6_address: 3fff:75:{{ $ssIndex }}:{{ add (mul (add $podIndex -1) $input.pods.spines.num) $spineIndex }}::0/127 {{- end }} {{- end }} - name: lo0 @@ -38,7 +38,7 @@ clab-templated02-{{ $input.pods.spines.prefix }}{{ $podIndex }}-{{ $spineIndex } - admin_state: "enable" ip_mtu: 1500 ipv4_address: 75.{{ $ssIndex }}.{{ add (mul (add $podIndex -1) $input.pods.spines.num) $spineIndex }}.1/31 - ipv6_address: 2001:75:{{ $ssIndex }}:{{ add (mul (add $podIndex -1) $input.pods.spines.num) $spineIndex }}::1/127 + ipv6_address: 3fff:75:{{ $ssIndex }}:{{ add (mul (add $podIndex -1) $input.pods.spines.num) $spineIndex }}::1/127 {{- end }} {{- range $leafIndex := seq 1 $input.pods.leaves.num }} - name: ethernet-1/{{ add $input.super_spines.num $leafIndex }} @@ -48,7 +48,7 @@ clab-templated02-{{ $input.pods.spines.prefix }}{{ $podIndex }}-{{ $spineIndex } - admin_state: "enable" ip_mtu: 1500 ipv4_address: 76.{{ $podIndex }}.{{ add (mul (add $spineIndex -1) $input.pods.leaves.num) $leafIndex }}.1/31 - ipv6_address: 2001:76:{{ $podIndex }}:{{ add (mul (add $spineIndex -1) $input.pods.leaves.num) $leafIndex }}::1/127 + ipv6_address: 3fff:76:{{ $podIndex }}:{{ add (mul (add $spineIndex -1) $input.pods.leaves.num) $leafIndex }}::1/127 {{- end }} - name: lo0 admin_state: "enable" @@ -83,7 +83,7 @@ clab-templated02-{{ $input.pods.leaves.prefix }}{{ $podIndex }}-{{ $leafIndex }} - admin_state: "enable" ip_mtu: 1500 ipv4_address: 76.{{ $podIndex }}.{{ add (mul (add $spineIndex -1) $input.pods.leaves.num) $leafIndex }}.0/31 - ipv6_address: 2001:76:{{ $podIndex }}:{{ add (mul (add $spineIndex -1) $input.pods.leaves.num) $leafIndex }}::0/127 + ipv6_address: 3fff:76:{{ $podIndex }}:{{ add (mul (add $spineIndex -1) $input.pods.leaves.num) $leafIndex }}::0/127 {{- end }} - name: lo0 admin_state: "enable" diff --git a/schemas/clab.schema.json b/schemas/clab.schema.json index cce78d336..22fb6f497 100644 --- a/schemas/clab.schema.json +++ b/schemas/clab.schema.json @@ -797,8 +797,8 @@ "pattern": "(^.+\/[0-9]{1,2}$)|(auto)" }, "ipv6-subnet": { - "description": "IPv6 subnet to use for the custom management network. e.g. 2001:172:100:100::/64", - "markdownDescription": "[IPv6 subnet](https://containerlab.dev/manual/network/#user-defined-addresses) to be used for the custom management network. e.g. 2001:172:100:100::/64", + "description": "IPv6 subnet to use for the custom management network. e.g. 3fff:172:100:100::/64", + "markdownDescription": "[IPv6 subnet](https://containerlab.dev/manual/network/#user-defined-addresses) to be used for the custom management network. e.g. 3fff:172:100:100::/64", "type": "string", "pattern": "(^.+\/[0-9]{1,3}$)|(auto)" }, @@ -821,8 +821,8 @@ "pattern": "^.+\/[0-9]{1,2}$" }, "ipv6-range": { - "description": "IPv6 range out of the ipv6-subnet to use for the custom management network. e.g. 2001:172:100:100:8000::/65", - "markdownDescription": "[IPv6 range](https://containerlab.dev/manual/network/#ip-range) out of the ipv6-subnet to use for the custom management network. e.g. 2001:172:100:100:8000::/65", + "description": "IPv6 range out of the ipv6-subnet to use for the custom management network. e.g. 3fff:172:100:100:8000::/65", + "markdownDescription": "[IPv6 range](https://containerlab.dev/manual/network/#ip-range) out of the ipv6-subnet to use for the custom management network. e.g. 3fff:172:100:100:8000::/65", "type": "string", "pattern": "^((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(%[\\p{N}\\p{L}]+)?$" }, diff --git a/tests/01-smoke/01-basic-flow.robot b/tests/01-smoke/01-basic-flow.robot index 99cf377dc..bc610686a 100644 --- a/tests/01-smoke/01-basic-flow.robot +++ b/tests/01-smoke/01-basic-flow.robot @@ -15,7 +15,7 @@ ${runtime} docker # defaults to docker exec. Will be rewritten to containerd `ctr` if needed in "Define runtime exec" test ${runtime-cli-exec-cmd} sudo docker exec ${n2-ipv4} 172.20.20.100/24 -${n2-ipv6} 2001:172:20:20::100/64 +${n2-ipv6} 3fff:172:20:20::100/64 *** Test Cases *** diff --git a/tests/01-smoke/01-linux-nodes.clab.yml b/tests/01-smoke/01-linux-nodes.clab.yml index 3e72ec711..d501e81e6 100644 --- a/tests/01-smoke/01-linux-nodes.clab.yml +++ b/tests/01-smoke/01-linux-nodes.clab.yml @@ -21,7 +21,7 @@ topology: cpu: 1.5 memory: 1G mgmt_ipv4: 172.20.20.99 # test deprecated mgmt_ipv4 still works - mgmt_ipv6: 2001:172:20:20::99 # test deprecated mgmt_ipv6 still works + mgmt_ipv6: 3fff:172:20:20::99 # test deprecated mgmt_ipv6 still works healthcheck: test: - CMD-SHELL @@ -37,7 +37,7 @@ topology: ports: - 56180:80 mgmt-ipv4: 172.20.20.100 - mgmt-ipv6: 2001:172:20:20::100 + mgmt-ipv6: 3fff:172:20:20::100 dns: servers: - 8.8.8.8