diff --git a/lib/tapnet.pm b/lib/tapnet.pm index a66e2525..3dac2237 100644 --- a/lib/tapnet.pm +++ b/lib/tapnet.pm @@ -49,7 +49,7 @@ sub setup_tap_static { $dnstext .= "\nDNS" . ${num} . "=" . $dns[$i]; } # bring up network. DEFROUTE is *vital* here - my $conftext = "DEVICE=eth0\nBOOTPROTO=none\nIPADDR=$ip\nGATEWAY=10.0.2.2\nPREFIX=24\nDEFROUTE=yes\nONBOOT=yes" . $dnstext; + my $conftext = "DEVICE=eth0\nBOOTPROTO=none\nIPADDR=$ip\nGATEWAY=172.16.2.2\nPREFIX=24\nDEFROUTE=yes\nONBOOT=yes" . $dnstext; assert_script_run "printf '${conftext}\n' > /etc/sysconfig/network-scripts/ifcfg-eth0"; assert_script_run "systemctl restart NetworkManager.service"; # FIXME workaround for diff --git a/templates-updates.fif.json b/templates-updates.fif.json index 4f40e646..8d6aca02 100644 --- a/templates-updates.fif.json +++ b/templates-updates.fif.json @@ -254,7 +254,7 @@ }, "settings": { "+START_AFTER_TEST": "installer_build@%ARCH_BASE_MACHINE%", - "ADD_REPOSITORY_VARIATION": "nfs://10.0.2.110:/opt/update_repo", + "ADD_REPOSITORY_VARIATION": "nfs://172.16.2.110:/opt/update_repo", "INSTALL": "1", "INSTALL_UNLOCK": "support_ready", "ISO": "%ADVISORY_OR_TASK%-netinst-%ARCH%.iso", diff --git a/templates.fif.json b/templates.fif.json index 915ce9ce..e2591866 100644 --- a/templates.fif.json +++ b/templates.fif.json @@ -1053,7 +1053,7 @@ "fedora-universal-x86_64-*-64bit": 40 }, "settings": { - "ANACONDA_STATIC": "10.0.2.111", + "ANACONDA_STATIC": "172.16.2.111", "INSTALL_UNLOCK": "support_ready", "NICTYPE": "tap", "PARALLEL_WITH": "support_server", @@ -1113,7 +1113,7 @@ "fedora-universal-x86_64-*-64bit": 30 }, "settings": { - "GRUB": "inst.ks=nfs:10.0.2.110:/export/root-user-crypted-net.ks", + "GRUB": "inst.ks=nfs:172.16.2.110:/export/root-user-crypted-net.ks", "INSTALL_UNLOCK": "support_ready", "KICKSTART": "1", "NICTYPE": "tap", @@ -1281,7 +1281,7 @@ "INSTALL_UNLOCK": "support_ready", "NICTYPE": "tap", "PARALLEL_WITH": "support_server", - "REPOSITORY_GRAPHICAL": "nfs:nfsvers=4:10.0.2.110:/repo", + "REPOSITORY_GRAPHICAL": "nfs:nfsvers=4:172.16.2.110:/repo", "WORKER_CLASS": "tap" } }, @@ -1295,7 +1295,7 @@ "INSTALL_UNLOCK": "support_ready", "NICTYPE": "tap", "PARALLEL_WITH": "support_server", - "REPOSITORY_VARIATION": "nfs:nfsvers=4:10.0.2.110:/repo", + "REPOSITORY_VARIATION": "nfs:nfsvers=4:172.16.2.110:/repo", "WORKER_CLASS": "tap" } }, @@ -1309,7 +1309,7 @@ "INSTALL_UNLOCK": "support_ready", "NICTYPE": "tap", "PARALLEL_WITH": "support_server", - "REPOSITORY_VARIATION": "nfs:nfsvers=4:10.0.2.110:/iso/image.iso", + "REPOSITORY_VARIATION": "nfs:nfsvers=4:172.16.2.110:/iso/image.iso", "WORKER_CLASS": "tap" } }, @@ -1445,7 +1445,7 @@ "fedora-Server-dvd-iso-x86_64-*-64bit": 40 }, "settings": { - "GRUB": "inst.stage2=nfs:nfsvers=4:10.0.2.110:/repo", + "GRUB": "inst.stage2=nfs:nfsvers=4:172.16.2.110:/repo", "INSTALL_UNLOCK": "support_ready", "NICTYPE": "tap", "PARALLEL_WITH": "support_server", @@ -1480,7 +1480,7 @@ "fedora-Server-dvd-iso-x86_64-*-64bit": 40 }, "settings": { - "GRUB": "inst.vnc net.ifnames=0 biosdevname=0 ip=10.0.2.114::10.0.2.2:255.255.255.0:vnc001.domain.local:eth0:off", + "GRUB": "inst.vnc net.ifnames=0 biosdevname=0 ip=172.16.2.114::172.16.2.2:255.255.255.0:vnc001.domain.local:eth0:off", "NICTYPE": "tap", "VNC_SERVER": "1", "WORKER_CLASS": "tap" @@ -1511,7 +1511,7 @@ "fedora-Server-dvd-iso-x86_64-*-64bit": 40 }, "settings": { - "GRUB": "inst.vnc inst.vncconnect=10.0.2.117:5500 net.ifnames=0 biosdevname=0 ip=10.0.2.116::10.0.2.2:255.255.255.0:vnc003.domain.local:eth0:off", + "GRUB": "inst.vnc inst.vncconnect=172.16.2.117:5500 net.ifnames=0 biosdevname=0 ip=172.16.2.116::172.16.2.2:255.255.255.0:vnc003.domain.local:eth0:off", "INSTALL_UNLOCK": "vncconnect_client_ready", "NICTYPE": "tap", "PARALLEL_WITH": "install_vncconnect_client", @@ -1651,7 +1651,7 @@ "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2", "NICTYPE": "tap", "POSTINSTALL": "podman", - "POST_STATIC": "10.0.2.114 podman001.domain.local", + "POST_STATIC": "172.16.2.114 podman001.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1670,7 +1670,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "podman", "POSTINSTALL": "_podman_client", - "POST_STATIC": "10.0.2.115 podclient001.domain.local", + "POST_STATIC": "172.16.2.115 podclient001.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1691,7 +1691,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_role_deploy_domain_controller", "POSTINSTALL": "realmd_join_cockpit freeipa_webui freeipa_password_change freeipa_client", - "POST_STATIC": "10.0.2.102 client002.domain.local", + "POST_STATIC": "172.16.2.102 client002.domain.local", "ROOT_PASSWORD": "weakpassword", "USER_LOGIN": "false", "WORKER_CLASS": "tap" @@ -1710,7 +1710,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_role_deploy_domain_controller", "POSTINSTALL": "realmd_join_sssd freeipa_client", - "POST_STATIC": "10.0.2.103 client003.domain.local", + "POST_STATIC": "172.16.2.103 client003.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1794,7 +1794,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_role_deploy_database_server", "POSTINSTALL": "database_client", - "POST_STATIC": "10.0.2.105 dbclient.domain.local", + "POST_STATIC": "172.16.2.105 dbclient.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1845,7 +1845,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_freeipa_replication_replica", "POSTINSTALL": "realmd_join_sssd freeipa_client", - "POST_STATIC": "10.0.2.108 client005.domain.local", + "POST_STATIC": "172.16.2.108 client005.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1867,7 +1867,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "role_deploy_domain_controller role_deploy_domain_controller_check", - "POST_STATIC": "10.0.2.106 ipa002.domain.local", + "POST_STATIC": "172.16.2.106 ipa002.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1890,7 +1890,7 @@ "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "PARALLEL_WITH": "server_freeipa_replication_master", "POSTINSTALL": "realmd_join_sssd", - "POST_STATIC": "10.0.2.107 ipa003.domain.local", + "POST_STATIC": "172.16.2.107 ipa003.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1930,7 +1930,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "server_remote_logging_server", "POSTINSTALL": "server_remote_logging_client", - "POST_STATIC": "10.0.2.113 rsyslogclient.domain.local", + "POST_STATIC": "172.16.2.113 rsyslogclient.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1950,7 +1950,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "server_remote_logging_server", - "POST_STATIC": "10.0.2.112 rsyslogserver.domain.local", + "POST_STATIC": "172.16.2.112 rsyslogserver.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1970,7 +1970,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "role_deploy_database_server", - "POST_STATIC": "10.0.2.104 db.domain.local", + "POST_STATIC": "172.16.2.104 db.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -1991,7 +1991,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "role_deploy_domain_controller role_deploy_domain_controller_check", - "POST_STATIC": "10.0.2.100 ipa001.domain.local", + "POST_STATIC": "172.16.2.100 ipa001.domain.local", "ROOT_PASSWORD": "weakpassword", "START_AFTER_TEST": "install_default_upload", "USER_LOGIN": "false", @@ -2015,7 +2015,7 @@ "NUMDISKS": "2", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "_support_server", - "POST_STATIC": "10.0.2.110 support.domain.local", + "POST_STATIC": "172.16.2.110 support.domain.local", "ROOT_PASSWORD": "weakpassword", "TEST_TARGET": "NONE", "USER_LOGIN": "false", @@ -2109,7 +2109,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "upgrade_2_server_domain_controller", "POSTINSTALL": "_setup_browser freeipa_webui freeipa_password_change freeipa_client", - "POST_STATIC": "10.0.2.103 client003.domain.local", + "POST_STATIC": "172.16.2.103 client003.domain.local", "PREUPGRADE": "realmd_join_sssd", "ROOT_PASSWORD": "weakpassword", "TEST_TARGET": "COMPOSE", @@ -2147,7 +2147,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "role_deploy_domain_controller_check", - "POST_STATIC": "10.0.2.100 ipa001.domain.local", + "POST_STATIC": "172.16.2.100 ipa001.domain.local", "PREUPGRADE": "role_deploy_domain_controller", "ROOT_PASSWORD": "weakpassword", "TEST_TARGET": "COMPOSE", @@ -2244,7 +2244,7 @@ "NICTYPE": "tap", "PARALLEL_WITH": "upgrade_server_domain_controller", "POSTINSTALL": "_setup_browser freeipa_webui freeipa_password_change freeipa_client", - "POST_STATIC": "10.0.2.103 client003.domain.local", + "POST_STATIC": "172.16.2.103 client003.domain.local", "PREUPGRADE": "realmd_join_sssd", "ROOT_PASSWORD": "weakpassword", "TEST_TARGET": "COMPOSE", @@ -2283,7 +2283,7 @@ "NICTYPE": "tap", "PARALLEL_CANCEL_WHOLE_CLUSTER": "0", "POSTINSTALL": "role_deploy_domain_controller_check", - "POST_STATIC": "10.0.2.100 ipa001.domain.local", + "POST_STATIC": "172.16.2.100 ipa001.domain.local", "PREUPGRADE": "role_deploy_domain_controller", "ROOT_PASSWORD": "weakpassword", "TEST_TARGET": "COMPOSE", diff --git a/tests/_anaconda_network_static.pm b/tests/_anaconda_network_static.pm index c15e595b..d628224b 100644 --- a/tests/_anaconda_network_static.pm +++ b/tests/_anaconda_network_static.pm @@ -16,7 +16,7 @@ sub run { # netmask is automatically set type_safely "\t\t"; # assume gateway - type_safely "10.0.2.2"; + type_safely "172.16.2.2"; # move to DNS servers type_safely "\n\t\t\t"; # set DNS from host diff --git a/tests/_podman_client.pm b/tests/_podman_client.pm index 12ea630c..24526d4b 100644 --- a/tests/_podman_client.pm +++ b/tests/_podman_client.pm @@ -14,7 +14,7 @@ sub run { mutex_lock "podman_server_ready"; mutex_unlock "podman_server_ready"; # connect to server then tell server we're done - my $ret = script_run "curl http://10.0.2.114"; + my $ret = script_run "curl http://172.16.2.114"; mutex_create "podman_connect_done"; # sleep a bit to give server time to pick up the mutex sleep 5; diff --git a/tests/_support_server.pm b/tests/_support_server.pm index ba5cd3cc..5aa38b59 100644 --- a/tests/_support_server.pm +++ b/tests/_support_server.pm @@ -82,7 +82,7 @@ sub _pxe_setup { # https://fedoraproject.org/wiki/QA:Testcase_Kickstart_File_Path_Ks_Cfg assert_script_run "curl -o ks.cfg https://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks"; # tweak the repo config in it - assert_script_run "sed -i -e 's,^url.*,nfs --server 10.0.2.110 --dir /repo --opts nfsvers=4,g' ks.cfg"; + assert_script_run "sed -i -e 's,^url.*,nfs --server 172.16.2.110 --dir /repo --opts nfsvers=4,g' ks.cfg"; # embed it assert_script_run "echo ks.cfg | cpio -c -o >> /var/lib/tftpboot/fedora/initrd.img"; # chown root @@ -96,7 +96,7 @@ sub run { my $self=shift; ## DNS / DHCP (dnsmasq) # create config - assert_script_run "printf 'domain=domain.local\ndhcp-range=10.0.2.150,10.0.2.199\ndhcp-option=option:router,10.0.2.2\n' > /etc/dnsmasq.conf"; + assert_script_run "printf 'domain=domain.local\ndhcp-range=172.16.2.150,172.16.2.199\ndhcp-option=option:router,172.16.2.2\n' > /etc/dnsmasq.conf"; # do PXE setup if this is not an update test _pxe_setup() unless (get_var("ADVISORY_OR_TASK")); # open firewall ports @@ -123,7 +123,7 @@ sub run { assert_script_run "curl -o /export/root-user-crypted-net.ks https://jskladan.fedorapeople.org/kickstarts/root-user-crypted-net.ks"; # for update tests, set up the update repository and export it if (get_var("ADVISORY_OR_TASK")) { - assert_script_run "echo '/opt/update_repo 10.0.2.0/24(ro)' >> /etc/exports"; + assert_script_run "echo '/opt/update_repo 172.16.2.0/24(ro)' >> /etc/exports"; } # for compose tests, we do all this stuff else { @@ -144,7 +144,7 @@ sub run { # recreate an iso file copy_devcdrom_as_isofile('/iso/image.iso'); # set up the exports - assert_script_run "printf '/export 10.0.2.0/24(ro)\n/repo 10.0.2.0/24(ro)\n/iso 10.0.2.0/24(ro)' > /etc/exports"; + assert_script_run "printf '/export 172.16.2.0/24(ro)\n/repo 172.16.2.0/24(ro)\n/iso 172.16.2.0/24(ro)' > /etc/exports"; } # open firewall port diff --git a/tests/_vnc_client_connect.pm b/tests/_vnc_client_connect.pm index bf2b415d..c6611162 100644 --- a/tests/_vnc_client_connect.pm +++ b/tests/_vnc_client_connect.pm @@ -7,9 +7,9 @@ use utils; sub run { my $self = shift; $self->root_console(tty=>3); - setup_tap_static('10.0.2.115', 'vnc002.domain.local'); + setup_tap_static('172.16.2.115', 'vnc002.domain.local'); # test test: check if we can see the server - assert_script_run "ping -c 2 10.0.2.114"; + assert_script_run "ping -c 2 172.16.2.114"; desktop_vt; menu_launch_type('boxes'); assert_screen ['apps_boxes_tutorial', 'boxes_new_connection']; @@ -19,7 +19,7 @@ sub run { } assert_and_click('boxes_new_connection'); assert_and_click('boxes_remote'); - type_very_safely("vnc://10.0.2.114:5901\n"); + type_very_safely("vnc://172.16.2.114:5901\n"); assert_and_click('boxes_allow_inhibit'); assert_and_click('boxes_fullscreen'); } diff --git a/tests/_vncconnect_client_setup.pm b/tests/_vncconnect_client_setup.pm index c9c8e582..c2fb5f7f 100644 --- a/tests/_vncconnect_client_setup.pm +++ b/tests/_vncconnect_client_setup.pm @@ -8,7 +8,7 @@ use utils; sub run { my $self = shift; $self->root_console(tty=>3); - setup_tap_static('10.0.2.117', 'vnc004.domain.local'); + setup_tap_static('172.16.2.117', 'vnc004.domain.local'); # install tigervnc (Boxes doesn't do reverse VNC) assert_script_run "dnf -y install tigervnc", 180; # take down the firewall diff --git a/tests/database_client.pm b/tests/database_client.pm index e83db1a7..9abc99ae 100644 --- a/tests/database_client.pm +++ b/tests/database_client.pm @@ -15,7 +15,7 @@ sub run { mutex_lock "db_ready"; mutex_unlock "db_ready"; # check we can connect to the database and create a table - assert_script_run "PGPASSWORD=correcthorse psql openqa -h 10.0.2.104 -U openqa -c 'CREATE TABLE test2 (testcol int);'"; + assert_script_run "PGPASSWORD=correcthorse psql openqa -h 172.16.2.104 -U openqa -c 'CREATE TABLE test2 (testcol int);'"; } sub test_flags { diff --git a/tests/disk_custom_iscsi.pm b/tests/disk_custom_iscsi.pm index 6481a89c..706aa2c6 100644 --- a/tests/disk_custom_iscsi.pm +++ b/tests/disk_custom_iscsi.pm @@ -7,7 +7,7 @@ sub run { my $self = shift; # iscsi config hash my %iscsi; - $iscsi{'iqn.2016-06.local.domain:support.target1'} = ['10.0.2.110', 'test', 'weakpassword']; + $iscsi{'iqn.2016-06.local.domain:support.target1'} = ['172.16.2.110', 'test', 'weakpassword']; # Anaconda hub # Go to INSTALLATION DESTINATION and ensure one regular disk # and the iscsi target are selected. diff --git a/tests/realmd_join_cockpit.pm b/tests/realmd_join_cockpit.pm index 0d557bc6..8888f622 100644 --- a/tests/realmd_join_cockpit.pm +++ b/tests/realmd_join_cockpit.pm @@ -10,7 +10,7 @@ sub run { my $self = shift; # use FreeIPA server as DNS server bypass_1691487; - assert_script_run "printf 'search domain.local\nnameserver 10.0.2.100' > /etc/resolv.conf"; + assert_script_run "printf 'search domain.local\nnameserver 172.16.2.100' > /etc/resolv.conf"; # wait for the server to be ready (do it now just to make sure name # resolution is working before we proceed) mutex_lock "freeipa_ready"; diff --git a/tests/realmd_join_sssd.pm b/tests/realmd_join_sssd.pm index 785687b1..1beb8ebd 100644 --- a/tests/realmd_join_sssd.pm +++ b/tests/realmd_join_sssd.pm @@ -10,15 +10,15 @@ sub run { my $self=shift; # use FreeIPA server or replica as DNS server my $server = 'ipa001.domain.local'; - my $server_ip = '10.0.2.100'; + my $server_ip = '172.16.2.100'; my $server_mutex = 'freeipa_ready'; if (get_var("FREEIPA_REPLICA")) { $server = 'ipa002.domain.local'; - $server_ip = '10.0.2.106'; + $server_ip = '172.16.2.106'; } if (get_var("FREEIPA_REPLICA_CLIENT")) { $server = 'ipa003.domain.local'; - $server_ip = '10.0.2.107'; + $server_ip = '172.16.2.107'; $server_mutex = 'replica_ready'; } bypass_1691487; diff --git a/tests/server_remote_logging_client.pm b/tests/server_remote_logging_client.pm index ed4832ab..d0da04c1 100644 --- a/tests/server_remote_logging_client.pm +++ b/tests/server_remote_logging_client.pm @@ -12,7 +12,7 @@ sub run { script_run "dnf -y install rsyslog", 180; script_run "systemctl enable --now rsyslog.service"; # set up forwarding - assert_script_run "printf 'action(type=\"omfwd\"\nTarget=\"10.0.2.112\" Port=\"514\" Protocol=\"udp\")' >> /etc/rsyslog.conf"; + assert_script_run "printf 'action(type=\"omfwd\"\nTarget=\"172.16.2.112\" Port=\"514\" Protocol=\"udp\")' >> /etc/rsyslog.conf"; # for debugging upload_logs "/etc/rsyslog.conf"; # wait for server to be ready, then restart rsyslog