diff --git a/bindtomac-bond2-pre.ks.in b/bindtomac-bond2-pre.ks.in index 5004227c..8789a02f 100644 --- a/bindtomac-bond2-pre.ks.in +++ b/bindtomac-bond2-pre.ks.in @@ -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 @@ -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 diff --git a/bindtomac-bridge-2devs-httpks.ks.in b/bindtomac-bridge-2devs-httpks.ks.in index e7b5b0c2..50ba36f6 100644 --- a/bindtomac-bridge-2devs-httpks.ks.in +++ b/bindtomac-bridge-2devs-httpks.ks.in @@ -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 @@ -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 diff --git a/bindtomac-bridge-2devs-pre.ks.in b/bindtomac-bridge-2devs-pre.ks.in index a75ad3d8..4681bca8 100644 --- a/bindtomac-bridge-2devs-pre.ks.in +++ b/bindtomac-bridge-2devs-pre.ks.in @@ -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 @@ -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 diff --git a/bindtomac-bridge-httpks.ks.in b/bindtomac-bridge-httpks.ks.in index 4351a67e..656e771c 100644 --- a/bindtomac-bridge-httpks.ks.in +++ b/bindtomac-bridge-httpks.ks.in @@ -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 diff --git a/bindtomac-bridge-no-bootopts-net.ks.in b/bindtomac-bridge-no-bootopts-net.ks.in index 1f286e0f..add4d1c4 100644 --- a/bindtomac-bridge-no-bootopts-net.ks.in +++ b/bindtomac-bridge-no-bootopts-net.ks.in @@ -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 diff --git a/bindtomac-bridged-bond-httpks.ks.in b/bindtomac-bridged-bond-httpks.ks.in index 172cf956..a6d008a4 100644 --- a/bindtomac-bridged-bond-httpks.ks.in +++ b/bindtomac-bridged-bond-httpks.ks.in @@ -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 diff --git a/bindtomac-team-httpks.ks.in b/bindtomac-team-httpks.ks.in index 606542a3..08ef134a 100644 --- a/bindtomac-team-httpks.ks.in +++ b/bindtomac-team-httpks.ks.in @@ -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 @@ -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 diff --git a/bindtomac-team-pre.ks.in b/bindtomac-team-pre.ks.in index f423c278..d25d8829 100644 --- a/bindtomac-team-pre.ks.in +++ b/bindtomac-team-pre.ks.in @@ -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 @@ -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 diff --git a/bond-ks-initramfs.ks.in b/bond-ks-initramfs.ks.in index 854e5a35..defe2b4c 100644 --- a/bond-ks-initramfs.ks.in +++ b/bond-ks-initramfs.ks.in @@ -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 diff --git a/bond2-pre.ks.in b/bond2-pre.ks.in index 8ad27503..72fadebe 100644 --- a/bond2-pre.ks.in +++ b/bond2-pre.ks.in @@ -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 @@ -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 diff --git a/bridge-2devs-httpks.ks.in b/bridge-2devs-httpks.ks.in index 826d01a2..4957f3e4 100644 --- a/bridge-2devs-httpks.ks.in +++ b/bridge-2devs-httpks.ks.in @@ -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 @@ -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 diff --git a/bridge-2devs-pre.ks.in b/bridge-2devs-pre.ks.in index 6d679df3..b494fa57 100644 --- a/bridge-2devs-pre.ks.in +++ b/bridge-2devs-pre.ks.in @@ -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 @@ -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 diff --git a/bridge-2devs.ks.in b/bridge-2devs.ks.in index c303c54f..fa178d85 100644 --- a/bridge-2devs.ks.in +++ b/bridge-2devs.ks.in @@ -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 @@ -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 diff --git a/bridge-httpks.ks.in b/bridge-httpks.ks.in index b530f763..6eea75a6 100644 --- a/bridge-httpks.ks.in +++ b/bridge-httpks.ks.in @@ -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 diff --git a/bridge-no-bootopts-net.ks.in b/bridge-no-bootopts-net.ks.in index 784d8ce7..3dce4807 100644 --- a/bridge-no-bootopts-net.ks.in +++ b/bridge-no-bootopts-net.ks.in @@ -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 diff --git a/bridged-bond-httpks.ks.in b/bridged-bond-httpks.ks.in index fd5cf30a..1691471d 100644 --- a/bridged-bond-httpks.ks.in +++ b/bridged-bond-httpks.ks.in @@ -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 diff --git a/bridged-bond-pre.ks.in b/bridged-bond-pre.ks.in index 9931f44e..817468fe 100644 --- a/bridged-bond-pre.ks.in +++ b/bridged-bond-pre.ks.in @@ -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 diff --git a/network-bootopts-bond-bootif.ks.in b/network-bootopts-bond-bootif.ks.in index bc7983ac..05aee9c1 100644 --- a/network-bootopts-bond-bootif.ks.in +++ b/network-bootopts-bond-bootif.ks.in @@ -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 diff --git a/network-bootopts-bond-dhcp-httpks.ks.in b/network-bootopts-bond-dhcp-httpks.ks.in index 6ccd7317..bbedb3ed 100644 --- a/network-bootopts-bond-dhcp-httpks.ks.in +++ b/network-bootopts-bond-dhcp-httpks.ks.in @@ -35,9 +35,9 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSTEST_NETDEV3@ bond check_device_config_value bond0 ONBOOT yes connection autoconnect __NONE # config files are not named bond0_slave_1 as opposed to kickstart config 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_config_value @KSTEST_NETDEV3@ ONBOOT yes connection autoconnect __NONE -check_device_config_value @KSTEST_NETDEV3@ SLAVE yes connection slave-type bond +check_device_config_value @KSTEST_NETDEV3@ SLAVE yes connection port-type bond check_device_connected bond0 yes check_bond_has_slave bond0 @KSTEST_NETDEV2@ yes check_bond_has_slave bond0 @KSTEST_NETDEV3@ yes diff --git a/network-bootopts-bond-ks-override.ks.in b/network-bootopts-bond-ks-override.ks.in index 123a5640..e5c74dac 100644 --- a/network-bootopts-bond-ks-override.ks.in +++ b/network-bootopts-bond-ks-override.ks.in @@ -40,9 +40,9 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSTEST_NETDEV3@ bond check_device_config_value bond0 ONBOOT no connection autoconnect false # config files are not named bond0_slave_1 as opposed to kickstart config 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_config_value @KSTEST_NETDEV3@ ONBOOT yes connection autoconnect __NONE -check_device_config_value @KSTEST_NETDEV3@ SLAVE yes connection slave-type bond +check_device_config_value @KSTEST_NETDEV3@ SLAVE yes connection port-type bond check_device_connected bond0 yes check_bond_has_slave bond0 @KSTEST_NETDEV2@ yes check_bond_has_slave bond0 @KSTEST_NETDEV3@ yes diff --git a/network-bootopts-bridge-dhcp-httpks.ks.in b/network-bootopts-bridge-dhcp-httpks.ks.in index c6a17204..6b189c94 100644 --- a/network-bootopts-bridge-dhcp-httpks.ks.in +++ b/network-bootopts-bridge-dhcp-httpks.ks.in @@ -36,9 +36,9 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ bridge0 check_device_connected bridge0 yes check_device_config_value bridge0 ONBOOT yes connection autoconnect __NONE check_device_config_value @KSTEST_NETDEV2@ ONBOOT yes connection autoconnect __NONE -# connection.master is identified by connection uuid so check __ANY -check_device_config_value @KSTEST_NETDEV2@ BRIDGE bridge0 connection master __ANY -check_device_config_value @KSTEST_NETDEV2@ BRIDGE bridge0 connection slave-type bridge +# connection.controller is identified by connection uuid so check __ANY +check_device_config_value @KSTEST_NETDEV2@ BRIDGE bridge0 connection controller __ANY +check_device_config_value @KSTEST_NETDEV2@ BRIDGE bridge0 connection port-type bridge # No error was written to /root/RESULT file, everything is OK if [[ ! -e /root/RESULT ]]; then diff --git a/network-bootopts-team-dhcp-httpks.ks.in b/network-bootopts-team-dhcp-httpks.ks.in index 6aa86646..b7724345 100644 --- a/network-bootopts-team-dhcp-httpks.ks.in +++ b/network-bootopts-team-dhcp-httpks.ks.in @@ -35,11 +35,11 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSTEST_NETDEV3@ team check_device_config_value team0 ONBOOT yes connection autoconnect __NONE check_device_config_value @KSTEST_NETDEV2@ ONBOOT yes connection autoconnect __NONE check_device_config_value @KSTEST_NETDEV3@ ONBOOT yes connection autoconnect __NONE -# connection.master is identified by connection uuid so check __ANY -check_device_config_value @KSTEST_NETDEV2@ TEAM_MASTER team0 connection master __ANY -check_device_config_value @KSTEST_NETDEV2@ TEAM_MASTER team0 connection slave-type team -check_device_config_value @KSTEST_NETDEV3@ TEAM_MASTER team0 connection master __ANY -check_device_config_value @KSTEST_NETDEV3@ TEAM_MASTER team0 connection slave-type team +# connection.controller is identified by connection uuid so check __ANY +check_device_config_value @KSTEST_NETDEV2@ TEAM_MASTER team0 connection controller __ANY +check_device_config_value @KSTEST_NETDEV2@ TEAM_MASTER team0 connection port-type team +check_device_config_value @KSTEST_NETDEV3@ TEAM_MASTER team0 connection controller __ANY +check_device_config_value @KSTEST_NETDEV3@ TEAM_MASTER team0 connection port-type team check_device_connected team0 yes diff --git a/network-prefixdevname.ks.in b/network-prefixdevname.ks.in index 86214686..b3636449 100644 --- a/network-prefixdevname.ks.in +++ b/network-prefixdevname.ks.in @@ -53,10 +53,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 kstest2 yes diff --git a/team-httpks.ks.in b/team-httpks.ks.in index 3c22e924..2baa4a10 100644 --- a/team-httpks.ks.in +++ b/team-httpks.ks.in @@ -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 @@ -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 # teamd package should have been installed as long as team devices are present diff --git a/team-pre.ks.in b/team-pre.ks.in index debb45cb..178fd0c7 100644 --- a/team-pre.ks.in +++ b/team-pre.ks.in @@ -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 @@ -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 diff --git a/team.ks.in b/team.ks.in index 3c22e924..2baa4a10 100644 --- a/team.ks.in +++ b/team.ks.in @@ -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 @@ -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 # teamd package should have been installed as long as team devices are present