Skip to content

Commit

Permalink
Update configuration values "master" and "slave-type" in NM keyfile
Browse files Browse the repository at this point in the history
  • Loading branch information
rvykydal committed Aug 19, 2024
1 parent 25664a8 commit 74d39d1
Show file tree
Hide file tree
Showing 26 changed files with 108 additions and 108 deletions.
8 changes: 4 additions & 4 deletions bindtomac-bond2-pre.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ check_device_config_value bond0 ONBOOT no connection autoconnect false

check_device_config_value bond0_slave_1 ONBOOT no connection autoconnect false
check_device_config_value bond0_slave_2 ONBOOT no connection autoconnect false
check_device_config_value bond0_slave_1 MASTER bond0 connection master bond0
check_device_config_value bond0_slave_2 MASTER bond0 connection master bond0
check_device_config_value bond0_slave_1 MASTER bond0 connection controller bond0
check_device_config_value bond0_slave_2 MASTER bond0 connection controller bond0

check_device_connected bond0 yes
check_bond_has_slave bond0 @KSTEST_NETDEV2@ yes
Expand All @@ -53,8 +53,8 @@ check_device_config_value bond1 ONBOOT yes connection autoconnect __NONE

check_device_config_value bond1_slave_1 ONBOOT yes connection autoconnect __NONE
check_device_config_value bond1_slave_2 ONBOOT yes connection autoconnect __NONE
check_device_config_value bond1_slave_1 MASTER bond1 connection master bond1
check_device_config_value bond1_slave_2 MASTER bond1 connection master bond1
check_device_config_value bond1_slave_1 MASTER bond1 connection controller bond1
check_device_config_value bond1_slave_2 MASTER bond1 connection controller bond1

check_device_config_bound_to_mac bond0_slave_1
check_device_config_bound_to_mac bond0_slave_2
Expand Down
8 changes: 4 additions & 4 deletions bindtomac-bridge-2devs-httpks.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"

check_device_connected bridge0 yes
check_device_connected @KSTEST_NETDEV1@ yes
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection controller bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection port-type bridge

check_device_has_ipv4_address bridge0 yes
check_device_has_ipv4_address @KSTEST_NETDEV1@ no
Expand Down Expand Up @@ -71,8 +71,8 @@ else
fi


check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection master bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection slave-type bridge
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection controller bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection port-type bridge

check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE

Expand Down
8 changes: 4 additions & 4 deletions bindtomac-bridge-2devs-pre.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"

check_device_connected bridge0 yes
check_device_connected @KSTEST_NETDEV1@ yes
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection controller bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection port-type bridge

check_device_has_ipv4_address bridge0 yes
check_device_has_ipv4_address @KSTEST_NETDEV1@ no
Expand All @@ -70,8 +70,8 @@ else
check_device_connected @KSTEST_NETDEV2@ yes
fi

check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection master bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection slave-type bridge
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection controller bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection port-type bridge

check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE

Expand Down
4 changes: 2 additions & 2 deletions bindtomac-bridge-httpks.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"

check_device_connected bridge0 yes
check_device_connected @KSTEST_NETDEV1@ yes
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection controller bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection port-type bridge
check_device_has_ipv4_address bridge0 yes
check_device_has_ipv4_address @KSTEST_NETDEV1@ no

Expand Down
6 changes: 3 additions & 3 deletions bindtomac-bridge-no-bootopts-net.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ check_device_connected bridge0 yes
check_device_connected @KSTEST_NETDEV1@ yes

# The bridge is created in initramfs so the slave connection is named @KSTEST_NETDEV1@
# connection.master is identified by connection uuid so check __ANY
check_device_config_value @KSTEST_NETDEV1@ BRIDGE bridge0 connection master __ANY
check_device_config_value @KSTEST_NETDEV1@ BRIDGE bridge0 connection slave-type bridge
# connection.controller is identified by connection uuid so check __ANY
check_device_config_value @KSTEST_NETDEV1@ BRIDGE bridge0 connection controller __ANY
check_device_config_value @KSTEST_NETDEV1@ BRIDGE bridge0 connection port-type bridge

check_device_has_ipv4_address bridge0 yes
check_device_has_ipv4_address @KSTEST_NETDEV1@ no
Expand Down
4 changes: 2 additions & 2 deletions bindtomac-bridged-bond-httpks.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSTEST_NETDEV3@ bond
@KSINCLUDE@ post-lib-network.sh

