Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update network static tests for NM change (gh1349) #1350

Merged
merged 1 commit into from
Jan 22, 2025
+16 −68
Merged

Update network static tests for NM change (gh1349) #1350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions network-bootopts-static-mac.ks.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,9 @@ else
fi

check_device_config_value @KSTEST_NETDEV1@ IPADDR __NONE ipv4 method auto

@KSINCLUDE@ scripts-lib.sh
platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
if [ "${platform}" == "rhel10" ] || [ "${platform}" == "rhel9" ]; then
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@
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
else
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@ 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@
fi

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@
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
16 changes: 3 additions & 13 deletions network-bootopts-static-unspec-bootif.ks.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,9 @@ fi


check_device_config_value @KSTEST_NETDEV1@ IPADDR __NONE ipv4 method auto

@KSINCLUDE@ scripts-lib.sh
platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
if [ "${platform}" == "rhel10" ] || [ "${platform}" == "rhel9" ]; then
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@
check_device_config_value @KSTEST_NETDEV2@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
else
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@ 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@
fi

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@
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
15 changes: 3 additions & 12 deletions network-bootopts-static-unspec-single.ks.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,9 @@ check_gui_configurations @KSTEST_NETDEV1@

check_device_connected @KSTEST_NETDEV1@ yes

@KSINCLUDE@ scripts-lib.sh
platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
if [ "${platform}" == "rhel10" ] || [ "${platform}" == "rhel9" ]; then
check_device_config_value @KSTEST_NETDEV1@ 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@
check_device_config_value @KSTEST_NETDEV1@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
else
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_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@
fi

check_device_config_value @KSTEST_NETDEV1@ 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@
check_device_config_value @KSTEST_NETDEV1@ 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
15 changes: 3 additions & 12 deletions network-bootopts-static.ks.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,9 @@ check_gui_configurations @KSTEST_NETDEV1@

check_device_connected @KSTEST_NETDEV1@ yes

@KSINCLUDE@ scripts-lib.sh
platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
if [ "${platform}" == "rhel10" ] || [ "${platform}" == "rhel9" ]; then
check_device_config_value @KSTEST_NETDEV1@ 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@
check_device_config_value @KSTEST_NETDEV1@ GATEWAY @KSTEST_STATIC_GATEWAY@ ipv4 gateway @KSTEST_STATIC_GATEWAY@
else
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_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@
fi

check_device_config_value @KSTEST_NETDEV1@ 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@
check_device_config_value @KSTEST_NETDEV1@ 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
11 changes: 2 additions & 9 deletions network-static-httpks.ks.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@

@KSINCLUDE@ post-lib-network.sh

@KSINCLUDE@ scripts-lib.sh
platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
if [ "${platform}" == "rhel10" ] || [ "${platform}" == "rhel9" ]; then
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@
else
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24,@KSTEST_STATIC_GATEWAY@
fi

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
11 changes: 2 additions & 9 deletions network-static.ks.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,8 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@

@KSINCLUDE@ post-lib-network.sh

@KSINCLUDE@ scripts-lib.sh
platform="$(get_platform @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@)"
if [ "${platform}" == "rhel10" ] || [ "${platform}" == "rhel9" ]; then
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@
else
check_device_config_value @KSTEST_NETDEV2@ IPADDR @KSTEST_STATIC_IP@ ipv4 address1 @KSTEST_STATIC_IP@/24,@KSTEST_STATIC_GATEWAY@
fi

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
Loading