Skip to content

Commit ad5e77a

Browse files
guoxuguangalice-suse
authored andcommitted
Enable the listen-on option in named.conf on SLES15SP6+
https://progress.opensuse.org/issues/177354
1 parent 615f401 commit ad5e77a

3 files changed

Lines changed: 18 additions & 9 deletions

File tree

tests/virt_autotest/libvirt_isolated_virtual_network.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ sub run_test {
2727
virt_autotest::virtual_network_utils::download_network_cfg($vnet_isolated_cfg_name);
2828

2929
#Stop named.service, refer to poo#175287
30-
systemctl("stop named.service") if (is_sle('15+'));
30+
systemctl("stop named.service") if (is_sle('>=15-SP6') && check_var('VIRT_AUTOTEST', 1));
3131
#Create ISOLATED NETWORK
3232
assert_script_run("virsh net-create vnet_isolated.xml");
3333
save_screenshot;
3434
upload_logs "vnet_isolated.xml";
3535
assert_script_run("rm -rf vnet_isolated.xml");
3636
#Resume named.service, refer to poo#175287
37-
systemctl("start named.service") if (is_sle('15+'));
37+
systemctl("start named.service") if (is_sle('>=15-SP6') && check_var('VIRT_AUTOTEST', 1));
3838

3939
my ($mac, $model, $affecter, $exclusive, $skip_type);
4040
my $gate = '192.168.127.1'; # This host exists but should not work as a gate in the ISOLATED NETWORK

tests/virt_autotest/libvirt_nated_virtual_network.pm

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,23 @@ sub run_test {
3131
die "The default(NAT BASED NETWORK) virtual network does not exist" if (script_run('virsh net-list --all | grep default') != 0 && !is_alp);
3232

3333
#Stop named.service, refer to poo#175287
34-
systemctl("stop named.service") if (is_sle('15+'));
34+
systemctl("stop named.service") if (is_sle('>=15-SP6') && check_var('VIRT_AUTOTEST', 1));
3535
#Create NAT BASED NETWORK
3636
assert_script_run("virsh net-create vnet_nated.xml");
3737
save_screenshot;
3838
upload_logs "vnet_nated.xml";
3939
assert_script_run("rm -rf vnet_nated.xml");
40-
#Resume named.service, refer to poo#175287
41-
systemctl("start named.service") if (is_sle('15+'));
40+
if (is_sle('>=15-SP6') && check_var('VIRT_AUTOTEST', 1)) {
41+
#Resume named.service, refer to poo#175287
42+
systemctl("start named.service");
43+
#Enable the listen-on option in named.conf
44+
#For more details, refer to poo#177354
45+
if (get_required_var('TEST_SUITE_NAME') =~ m/(uefi|sev)/i) {
46+
my $named_conf_file = "/etc/named.conf";
47+
assert_script_run("sed -i 's/#listen-on/listen-on/' $named_conf_file");
48+
systemctl("restart named.service");
49+
}
50+
}
4251

4352
my ($mac, $model, $affecter, $exclusive, $skip_type);
4453
my $gate = '192.168.128.1';

tests/virt_autotest/libvirt_routed_virtual_network.pm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ sub run_test {
2929
my $vnet_routed_clone_cfg_name = "vnet_routed_clone.xml";
3030
virt_autotest::virtual_network_utils::download_network_cfg($vnet_routed_clone_cfg_name);
3131

32-
#Stop named.service ,refer to poo#175287
33-
systemctl("stop named.service") if (is_sle('15+'));
32+
#Stop named.service, refer to poo#175287
33+
systemctl("stop named.service") if (is_sle('>=15-SP6') && check_var('VIRT_AUTOTEST', 1));
3434
#Create ROUTED NETWORK
3535
assert_script_run("virsh net-create vnet_routed.xml");
3636
assert_script_run("virsh net-create vnet_routed_clone.xml");
3737
save_screenshot;
3838
upload_logs "vnet_routed.xml";
3939
upload_logs "vnet_routed_clone.xml";
4040
assert_script_run("rm -rf vnet_routed.xml vnet_routed_clone.xml");
41-
#Resume named.service ,refer to poo#175287
42-
systemctl("start named.service") if (is_sle('15+'));
41+
#Resume named.service, refer to poo#175287
42+
systemctl("start named.service") if (is_sle('>=15-SP6') && check_var('VIRT_AUTOTEST', 1));
4343

4444
my ($mac1, $mac2, $model1, $model2, $affecter, $exclusive);
4545
my $target1 = '192.168.130.1';

0 commit comments

Comments
 (0)