check_device_connected bridge0 yes
check_device_config_value bond0 BRIDGE bridge0 connection master bridge0
check_device_config_value bond0 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bond0 BRIDGE bridge0 connection controller bridge0
check_device_config_value bond0 BRIDGE bridge0 connection port-type bridge
check_device_config_value bond0 BONDING_OPTS mode=balance-tlb bond mode balance-tlb
check_config_exists bridge0_slave_1 no
check_bond_has_slave bond0 @KSTEST_NETDEV2@ yes
Expand Down
16 changes: 8 additions & 8 deletions bindtomac-team-httpks.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSTEST_NETDEV3@ @KST
check_device_config_value team0 ONBOOT no connection autoconnect false
check_device_config_value team0_slave_1 ONBOOT no connection autoconnect false
check_device_config_value team0_slave_2 ONBOOT no connection autoconnect false
check_device_config_value team0_slave_1 TEAM_MASTER team0 connection master team0
check_device_config_value team0_slave_1 TEAM_MASTER team0 connection slave-type team
check_device_config_value team0_slave_2 TEAM_MASTER team0 connection master team0
check_device_config_value team0_slave_2 TEAM_MASTER team0 connection slave-type team
check_device_config_value team0_slave_1 TEAM_MASTER team0 connection controller team0
check_device_config_value team0_slave_1 TEAM_MASTER team0 connection port-type team
check_device_config_value team0_slave_2 TEAM_MASTER team0 connection controller team0
check_device_config_value team0_slave_2 TEAM_MASTER team0 connection port-type team
check_device_connected team0 yes
check_team_has_slave team0 @KSTEST_NETDEV1@ no
check_team_has_slave team0 @KSTEST_NETDEV2@ yes
Expand All @@ -50,10 +50,10 @@ check_team_option team0 "priority \(port:@KSTEST_NETDEV3@\) 100"
check_device_config_value team1 ONBOOT yes connection autoconnect __NONE
check_device_config_value team1_slave_1 ONBOOT yes connection autoconnect __NONE
check_device_config_value team1_slave_2 ONBOOT yes connection autoconnect __NONE
check_device_config_value team1_slave_1 TEAM_MASTER team1 connection master team1
check_device_config_value team1_slave_1 TEAM_MASTER team1 connection slave-type team
check_device_config_value team1_slave_2 TEAM_MASTER team1 connection master team1
check_device_config_value team1_slave_2 TEAM_MASTER team1 connection slave-type team
check_device_config_value team1_slave_1 TEAM_MASTER team1 connection controller team1
check_device_config_value team1_slave_1 TEAM_MASTER team1 connection port-type team
check_device_config_value team1_slave_2 TEAM_MASTER team1 connection controller team1
check_device_config_value team1_slave_2 TEAM_MASTER team1 connection port-type team
check_device_connected team1 no

check_device_config_bound_to_mac team0_slave_1
Expand Down
16 changes: 8 additions & 8 deletions bindtomac-team-pre.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ check_device_config_value team0 ONBOOT no connection autoconnect false

check_device_config_value team0_slave_1 ONBOOT no connection autoconnect false
check_device_config_value team0_slave_2 ONBOOT no connection autoconnect false
check_device_config_value team0_slave_1 TEAM_MASTER team0 connection master team0
check_device_config_value team0_slave_1 TEAM_MASTER team0 connection slave-type team
check_device_config_value team0_slave_2 TEAM_MASTER team0 connection master team0
check_device_config_value team0_slave_2 TEAM_MASTER team0 connection slave-type team
check_device_config_value team0_slave_1 TEAM_MASTER team0 connection controller team0
check_device_config_value team0_slave_1 TEAM_MASTER team0 connection port-type team
check_device_config_value team0_slave_2 TEAM_MASTER team0 connection controller team0
check_device_config_value team0_slave_2 TEAM_MASTER team0 connection port-type team

check_device_connected team0 yes
check_team_has_slave team0 @KSTEST_NETDEV1@ no
Expand All @@ -57,10 +57,10 @@ check_device_config_value team1 ONBOOT yes connection autoconnect __NONE

check_device_config_value team1_slave_1 ONBOOT yes connection autoconnect __NONE
check_device_config_value team1_slave_2 ONBOOT yes connection autoconnect __NONE
check_device_config_value team1_slave_1 TEAM_MASTER team1 connection master team1
check_device_config_value team1_slave_1 TEAM_MASTER team1 connection slave-type team
check_device_config_value team1_slave_2 TEAM_MASTER team1 connection master team1
check_device_config_value team1_slave_2 TEAM_MASTER team1 connection slave-type team
check_device_config_value team1_slave_1 TEAM_MASTER team1 connection controller team1
check_device_config_value team1_slave_1 TEAM_MASTER team1 connection port-type team
check_device_config_value team1_slave_2 TEAM_MASTER team1 connection controller team1
check_device_config_value team1_slave_2 TEAM_MASTER team1 connection port-type team

