From b750101eb236130cf056c675997decbac904cc49 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 17:35:18 +0200 Subject: Adding upstream version 252.22. Signed-off-by: Daniel Baumann --- .../.gitattributes | 1 + .../test-01-dhcp.expected/91-default.network | 12 ++++++++++++ .../test-01-dhcp.input | 1 + .../test-02-bridge.expected/90-bridge99.netdev | 5 +++++ .../test-02-bridge.expected/90-bridge99.network | 13 +++++++++++++ .../test-02-bridge.expected/90-eth0.network | 21 +++++++++++++++++++++ .../test-02-bridge.expected/90-eth1.network | 21 +++++++++++++++++++++ .../test-02-bridge.input | 4 ++++ .../test-03-issue-14319.expected/90-enp3s0.network | 17 +++++++++++++++++ .../test-03-issue-14319.input | 1 + 10 files changed, 96 insertions(+) create mode 100644 test/test-network-generator-conversion/.gitattributes create mode 100644 test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network create mode 100644 test/test-network-generator-conversion/test-01-dhcp.input create mode 100644 test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev create mode 100644 test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network create mode 100644 test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network create mode 100644 test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network create mode 100644 test/test-network-generator-conversion/test-02-bridge.input create mode 100644 test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network create mode 100644 test/test-network-generator-conversion/test-03-issue-14319.input (limited to 'test/test-network-generator-conversion') diff --git a/test/test-network-generator-conversion/.gitattributes b/test/test-network-generator-conversion/.gitattributes new file mode 100644 index 0000000..6df434f --- /dev/null +++ b/test/test-network-generator-conversion/.gitattributes @@ -0,0 +1 @@ +* generated diff --git a/test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network b/test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network new file mode 100644 index 0000000..657cde7 --- /dev/null +++ b/test/test-network-generator-conversion/test-01-dhcp.expected/91-default.network @@ -0,0 +1,12 @@ +# Automatically generated by systemd-network-generator + +[Match] +Kind=!* +Type=!loopback + +[Link] + +[Network] +DHCP=ipv4 + +[DHCP] diff --git a/test/test-network-generator-conversion/test-01-dhcp.input b/test/test-network-generator-conversion/test-01-dhcp.input new file mode 100644 index 0000000..e55893e --- /dev/null +++ b/test/test-network-generator-conversion/test-01-dhcp.input @@ -0,0 +1 @@ +ip=dhcp diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev b/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev new file mode 100644 index 0000000..97c2248 --- /dev/null +++ b/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.netdev @@ -0,0 +1,5 @@ +# Automatically generated by systemd-network-generator + +[NetDev] +Kind=bridge +Name=bridge99 diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network b/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network new file mode 100644 index 0000000..f8d19ba --- /dev/null +++ b/test/test-network-generator-conversion/test-02-bridge.expected/90-bridge99.network @@ -0,0 +1,13 @@ +# Automatically generated by systemd-network-generator + +[Match] +Name=bridge99 + +[Link] +MACAddress=00:11:22:33:44:55 +MTUBytes=1530 + +[Network] +DHCP=ipv4 + +[DHCP] diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network b/test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network new file mode 100644 index 0000000..8842b57 --- /dev/null +++ b/test/test-network-generator-conversion/test-02-bridge.expected/90-eth0.network @@ -0,0 +1,21 @@ +# Automatically generated by systemd-network-generator + +[Match] +Name=eth0 + +[Link] + +[Network] +DHCP=no +DNS=10.10.10.10 +DNS=10.10.10.11 +Bridge=bridge99 + +[DHCP] +Hostname=hogehoge + +[Address] +Address=192.168.0.10/24 + +[Route] +Gateway=192.168.0.1 diff --git a/test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network b/test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network new file mode 100644 index 0000000..feff4f5 --- /dev/null +++ b/test/test-network-generator-conversion/test-02-bridge.expected/90-eth1.network @@ -0,0 +1,21 @@ +# Automatically generated by systemd-network-generator + +[Match] +Name=eth1 + +[Link] + +[Network] +DHCP=no +DNS=10.10.10.10 +DNS=10.10.10.11 +Bridge=bridge99 + +[DHCP] +Hostname=hogehoge + +[Address] +Address=192.168.0.11/24 + +[Route] +Gateway=192.168.0.1 diff --git a/test/test-network-generator-conversion/test-02-bridge.input b/test/test-network-generator-conversion/test-02-bridge.input new file mode 100644 index 0000000..0c863fc --- /dev/null +++ b/test/test-network-generator-conversion/test-02-bridge.input @@ -0,0 +1,4 @@ +ip=192.168.0.10::192.168.0.1:255.255.255.0:hogehoge:eth0:off:10.10.10.10:10.10.10.11 +ip=192.168.0.11::192.168.0.1:255.255.255.0:hogehoge:eth1:off:10.10.10.10:10.10.10.11 +ip=bridge99:dhcp:1530:00:11:22:33:44:55 +bridge=bridge99:eth0,eth1 diff --git a/test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network b/test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network new file mode 100644 index 0000000..28ccfdd --- /dev/null +++ b/test/test-network-generator-conversion/test-03-issue-14319.expected/90-enp3s0.network @@ -0,0 +1,17 @@ +# Automatically generated by systemd-network-generator + +[Match] +Name=enp3s0 + +[Link] + +[Network] +DHCP=no + +[DHCP] + +[Address] +Address=10.99.37.44/16 + +[Route] +Gateway=10.99.10.1 diff --git a/test/test-network-generator-conversion/test-03-issue-14319.input b/test/test-network-generator-conversion/test-03-issue-14319.input new file mode 100644 index 0000000..3be7520 --- /dev/null +++ b/test/test-network-generator-conversion/test-03-issue-14319.input @@ -0,0 +1 @@ +root=/dev/nfs nfsroot=10.99.37.240:/srv/netroot,v3,tcp ip=10.99.37.44::10.99.10.1:255.255.0.0::enp3s0:off -- cgit v1.2.3