Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change default ipv6 prefix to 3fff:172:20:20::/64 #2232

Merged
merged 2 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clab/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
26 changes: 13 additions & 13 deletions docs/cmd/inspect.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
+---+------------+----------+-----------------+--------------+--------------------+------+-------+---------+----------------+----------------------+
```

Expand All @@ -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 |
+---+---------------------+--------------+---------+------+-------+---------+----------------+----------------------+
```

Expand All @@ -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 |
+---+-----------------+--------------+-----------------------+------+---------+----------------+----------------------+
```

Expand All @@ -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 |
+---+-----------------------------------+----------+-------+-----------------+--------------+-----------------------+---------------+---------+----------------+----------------------+
```

Expand All @@ -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",
Expand All @@ -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"
}
]
```
6 changes: 3 additions & 3 deletions docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -463,16 +463,16 @@ 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
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 |
+---+----------------+--------------+-----------------------+------+-------+---------+----------------+----------------------+
```

Expand Down
2 changes: 1 addition & 1 deletion docs/lab-examples/cvx02.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
28 changes: 14 additions & 14 deletions docs/lab-examples/min-5clos.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
16 changes: 8 additions & 8 deletions docs/lab-examples/peering-lab.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
+---+----------------+--------------+-------------------------------+---------------+---------+----------------+----------------------+
```

Expand All @@ -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 |
+---+--------------+----------+----------------+--------------+-------------------------------+---------------+---------+----------------+----------------------+
```

Expand Down
Loading
Loading