From 37b9cf99e1a146182e71350bfd3fd2c4eeb96794 Mon Sep 17 00:00:00 2001 From: Jorik Cronenberg Date: Thu, 12 Oct 2023 15:21:18 +0200 Subject: [PATCH] Add expected outcomes for tests --- .../system-connections/bond0.nmconnection | 21 +++++++++++++++++++ .../system-connections/en0.nmconnection | 11 ++++++++++ .../system-connections/en1.nmconnection | 11 ++++++++++ .../wicked_xml}/bond_active-backup.xml | 0 .../system-connections/eth0.nmconnection | 18 ++++++++++++++++ .../wicked_xml}/ipv4+6_dhcp.xml | 0 .../system-connections/eth1.nmconnection | 20 ++++++++++++++++++ .../wicked_xml}/ipv4_static.xml | 0 .../system-connections/eth2.nmconnection | 18 ++++++++++++++++ .../{ => ipv6_auto/wicked_xml}/ipv6_auto.xml | 0 .../system-connections/eth3.nmconnection | 18 ++++++++++++++++ .../{ => ipv6_dhcp/wicked_xml}/ipv6_dhcp.xml | 0 .../system-connections/eth4.nmconnection | 20 ++++++++++++++++++ .../wicked_xml}/ipv6_static.xml | 0 .../system-connections/eth0.nmconnection | 21 +++++++++++++++++++ .../wicked_xml}/single_gateway.xml | 0 16 files changed, 158 insertions(+) create mode 100644 rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/bond0.nmconnection create mode 100644 rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/en0.nmconnection create mode 100644 rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/en1.nmconnection rename rust/agama-migrate-wicked/tests/{ => bond_active-backup/wicked_xml}/bond_active-backup.xml (100%) create mode 100644 rust/agama-migrate-wicked/tests/ipv4+6_dhcp/system-connections/eth0.nmconnection rename rust/agama-migrate-wicked/tests/{ => ipv4+6_dhcp/wicked_xml}/ipv4+6_dhcp.xml (100%) create mode 100644 rust/agama-migrate-wicked/tests/ipv4_static/system-connections/eth1.nmconnection rename rust/agama-migrate-wicked/tests/{ => ipv4_static/wicked_xml}/ipv4_static.xml (100%) create mode 100644 rust/agama-migrate-wicked/tests/ipv6_auto/system-connections/eth2.nmconnection rename rust/agama-migrate-wicked/tests/{ => ipv6_auto/wicked_xml}/ipv6_auto.xml (100%) create mode 100644 rust/agama-migrate-wicked/tests/ipv6_dhcp/system-connections/eth3.nmconnection rename rust/agama-migrate-wicked/tests/{ => ipv6_dhcp/wicked_xml}/ipv6_dhcp.xml (100%) create mode 100644 rust/agama-migrate-wicked/tests/ipv6_static/system-connections/eth4.nmconnection rename rust/agama-migrate-wicked/tests/{ => ipv6_static/wicked_xml}/ipv6_static.xml (100%) create mode 100644 rust/agama-migrate-wicked/tests/single_gateway/system-connections/eth0.nmconnection rename rust/agama-migrate-wicked/tests/{ => single_gateway/wicked_xml}/single_gateway.xml (100%) diff --git a/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/bond0.nmconnection b/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/bond0.nmconnection new file mode 100644 index 0000000000..78a31ccb63 --- /dev/null +++ b/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/bond0.nmconnection @@ -0,0 +1,21 @@ +[connection] +id=bond0 +uuid=a6902e59-964b-4651-b8d8-ffe67658ae9a +type=bond +interface-name=bond0 + +[bond] +miimon=100 +mode=active-backup +primary=en0 + +[match] + +[ipv4] +method=auto + +[ipv6] +addr-gen-mode=default +method=auto + +[proxy] diff --git a/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/en0.nmconnection b/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/en0.nmconnection new file mode 100644 index 0000000000..046d8e7906 --- /dev/null +++ b/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/en0.nmconnection @@ -0,0 +1,11 @@ +[connection] +id=en0 +uuid=38d979e6-aa0e-4bae-8cff-a6dda281d0c7 +type=ethernet +interface-name=en0 +master=bond0 +slave-type=bond + +[ethernet] + +[match] diff --git a/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/en1.nmconnection b/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/en1.nmconnection new file mode 100644 index 0000000000..1e079a2789 --- /dev/null +++ b/rust/agama-migrate-wicked/tests/bond_active-backup/system-connections/en1.nmconnection @@ -0,0 +1,11 @@ +[connection] +id=en1 +uuid=9269bbb4-a771-406f-ba66-3f65ed15634c +type=ethernet +interface-name=en1 +master=bond0 +slave-type=bond + +[ethernet] + +[match] diff --git a/rust/agama-migrate-wicked/tests/bond_active-backup.xml b/rust/agama-migrate-wicked/tests/bond_active-backup/wicked_xml/bond_active-backup.xml similarity index 100% rename from rust/agama-migrate-wicked/tests/bond_active-backup.xml rename to rust/agama-migrate-wicked/tests/bond_active-backup/wicked_xml/bond_active-backup.xml diff --git a/rust/agama-migrate-wicked/tests/ipv4+6_dhcp/system-connections/eth0.nmconnection b/rust/agama-migrate-wicked/tests/ipv4+6_dhcp/system-connections/eth0.nmconnection new file mode 100644 index 0000000000..3e18df4cfe --- /dev/null +++ b/rust/agama-migrate-wicked/tests/ipv4+6_dhcp/system-connections/eth0.nmconnection @@ -0,0 +1,18 @@ +[connection] +id=eth0 +uuid=a123047b-232e-4b86-9f69-851e7690deaa +type=ethernet +interface-name=eth0 + +[ethernet] + +[match] + +[ipv4] +method=auto + +[ipv6] +addr-gen-mode=default +method=auto + +[proxy] diff --git a/rust/agama-migrate-wicked/tests/ipv4+6_dhcp.xml b/rust/agama-migrate-wicked/tests/ipv4+6_dhcp/wicked_xml/ipv4+6_dhcp.xml similarity index 100% rename from rust/agama-migrate-wicked/tests/ipv4+6_dhcp.xml rename to rust/agama-migrate-wicked/tests/ipv4+6_dhcp/wicked_xml/ipv4+6_dhcp.xml diff --git a/rust/agama-migrate-wicked/tests/ipv4_static/system-connections/eth1.nmconnection b/rust/agama-migrate-wicked/tests/ipv4_static/system-connections/eth1.nmconnection new file mode 100644 index 0000000000..13fe8e06d8 --- /dev/null +++ b/rust/agama-migrate-wicked/tests/ipv4_static/system-connections/eth1.nmconnection @@ -0,0 +1,20 @@ +[connection] +id=eth1 +uuid=4935f592-3e86-491b-847b-2ce4f180001c +type=ethernet +interface-name=eth1 + +[ethernet] + +[match] + +[ipv4] +address1=192.168.100.5/24 +address2=192.168.101.5/24 +method=manual + +[ipv6] +addr-gen-mode=default +method=auto + +[proxy] diff --git a/rust/agama-migrate-wicked/tests/ipv4_static.xml b/rust/agama-migrate-wicked/tests/ipv4_static/wicked_xml/ipv4_static.xml similarity index 100% rename from rust/agama-migrate-wicked/tests/ipv4_static.xml rename to rust/agama-migrate-wicked/tests/ipv4_static/wicked_xml/ipv4_static.xml diff --git a/rust/agama-migrate-wicked/tests/ipv6_auto/system-connections/eth2.nmconnection b/rust/agama-migrate-wicked/tests/ipv6_auto/system-connections/eth2.nmconnection new file mode 100644 index 0000000000..963ae176ff --- /dev/null +++ b/rust/agama-migrate-wicked/tests/ipv6_auto/system-connections/eth2.nmconnection @@ -0,0 +1,18 @@ +[connection] +id=eth2 +uuid=85378eec-2abb-4cbb-a3d3-69c10921b2e0 +type=ethernet +interface-name=eth2 + +[ethernet] + +[match] + +[ipv4] +method=auto + +[ipv6] +addr-gen-mode=default +method=auto + +[proxy] diff --git a/rust/agama-migrate-wicked/tests/ipv6_auto.xml b/rust/agama-migrate-wicked/tests/ipv6_auto/wicked_xml/ipv6_auto.xml similarity index 100% rename from rust/agama-migrate-wicked/tests/ipv6_auto.xml rename to rust/agama-migrate-wicked/tests/ipv6_auto/wicked_xml/ipv6_auto.xml diff --git a/rust/agama-migrate-wicked/tests/ipv6_dhcp/system-connections/eth3.nmconnection b/rust/agama-migrate-wicked/tests/ipv6_dhcp/system-connections/eth3.nmconnection new file mode 100644 index 0000000000..88b5209b09 --- /dev/null +++ b/rust/agama-migrate-wicked/tests/ipv6_dhcp/system-connections/eth3.nmconnection @@ -0,0 +1,18 @@ +[connection] +id=eth3 +uuid=ee291fe1-7dd3-4376-9c63-4228fab9df27 +type=ethernet +interface-name=eth3 + +[ethernet] + +[match] + +[ipv4] +method=auto + +[ipv6] +addr-gen-mode=default +method=auto + +[proxy] diff --git a/rust/agama-migrate-wicked/tests/ipv6_dhcp.xml b/rust/agama-migrate-wicked/tests/ipv6_dhcp/wicked_xml/ipv6_dhcp.xml similarity index 100% rename from rust/agama-migrate-wicked/tests/ipv6_dhcp.xml rename to rust/agama-migrate-wicked/tests/ipv6_dhcp/wicked_xml/ipv6_dhcp.xml diff --git a/rust/agama-migrate-wicked/tests/ipv6_static/system-connections/eth4.nmconnection b/rust/agama-migrate-wicked/tests/ipv6_static/system-connections/eth4.nmconnection new file mode 100644 index 0000000000..19852acb3d --- /dev/null +++ b/rust/agama-migrate-wicked/tests/ipv6_static/system-connections/eth4.nmconnection @@ -0,0 +1,20 @@ +[connection] +id=eth4 +uuid=79dac508-d8ae-4bae-82bc-8590c9e501cd +type=ethernet +interface-name=eth4 + +[ethernet] + +[match] + +[ipv4] +method=auto + +[ipv6] +addr-gen-mode=default +address1=2001:db8:0:1::5/64 +address2=2001:db8:0:2::5/64 +method=manual + +[proxy] diff --git a/rust/agama-migrate-wicked/tests/ipv6_static.xml b/rust/agama-migrate-wicked/tests/ipv6_static/wicked_xml/ipv6_static.xml similarity index 100% rename from rust/agama-migrate-wicked/tests/ipv6_static.xml rename to rust/agama-migrate-wicked/tests/ipv6_static/wicked_xml/ipv6_static.xml diff --git a/rust/agama-migrate-wicked/tests/single_gateway/system-connections/eth0.nmconnection b/rust/agama-migrate-wicked/tests/single_gateway/system-connections/eth0.nmconnection new file mode 100644 index 0000000000..242e2b77a2 --- /dev/null +++ b/rust/agama-migrate-wicked/tests/single_gateway/system-connections/eth0.nmconnection @@ -0,0 +1,21 @@ +[connection] +id=eth0 +uuid=676a03ec-54a6-4e45-b7ab-2eb0e1c18a75 +type=ethernet +interface-name=eth0 + +[ethernet] + +[match] + +[ipv4] +address1=192.168.101.5/24,192.168.102.1 +address2=192.168.102.5/24 +method=manual + +[ipv6] +addr-gen-mode=default +address1=2001:db8:1::5/64,2001:db8:1::1 +method=manual + +[proxy] diff --git a/rust/agama-migrate-wicked/tests/single_gateway.xml b/rust/agama-migrate-wicked/tests/single_gateway/wicked_xml/single_gateway.xml similarity index 100% rename from rust/agama-migrate-wicked/tests/single_gateway.xml rename to rust/agama-migrate-wicked/tests/single_gateway/wicked_xml/single_gateway.xml