diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-01-30 08:02:52 +0100 |
---|---|---|
committer | Cole Helbling <cole.e.helbling@outlook.com> | 2023-01-30 07:55:50 -0800 |
commit | 23ce77d76e3f679146eb3bde92c90bd5223067dc (patch) | |
tree | ede12fa35082bec68e4e9421f02b8c420387167a /nixos | |
parent | a92f046faf8426151c0cf5413f94fbc46e38b142 (diff) |
Revert #178290: nixos/virtualisation: add option
...for explicitly named network interfaces
This reverts commit 6ae3e7695e27a4f7afb1d2017f5967d5e82f4c00.
(and evaluation fixups 08d26bbb726 7aed90a969c)
Some of the tests fail or time out after the merge.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2305.section.xml | 9 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2305.section.md | 2 | ||||
-rw-r--r-- | nixos/lib/testing/driver.nix | 4 | ||||
-rw-r--r-- | nixos/lib/testing/network.nix | 41 | ||||
-rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 32 | ||||
-rw-r--r-- | nixos/tests/networking.nix | 135 |
6 files changed, 92 insertions, 131 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index 69a6ff4aac05..2ce4ce189cb4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -766,15 +766,6 @@ been fixed to allow more than one plugin in the path. </para> </listitem> - <listitem> - <para> - A new option was added to the virtualisation module that - enables specifying explicitly named network interfaces in QEMU - VMs. The existing <literal>virtualisation.vlans</literal> is - still supported for cases where the name of the network - interface is irrelevant. - </para> - </listitem> </itemizedlist> </section> </section> diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index b33221714ab5..148b317ba283 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -191,5 +191,3 @@ In addition to numerous new and upgraded packages, this release has the followin - `nixos-version` now accepts `--configuration-revision` to display more information about the current generation revision - The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path. - -- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix index 2c2ee179fede..fb181c1d7e9a 100644 --- a/nixos/lib/testing/driver.nix +++ b/nixos/lib/testing/driver.nix @@ -12,9 +12,7 @@ let }; - vlans = map (m: ( - m.virtualisation.vlans ++ - (lib.mapAttrsToList (_: v: v.vlan) m.virtualisation.interfaces))) (lib.attrValues config.nodes); + vlans = map (m: m.virtualisation.vlans) (lib.attrValues config.nodes); vms = map (m: m.system.build.vm) (lib.attrValues config.nodes); nodeHostNames = diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix index 98a77f918e07..04ea9a2bc9f7 100644 --- a/nixos/lib/testing/network.nix +++ b/nixos/lib/testing/network.nix @@ -18,40 +18,24 @@ let networkModule = { config, nodes, pkgs, ... }: let - qemu-common = import ../qemu-common.nix { inherit lib pkgs; }; - - # Convert legacy VLANs to named interfaces and merge with explicit interfaces. - vlansNumbered = forEach (zipLists config.virtualisation.vlans (range 1 255)) (v: { - name = "eth${toString v.snd}"; - vlan = v.fst; - assignIP = true; - }); - explicitInterfaces = lib.mapAttrsToList (n: v: v // { name = n; }) config.virtualisation.interfaces; - interfaces = vlansNumbered ++ explicitInterfaces; - interfacesNumbered = zipLists interfaces (range 1 255); - - # Automatically assign IP addresses to requested interfaces. - assignIPs = lib.filter (i: i.assignIP) interfaces; - ipInterfaces = forEach assignIPs (i: - nameValuePair i.name { ipv4.addresses = - [ { address = "192.168.${toString i.vlan}.${toString config.virtualisation.test.nodeNumber}"; + interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); + interfaces = forEach interfacesNumbered ({ fst, snd }: + nameValuePair "eth${toString snd}" { + ipv4.addresses = + [{ + address = "192.168.${toString fst}.${toString config.virtualisation.test.nodeNumber}"; prefixLength = 24; }]; }); - qemuOptions = lib.flatten (forEach interfacesNumbered ({ fst, snd }: - qemu-common.qemuNICFlags snd fst.vlan config.virtualisation.test.nodeNumber)); - udevRules = forEach interfacesNumbered ({ fst, snd }: - "SUBSYSTEM==\"net\",ACTION==\"add\",ATTR{address}==\"${qemu-common.qemuNicMac fst.vlan config.virtualisation.test.nodeNumber}\",NAME=\"${fst.name}\""); - networkConfig = { networking.hostName = mkDefault config.virtualisation.test.nodeName; - networking.interfaces = listToAttrs ipInterfaces; + networking.interfaces = listToAttrs interfaces; networking.primaryIPAddress = - optionalString (ipInterfaces != [ ]) (head (head ipInterfaces).value.ipv4.addresses).address; + optionalString (interfaces != [ ]) (head (head interfaces).value.ipv4.addresses).address; # Put the IP addresses of all VMs in this machine's # /etc/hosts file. If a machine has multiple @@ -67,13 +51,16 @@ let "${config.networking.hostName}.${config.networking.domain} " + "${config.networking.hostName}\n")); - virtualisation.qemu.options = qemuOptions; - boot.initrd.services.udev.rules = concatMapStrings (x: x + "\n") udevRules; + virtualisation.qemu.options = + let qemu-common = import ../qemu-common.nix { inherit lib pkgs; }; + in + flip concatMap interfacesNumbered + ({ fst, snd }: qemu-common.qemuNICFlags snd fst config.virtualisation.test.nodeNumber); }; in { - key = "network-interfaces"; + key = "ip-address"; config = networkConfig // { # Expose the networkConfig items for tests like nixops # that need to recreate the network config. diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 933a9c539e48..06210529eb8c 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -545,8 +545,7 @@ in virtualisation.vlans = mkOption { type = types.listOf types.ints.unsigned; - default = if config.virtualisation.interfaces == {} then [ 1 ] else [ ]; - defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]''; + default = [ 1 ]; example = [ 1 2 ]; description = lib.mdDoc '' @@ -561,35 +560,6 @@ in ''; }; - virtualisation.interfaces = mkOption { - default = {}; - example = { - enp1s0.vlan = 1; - }; - description = lib.mdDoc '' - Network interfaces to add to the VM. - ''; - type = with types; attrsOf (submodule { - options = { - vlan = mkOption { - type = types.ints.unsigned; - description = lib.mdDoc '' - VLAN to which the network interface is connected. - ''; - }; - - assignIP = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Automatically assign an IP address to the network interface using the same scheme as - virtualisation.vlans. - ''; - }; - }; - }); - }; - virtualisation.writableStore = mkOption { type = types.bool; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index c720c8068c87..441d258afc08 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -93,19 +93,18 @@ let name = "Static"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; defaultGateway = "192.168.1.1"; defaultGateway6 = "fd00:1234:5678:1::1"; - interfaces.enp1s0.ipv4.addresses = [ + interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } { address = "192.168.1.3"; prefixLength = 32; } { address = "192.168.1.10"; prefixLength = 32; } ]; - interfaces.enp2s0.ipv4.addresses = [ + interfaces.eth2.ipv4.addresses = mkOverride 0 [ { address = "192.168.2.2"; prefixLength = 24; } ]; }; @@ -171,12 +170,12 @@ let # Disable test driver default config networking.interfaces = lib.mkForce {}; networking.useNetworkd = networkd; - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; }; testScript = '' start_all() client.wait_for_unit("multi-user.target") - client.wait_until_succeeds("ip addr show dev enp1s0 | grep '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep '192.168.1'") client.shell_interact() client.succeed("ping -c 1 192.168.1.1") router.succeed("ping -c 1 192.168.1.1") @@ -188,13 +187,20 @@ let name = "SimpleDHCP"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.useDHCP = true; - interfaces.enp2s0.useDHCP = true; + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; + interfaces.eth2 = { + ipv4.addresses = mkOverride 0 [ ]; + ipv6.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; }; }; testScript = { ... }: @@ -205,10 +211,10 @@ let router.wait_for_unit("network-online.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'") - client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'") - client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'") + client.wait_until_succeeds("ip addr show dev eth2 | grep -q '192.168.2'") + client.wait_until_succeeds("ip addr show dev eth2 | grep -q 'fd00:1234:5678:2:'") with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") @@ -237,15 +243,16 @@ let name = "OneInterfaceDHCP"; nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; mtu = 1343; useDHCP = true; }; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; }; }; testScript = { ... }: @@ -257,10 +264,10 @@ let router.wait_for_unit("network.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") with subtest("ensure MTU is set"): - assert "mtu 1343" in client.succeed("ip link show dev enp1s0") + assert "mtu 1343" in client.succeed("ip link show dev eth1") with subtest("Test vlan 1"): client.wait_until_succeeds("ping -c 1 192.168.1.1") @@ -279,15 +286,16 @@ let }; bond = let node = address: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; bonds.bond0 = { - interfaces = [ "enp1s0" "enp2s0" ]; + interfaces = [ "eth1" "eth2" ]; driverOptions.mode = "802.3ad"; }; + interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; + interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; interfaces.bond0.ipv4.addresses = mkOverride 0 [ { inherit address; prefixLength = 30; } ]; }; @@ -318,11 +326,12 @@ let }; bridge = let node = { address, vlan }: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = vlan; + virtualisation.vlans = [ vlan ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv4.addresses = [ { inherit address; prefixLength = 24; } ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { inherit address; prefixLength = 24; } ]; }; }; in { @@ -330,12 +339,11 @@ let nodes.client1 = node { address = "192.168.1.2"; vlan = 1; }; nodes.client2 = node { address = "192.168.1.3"; vlan = 2; }; nodes.router = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; - virtualisation.interfaces.enp2s0.vlan = 2; + virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; useDHCP = false; - bridges.bridge.interfaces = [ "enp1s0" "enp2s0" ]; + bridges.bridge.interfaces = [ "eth1" "eth2" ]; interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; interfaces.bridge.ipv4.addresses = mkOverride 0 @@ -369,7 +377,7 @@ let nodes.router = router; nodes.client = { pkgs, ... }: with pkgs.lib; { environment.systemPackages = [ pkgs.iptables ]; # to debug firewall rules - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; @@ -377,9 +385,14 @@ let # reverse path filtering rules for the macvlan interface seem # to be incorrect, causing the test to fail. Disable temporarily. firewall.checkReversePath = false; - macvlans.macvlan.interface = "enp1s0"; - interfaces.enp1s0.useDHCP = true; - interfaces.macvlan.useDHCP = true; + macvlans.macvlan.interface = "eth1"; + interfaces.eth1 = { + ipv4.addresses = mkOverride 0 [ ]; + useDHCP = true; + }; + interfaces.macvlan = { + useDHCP = true; + }; }; }; testScript = { ... }: @@ -391,7 +404,7 @@ let router.wait_for_unit("network.target") with subtest("Wait until we have an ip address on each interface"): - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q '192.168.1'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q '192.168.1'") client.wait_until_succeeds("ip addr show dev macvlan | grep -q '192.168.1'") with subtest("Print lots of diagnostic information"): @@ -418,22 +431,23 @@ let fou = { name = "foo-over-udp"; nodes.machine = { ... }: { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ]; + interfaces.eth1.ipv4.addresses = mkOverride 0 + [ { address = "192.168.1.1"; prefixLength = 24; } ]; fooOverUDP = { fou1 = { port = 9001; }; fou2 = { port = 9002; protocol = 41; }; fou3 = mkIf (!networkd) { port = 9003; local.address = "192.168.1.1"; }; fou4 = mkIf (!networkd) - { port = 9004; local = { address = "192.168.1.1"; dev = "enp1s0"; }; }; + { port = 9004; local = { address = "192.168.1.1"; dev = "eth1"; }; }; }; }; systemd.services = { - fou3-fou-encap.after = optional (!networkd) "network-addresses-enp1s0.service"; + fou3-fou-encap.after = optional (!networkd) "network-addresses-eth1.service"; }; }; testScript = { ... }: @@ -456,20 +470,20 @@ let "gue": None, "family": "inet", "local": "192.168.1.1", - "dev": "enp1s0", + "dev": "eth1", } in fous, "fou4 exists" ''; }; sit = let node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; sits.sit = { inherit remote; local = address4; - dev = "enp1s0"; + dev = "eth1"; }; interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = address4; prefixLength = 24; } ]; @@ -671,10 +685,10 @@ let vlan-ping = let baseIP = number: "10.10.10.${number}"; vlanIP = number: "10.1.1.${number}"; - baseInterface = "enp1s0"; + baseInterface = "eth1"; vlanInterface = "vlan42"; node = number: {pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { #useNetworkd = networkd; useDHCP = false; @@ -771,12 +785,12 @@ let privacy = { name = "Privacy"; nodes.router = { ... }: { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0.ipv6.addresses = singleton { + interfaces.eth1.ipv6.addresses = singleton { address = "fd00:1234:5678:1::1"; prefixLength = 64; }; @@ -798,11 +812,11 @@ let }; }; nodes.client_with_privacy = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { tempAddress = "default"; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; @@ -811,11 +825,11 @@ let }; }; nodes.client = { pkgs, ... }: with pkgs.lib; { - virtualisation.interfaces.enp1s0.vlan = 1; + virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; useDHCP = false; - interfaces.enp1s0 = { + interfaces.eth1 = { tempAddress = "enabled"; ipv4.addresses = mkOverride 0 [ ]; ipv6.addresses = mkOverride 0 [ ]; @@ -833,9 +847,9 @@ let with subtest("Wait until we have an ip address"): client_with_privacy.wait_until_succeeds( - "ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'" + "ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'" ) - client.wait_until_succeeds("ip addr show dev enp1s0 | grep -q 'fd00:1234:5678:1:'") + client.wait_until_succeeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'") with subtest("Test vlan 1"): client_with_privacy.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1") @@ -933,7 +947,7 @@ let ), "The IPv6 routing table has not been properly cleaned:\n{}".format(ipv6Residue) ''; }; - rename = if networkd then { + rename = { name = "RenameInterface"; nodes.machine = { pkgs, ... }: { virtualisation.vlans = [ 1 ]; @@ -941,20 +955,23 @@ let useNetworkd = networkd; useDHCP = false; }; - systemd.network.links."10-custom_name" = { - matchConfig.MACAddress = "52:54:00:12:01:01"; - linkConfig.Name = "custom_name"; - }; - }; + } // + (if networkd + then { systemd.network.links."10-custom_name" = { + matchConfig.MACAddress = "52:54:00:12:01:01"; + linkConfig.Name = "custom_name"; + }; + } + else { boot.initrd.services.udev.rules = '' + SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="custom_name" + ''; + }); testScript = '' machine.succeed("udevadm settle") print(machine.succeed("ip link show dev custom_name")) ''; - } else { - name = "RenameInterface"; - nodes = { }; - testScript = ""; }; + nodes = { }; # even with disabled networkd, systemd.network.links should work # (as it's handled by udev, not networkd) link = { |