check_device_connected team1 no

Expand Down
8 changes: 4 additions & 4 deletions bond-ks-initramfs.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,15 @@ platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
check_device_config_value bond0 ONBOOT yes connection autoconnect __NONE
if [ "${platform}" == "rhel8" ]; then
check_device_config_value bond0_slave_1 ONBOOT yes connection autoconnect __NONE
check_device_config_value bond0_slave_1 SLAVE yes connection slave-type bond
check_device_config_value bond0_slave_1 SLAVE yes connection port-type bond
check_device_config_value bond0_slave_2 ONBOOT yes connection autoconnect __NONE
check_device_config_value bond0_slave_2 SLAVE yes connection slave-type bond
check_device_config_value bond0_slave_2 SLAVE yes connection port-type bond
else
# config files are not named bond0_slave_1 as opposed to kickstart config
check_device_config_value @KSTEST_NETDEV1@ ONBOOT yes connection autoconnect __NONE
check_device_config_value @KSTEST_NETDEV1@ SLAVE yes connection slave-type bond
check_device_config_value @KSTEST_NETDEV1@ SLAVE yes connection port-type bond
check_device_config_value @KSTEST_NETDEV2@ ONBOOT yes connection autoconnect __NONE
check_device_config_value @KSTEST_NETDEV2@ SLAVE yes connection slave-type bond
check_device_config_value @KSTEST_NETDEV2@ SLAVE yes connection port-type bond
fi

check_device_connected bond0 yes
Expand Down
8 changes: 4 additions & 4 deletions bond2-pre.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ check_device_config_value bond0 ONBOOT no connection autoconnect false

check_device_config_value bond0_slave_1 ONBOOT no connection autoconnect false
check_device_config_value bond0_slave_2 ONBOOT no connection autoconnect false
check_device_config_value bond0_slave_1 MASTER bond0 connection master bond0
check_device_config_value bond0_slave_2 MASTER bond0 connection master bond0
check_device_config_value bond0_slave_1 MASTER bond0 connection controller bond0
check_device_config_value bond0_slave_2 MASTER bond0 connection controller bond0

check_device_connected bond0 yes
check_bond_has_slave bond0 @KSTEST_NETDEV2@ yes
Expand All @@ -53,8 +53,8 @@ check_device_config_value bond1 ONBOOT yes connection autoconnect __NONE

check_device_config_value bond1_slave_1 ONBOOT yes connection autoconnect __NONE
check_device_config_value bond1_slave_2 ONBOOT yes connection autoconnect __NONE
check_device_config_value bond1_slave_1 MASTER bond1 connection master bond1
check_device_config_value bond1_slave_2 MASTER bond1 connection master bond1
check_device_config_value bond1_slave_1 MASTER bond1 connection controller bond1
check_device_config_value bond1_slave_2 MASTER bond1 connection controller bond1

# FIXME this doesn't seem to hold for RHEL
check_device_connected bond1 no
Expand Down
8 changes: 4 additions & 4 deletions bridge-2devs-httpks.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"

check_device_connected bridge0 yes
check_device_connected @KSTEST_NETDEV1@ yes
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection controller bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection port-type bridge

check_device_has_ipv4_address bridge0 yes
check_device_has_ipv4_address @KSTEST_NETDEV1@ no
Expand Down Expand Up @@ -71,8 +71,8 @@ else
fi


check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection master bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection slave-type bridge
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection controller bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection port-type bridge

check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE

Expand Down
8 changes: 4 additions & 4 deletions bridge-2devs-pre.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ bridge0 bridge1

check_device_connected bridge0 yes
check_device_connected @KSTEST_NETDEV1@ yes
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection controller bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection port-type bridge

check_device_has_ipv4_address bridge0 yes
check_device_has_ipv4_address @KSTEST_NETDEV1@ no
Expand All @@ -69,8 +69,8 @@ else
check_device_connected @KSTEST_NETDEV2@ yes
fi

check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection master bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection slave-type bridge
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection controller bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection port-type bridge

check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE

Expand Down
8 changes: 4 additions & 4 deletions bridge-2devs.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ bridge0 bridge1

