Skip to content

Commit 6a60503

Browse files
hallynhallyn
authored
Merge pull request #1776 from stgraber/main
Switch to new MAC address prefix
2 parents 2e97ab2 + 959cf53 commit 6a60503

34 files changed

+1461
-1455
lines changed

‎cmd/incus/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func (c *cmdConfigEdit) helpTemplate() string {
123123
### profiles:
124124
### - default
125125
### config:
126-
### volatile.eth0.hwaddr: 00:16:3e:e9:f8:7f
126+
### volatile.eth0.hwaddr: 10:66:6a:e9:f8:7f
127127
### devices:
128128
### homedir:
129129
### path: /extra

‎cmd/incus/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Examples:
7373
- "type=container" will list all container instances
7474
- "type=container status=running" will list all running container instances
7575
76-
A regular expression matching a configuration item or its value. (e.g. volatile.eth0.hwaddr=00:16:3e:.*).
76+
A regular expression matching a configuration item or its value. (e.g. volatile.eth0.hwaddr=10:66:6a:.*).
7777
7878
When multiple filters are passed, they are added one on top of the other,
7979
selecting instances which satisfy them all.

‎cmd/incus/list_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ func TestShouldShow(t *testing.T) {
6060
},
6161
{
6262
Family: "inet6",
63-
Address: "fd42:72a:89ac:e457:216:3eff:fe83:8301",
63+
Address: "fd42:72a:89ac:e457:1266:6aff:fe83:8301",
6464
},
6565
},
6666
},
@@ -135,16 +135,16 @@ func TestShouldShow(t *testing.T) {
135135
t.Errorf("net=10.29.85.156 filter did not work")
136136
}
137137

