Skip to content

Commit

Permalink
Update network static tests for NM change (gh1349)
Browse files Browse the repository at this point in the history 
NM now dumps ipv4 address setting value into two separate 'address1' and
'gateway' keys by default.
NetworkManager/NetworkManager@38dca2f
  • Loading branch information
@rvykydal
rvykydal committed Jan 10, 2025
1 parent 023dda9 commit 7e4ac90
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
4 changes: 2 additions & 2 deletions network-bootopts-static-mac.ks.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ fi


check_device_config_value @KSTEST_NETDEV1@ IPADDR __NONE ipv4 method auto
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@
check_device_config_value @KSTEST_NETDEV2@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ DNS1 @KSTEST_STATIC_DNS1@ ipv4 dns "@KSTEST_STATIC_DNS1@;"
check_device_ipv4_address @KSTEST_NETDEV2@ @KSTEST_STATIC_IP@

Expand Down
4 changes: 2 additions & 2 deletions network-bootopts-static-unspec-bootif.ks.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ fi


check_device_config_value @KSTEST_NETDEV1@ IPADDR __NONE ipv4 method auto
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@
check_device_config_value @KSTEST_NETDEV2@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ DNS1 @KSTEST_STATIC_DNS1@ ipv4 dns "@KSTEST_STATIC_DNS1@;"
check_device_ipv4_address @KSTEST_NETDEV2@ @KSTEST_STATIC_IP@

Expand Down
4 changes: 2 additions & 2 deletions network-bootopts-static-unspec-single.ks.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ check_gui_configurations @KSTEST_NETDEV1@

check_device_connected @KSTEST_NETDEV1@ yes

check_device_config_value @KSTEST_NETDEV1@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@
check_device_config_value @KSTEST_NETDEV1@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV1@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV1@ DNS1 @KSTEST_STATIC_DNS1@ ipv4 dns "@KSTEST_STATIC_DNS1@;"
check_device_ipv4_address @KSTEST_NETDEV1@ @KSTEST_STATIC_IP@

Expand Down
4 changes: 2 additions & 2 deletions network-bootopts-static.ks.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ check_gui_configurations @KSTEST_NETDEV1@

check_device_connected @KSTEST_NETDEV1@ yes

check_device_config_value @KSTEST_NETDEV1@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@
check_device_config_value @KSTEST_NETDEV1@ PREFIX @KSTEST_STATIC_PREFIX@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV1@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 address1 @KSTEST_STATIC_IP@/@KSTEST_STATIC_PREFIX@,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV1@ DNS1 @KSTEST_STATIC_DNS1@ ipv4 dns "@KSTEST_STATIC_DNS1@;"
check_device_ipv4_address @KSTEST_NETDEV1@ @KSTEST_STATIC_IP@

Expand Down
3 changes: 2 additions & 1 deletion network-static-httpks.ks.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@

@KSINCLUDE@ post-lib-network.sh

check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ ONBOOT no connection autoconnect false
check_device_connected @KSTEST_NETDEV1@ yes
check_device_connected @KSTEST_NETDEV2@ yes
Expand Down
3 changes: 2 additions & 1 deletion network-static.ks.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@

@KSINCLUDE@ post-lib-network.sh

check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24,@KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
check_device_config_value @KSTEST_NETDEV2@ ONBOOT no connection autoconnect false
check_device_connected @KSTEST_NETDEV1@ yes
check_device_connected @KSTEST_NETDEV2@ yes
Expand Down

0 comments on commit 7e4ac90

Please sign in to comment.