check_device_connected bridge0 yes
check_device_connected @KSTEST_NETDEV1@ yes
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection controller bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection port-type bridge

check_device_has_ipv4_address bridge0 yes
check_device_has_ipv4_address @KSTEST_NETDEV1@ no
Expand All @@ -69,8 +69,8 @@ else
check_device_has_ipv4_address @KSTEST_NETDEV2@ yes
fi

check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection master bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection slave-type bridge
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection controller bridge1
check_device_config_value bridge1_slave_1 BRIDGE bridge1 connection port-type bridge
check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE

check_device_config_value bridge1_slave_1 ONBOOT yes connection autoconnect __NONE
Expand Down
4 changes: 2 additions & 2 deletions bridge-httpks.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"

check_device_connected bridge0 yes
check_device_connected @KSTEST_NETDEV1@ yes
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection controller bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection port-type bridge
check_device_has_ipv4_address bridge0 yes
check_device_has_ipv4_address @KSTEST_NETDEV1@ no

Expand Down
10 changes: 5 additions & 5 deletions bridge-no-bootopts-net.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ check_device_connected @KSTEST_NETDEV1@ yes

if [ "${platform}" == "rhel8" ]; then
# RHEL-8-FAILURE: in rhel 8 the ifcfg is generated in initramfs by Anaconda
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection controller bridge0
check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection port-type bridge
else
# The bridge is created in initramfs so the slave connection is named @KSTEST_NETDEV1@
# connection.master is identified by connection uuid so check __ANY
check_device_config_value @KSTEST_NETDEV1@ BRIDGE bridge0 connection master __ANY
check_device_config_value @KSTEST_NETDEV1@ BRIDGE bridge0 connection slave-type bridge
# connection.controller is identified by connection uuid so check __ANY
check_device_config_value @KSTEST_NETDEV1@ BRIDGE bridge0 connection controller __ANY
check_device_config_value @KSTEST_NETDEV1@ BRIDGE bridge0 connection port-type bridge
fi


Expand Down
4 changes: 2 additions & 2 deletions bridged-bond-httpks.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSTEST_NETDEV3@ bond
@KSINCLUDE@ post-lib-network.sh

check_device_connected bridge0 yes
check_device_config_value bond0 BRIDGE bridge0 connection master bridge0
check_device_config_value bond0 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bond0 BRIDGE bridge0 connection controller bridge0
check_device_config_value bond0 BRIDGE bridge0 connection port-type bridge
check_device_config_value bond0 BONDING_OPTS mode=balance-tlb bond mode balance-tlb
check_config_exists bridge0_slave_1 no
check_bond_has_slave bond0 @KSTEST_NETDEV2@ yes
Expand Down
4 changes: 2 additions & 2 deletions bridged-bond-pre.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ check_bridge_has_slave bridge0 bond0 yes
@KSINCLUDE@ post-lib-network.sh

check_device_connected bridge0 yes
check_device_config_value bond0 BRIDGE bridge0 connection master bridge0
check_device_config_value bond0 BRIDGE bridge0 connection slave-type bridge
check_device_config_value bond0 BRIDGE bridge0 connection controller bridge0
check_device_config_value bond0 BRIDGE bridge0 connection port-type bridge
check_device_config_value bond0 BONDING_OPTS mode=balance-tlb bond mode balance-tlb
check_config_exists bridge0_slave_1 no
check_bond_has_slave bond0 @KSTEST_NETDEV2@ yes
Expand Down
4 changes: 2 additions & 2 deletions network-bootopts-bond-bootif.ks.in
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ bond0

# config files are not named bond0_slave_1 as opposed to kickstart config
check_device_config_value @KSTEST_NETDEV1@ ONBOOT yes connection autoconnect __NONE
check_device_config_value @KSTEST_NETDEV1@ SLAVE yes connection slave-type bond
check_device_config_value @KSTEST_NETDEV1@ SLAVE yes connection port-type bond
check_device_config_value @KSTEST_NETDEV2@ ONBOOT yes connection autoconnect __NONE
check_device_config_value @KSTEST_NETDEV2@ SLAVE yes connection slave-type bond
check_device_config_value @KSTEST_NETDEV2@ SLAVE yes connection port-type bond
check_device_connected bond0 yes
check_bond_has_slave bond0 @KSTEST_NETDEV1@ yes
check_bond_has_slave bond0 @KSTEST_NETDEV2@ yes
Expand Down
Loading

0 comments on commit 74d39d1

Please sign in to comment.