138-
if !list.shouldShow([]string{"ipv6=fd42:72a:89ac:e457:216:3eff:fe83:8301"}, inst, state, false) {
139-
t.Errorf("net=fd42:72a:89ac:e457:216:3eff:fe83:8301 filter didn't work")
138+
if !list.shouldShow([]string{"ipv6=fd42:72a:89ac:e457:1266:6aff:fe83:8301"}, inst, state, false) {
139+
t.Errorf("net=fd42:72a:89ac:e457:1266:6aff:fe83:8301 filter didn't work")
140140
}
141141

142-
if list.shouldShow([]string{"ipv6=fd42:072a:89ac:e457:0216:3eff:fe83:ffff/128"}, inst, state, false) {
143-
t.Errorf("net=1net=fd42:072a:89ac:e457:0216:3eff:fe83:ffff/128 filter did work but should not")
142+
if list.shouldShow([]string{"ipv6=fd42:072a:89ac:e457:1266:6aff:fe83:ffff/128"}, inst, state, false) {
143+
t.Errorf("net=1net=fd42:072a:89ac:e457:1266:6aff:fe83:ffff/128 filter did work but should not")
144144
}
145145

146-
if !list.shouldShow([]string{"ipv6=fd42:72a:89ac:e457:216:3eff:fe83:ffff/1"}, inst, state, false) {
147-
t.Errorf("net=fd42:72a:89ac:e457:216:3eff:fe83:ffff/1 filter filter didn't work")
146+
if !list.shouldShow([]string{"ipv6=fd42:72a:89ac:e457:1266:6aff:fe83:ffff/1"}, inst, state, false) {
147+
t.Errorf("net=fd42:72a:89ac:e457:1266:6aff:fe83:ffff/1 filter filter didn't work")
148148
}
149149

150150
if list.shouldShow([]string{"user.blah=abc", "status=stopped"}, inst, nil, false) {

‎cmd/lxc-to-incus/main_migrate_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,11 +135,11 @@ func TestConvertNetworkConfig(t *testing.T) {
135135
"lxc.net.0.type = macvlan",
136136
"lxc.net.0.macvlan.mode = bridge",
137137
"lxc.net.0.link = mvlan0",
138-
"lxc.net.0.hwaddr = 00:16:3e:8d:4f:51",
138+
"lxc.net.0.hwaddr = 10:66:6a:8d:4f:51",
139139
"lxc.net.0.name = eth1",
140140
"lxc.net.1.type = veth",
141141
"lxc.net.1.link = lxcbr0",
142-
"lxc.net.1.hwaddr = 00:16:3e:a2:7d:54",
142+
"lxc.net.1.hwaddr = 10:66:6a:a2:7d:54",
143143
"lxc.net.1.name = eth2",
144144
},
145145
map[string]map[string]string{
@@ -148,14 +148,14 @@ func TestConvertNetworkConfig(t *testing.T) {
148148
"nictype": "bridged",
149149
"parent": "lxcbr0",
150150
"name": "eth2",
151-
"hwaddr": "00:16:3e:a2:7d:54",
151+
"hwaddr": "10:66:6a:a2:7d:54",
152152
},
153153
"eth0": {
154154
"type": "none",
155155
},
156156
"net0": {
157157
"name": "eth1",
158-
"hwaddr": "00:16:3e:8d:4f:51",
158+
"hwaddr": "10:66:6a:8d:4f:51",
159159
"type": "nic",
160160
"nictype": "macvlan",
161161
"parent": "mvlan0",
@@ -171,26 +171,26 @@ func TestConvertNetworkConfig(t *testing.T) {
171171
"lxc.net.0.macvlan.mode = bridge",
172172
"lxc.net.0.link = mvlan0",
173173
"lxc.net.1.type = veth",
174-
"lxc.net.0.hwaddr = 00:16:3e:8d:4f:51",
174+
"lxc.net.0.hwaddr = 10:66:6a:8d:4f:51",
175175
"lxc.net.0.name = eth1",
176176
"lxc.net.1.name = eth2",
177177
"lxc.net.1.link = lxcbr0",
178-
"lxc.net.1.hwaddr = 00:16:3e:a2:7d:54",
178+
"lxc.net.1.hwaddr = 10:66:6a:a2:7d:54",
179179
},
180180
map[string]map[string]string{
181181
"net1": {
182182
"type": "nic",
183183
"nictype": "bridged",
184184
"parent": "lxcbr0",
185185
"name": "eth2",
186-
"hwaddr": "00:16:3e:a2:7d:54",
186+
"hwaddr": "10:66:6a:a2:7d:54",
187187
},
188188
"eth0": {
189189
"type": "none",
190190
},
191191
"net0": {
192192
"name": "eth1",
193-
"hwaddr": "00:16:3e:8d:4f:51",
193+
"hwaddr": "10:66:6a:8d:4f:51",
194194
"type": "nic",
195195
"nictype": "macvlan",
196196
"parent": "mvlan0",

‎doc/howto/disaster_recovery.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ Starting recovery...
8080
Device eth0 added to default
8181
:input: incus start u1
8282
:input: incus list
83-
+------+---------+-------------------+---------------------------------------------+-----------+-----------+
84-
| NAME | STATE | IPV4 | IPV6 | TYPE | SNAPSHOTS |
85-
+------+---------+-------------------+---------------------------------------------+-----------+-----------+
86-
| u1 | RUNNING | 192.0.2.49 (eth0) | 2001:db8:8b6:abfe:216:3eff:fe82:918e (eth0) | CONTAINER | 0 |
87-
+------+---------+-------------------+---------------------------------------------+-----------+-----------+
88-
| u2 | STOPPED | | | CONTAINER | 0 |
89-
+------+---------+-------------------+---------------------------------------------+-----------+-----------+
83+
+------+---------+-------------------+----------------------------------------------+-----------+-----------+
84+
| NAME | STATE | IPV4 | IPV6 | TYPE | SNAPSHOTS |
85+
+------+---------+-------------------+----------------------------------------------+-----------+-----------+
86+
| u1 | RUNNING | 192.0.2.49 (eth0) | 2001:db8:8b6:abfe:1266:6aff:fe82:918e (eth0) | CONTAINER | 0 |
87+
+------+---------+-------------------+----------------------------------------------+-----------+-----------+
88+
| u2 | STOPPED | | | CONTAINER | 0 |
89+
+------+---------+-------------------+----------------------------------------------+-----------+-----------+
9090
```

‎doc/howto/network_ipam.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ The resulting output will look something like this:
2323
+------------------------+-----------------+----------+------+-------------------+
2424
| /1.0/networks/incusbr0 | 2001:db8::/32 | network | true | |
2525
+------------------------+-----------------+----------+------+-------------------+
26-
| /1.0/instances/u1 | 2001:db8::1/128 | instance | true | 00:16:3e:04:f0:95 |
26+
| /1.0/instances/u1 | 2001:db8::1/128 | instance | true | 10:66:6a:04:f0:95 |
2727
+------------------------+-----------------+----------+------+-------------------+
28-
| /1.0/instances/u1 | 192.0.2.2/32 | instance | true | 00:16:3e:04:f0:95 |
28+
| /1.0/instances/u1 | 192.0.2.2/32 | instance | true | 10:66:6a:04:f0:95 |
2929
+------------------------+-----------------+----------+------+-------------------+
3030
3131
...

‎doc/howto/network_ovn_setup.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ Complete the following steps to create a standalone OVN network that is connecte
3535
:input: incus list
3636
:scroll:
3737
38-
+------+---------+---------------------+----------------------------------------------+-----------+-----------+
39-
| NAME | STATE | IPV4 | IPV6 | TYPE | SNAPSHOTS |
40-
+------+---------+---------------------+----------------------------------------------+-----------+-----------+
41-
| c1 | RUNNING | 192.0.2.2 (eth0) | 2001:db8:cff3:5089:216:3eff:fef0:549f (eth0) | CONTAINER | 0 |
42-
+------+---------+---------------------+----------------------------------------------+-----------+-----------+
38+
+------+---------+---------------------+-----------------------------------------------+-----------+-----------+
39+
| NAME | STATE | IPV4 | IPV6 | TYPE | SNAPSHOTS |
40+
+------+---------+---------------------+-----------------------------------------------+-----------+-----------+
41+
| c1 | RUNNING | 192.0.2.2 (eth0) | 2001:db8:cff3:5089:1266:6aff:fef0:549f (eth0) | CONTAINER | 0 |
42+
+------+---------+---------------------+-----------------------------------------------+-----------+-----------+
4343
```
4444

4545
## Set up an Incus cluster on OVN

‎doc/howto/network_zones.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ incus.example.net. 300 IN NS ns1.incus.example.net.
6969
inctest.gw.incus.example.net. 300 IN A 192.0.2.1
7070
inctest.gw.incus.example.net. 300 IN AAAA fd42:4131:a53c:7211::1
7171
default-ovntest.uplink.incus.example.net. 300 IN A 192.0.2.20
72-
default-ovntest.uplink.incus.example.net. 300 IN AAAA fd42:4131:a53c:7211:216:3eff:fe4e:b794
73-
c1.incus.example.net. 300 IN AAAA fd42:4131:a53c:7211:216:3eff:fe19:6ede
72+
default-ovntest.uplink.incus.example.net. 300 IN AAAA fd42:4131:a53c:7211:1266:6aff:fe4e:b794
73+
c1.incus.example.net. 300 IN AAAA fd42:4131:a53c:7211:1266:6aff:fe19:6ede
7474
c1.incus.example.net. 300 IN A 192.0.2.125
7575
manualtest.incus.example.net. 300 IN A 8.8.8.8
7676
incus.example.net. 3600 IN SOA incus.example.net. ns1.incus.example.net. 1669736788 120 60 86400 30

‎doc/howto/server_expose.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ For example:
2323
inet6 ::1/128 scope host
2424
valid_lft forever preferred_lft forever
2525
2: enp5s0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP group default qlen 1000
26-
link/ether 00:16:3e:e3:f3:3f brd ff:ff:ff:ff:ff:ff
26+
link/ether 10:66:6a:e3:f3:3f brd ff:ff:ff:ff:ff:ff
2727
inet 10.68.216.12/24 metric 100 brd 10.68.216.255 scope global dynamic enp5s0
2828
valid_lft 3028sec preferred_lft 3028sec
29-
inet6 fd42:e819:7a51:5a7b:216:3eff:fee3:f33f/64 scope global mngtmpaddr noprefixroute
29+
inet6 fd42:e819:7a51:5a7b:1266:6aff:fee3:f33f/64 scope global mngtmpaddr noprefixroute
3030
valid_lft forever preferred_lft forever
31-
inet6 fe80::216:3eff:fee3:f33f/64 scope link
31+
inet6 fe80::1266:6aff:fee3:f33f/64 scope link
3232
valid_lft forever preferred_lft forever
3333
3: incusbr0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN group default qlen 1000
34-
link/ether 00:16:3e:8d:f3:72 brd ff:ff:ff:ff:ff:ff
34+
link/ether 10:66:6a:8d:f3:72 brd ff:ff:ff:ff:ff:ff
3535
inet 10.64.82.1/24 scope global incusbr0
3636
valid_lft forever preferred_lft forever
3737
inet6 fd42:f4ab:4399:e6eb::1/64 scope global

‎doc/howto/server_migrate_lxd.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ Uninstall the LXD package? [default=no]: yes
5959
To start your first container, try: incus launch images:ubuntu/22.04
6060
Or for a virtual machine: incus launch images:ubuntu/22.04 --vm
6161
62-
+------+---------+-----------------------+-----------------------------------------------+-----------+-----------+
63-
| NAME | STATE | IPV4 | IPV6 | TYPE | SNAPSHOTS |
64-
+------+---------+-----------------------+-----------------------------------------------+-----------+-----------+
65-
| u1 | RUNNING | 10.204.220.101 (eth0) | fd42:1eb6:f1d8:4e2a:216:3eff:fe65:940d (eth0) | CONTAINER | 0 |
66-
+------+---------+-----------------------+-----------------------------------------------+-----------+-----------+
62+
+------+---------+-----------------------+------------------------------------------------+-----------+-----------+
63+
| NAME | STATE | IPV4 | IPV6 | TYPE | SNAPSHOTS |
64+
+------+---------+-----------------------+------------------------------------------------+-----------+-----------+
65+
| u1 | RUNNING | 10.204.220.101 (eth0) | fd42:1eb6:f1d8:4e2a:1266:6aff:fe65:940d (eth0) | CONTAINER | 0 |
66+
+------+---------+-----------------------+------------------------------------------------+-----------+-----------+
6767
```
6868

6969
The tool will also look for any configuration that is incompatible with Incus and fail before any data is migrated.

0 commit comments

Comments
 (0)