diff --git a/xCAT-test/integration/dhcp_kea_config_validation.t b/xCAT-test/integration/dhcp_kea_config_validation.t index 86596f026..7e011c2ed 100644 --- a/xCAT-test/integration/dhcp_kea_config_validation.t +++ b/xCAT-test/integration/dhcp_kea_config_validation.t @@ -46,7 +46,7 @@ my $json = $backend->render_dhcp4_config( test => 'option[93].hex == 0x001f', additional_only => JSON::true, 'option-data' => [ - { name => 'conf-file', data => 'pxelinux.cfg/s390x/192.168.122.0_24' }, + { name => 'conf-file', data => 's390x/192.168.122.0_24' }, ], }, { diff --git a/xCAT-test/unit/dhcp_boot_policy.t b/xCAT-test/unit/dhcp_boot_policy.t index 2e6974708..6430caad2 100644 --- a/xCAT-test/unit/dhcp_boot_policy.t +++ b/xCAT-test/unit/dhcp_boot_policy.t @@ -231,7 +231,7 @@ is_deeply( 'option-data' => [ { name => 'conf-file', - data => 'pxelinux.cfg/s390x/10.0.0.0_24', + data => 's390x/10.0.0.0_24', 'always-send' => 1, }, ], diff --git a/xCAT-test/unit/dhcp_isc_client_arch.t b/xCAT-test/unit/dhcp_isc_client_arch.t index 4757f56df..556267992 100644 --- a/xCAT-test/unit/dhcp_isc_client_arch.t +++ b/xCAT-test/unit/dhcp_isc_client_arch.t @@ -38,7 +38,7 @@ like( ); like( $rendered, - qr/client-architecture = 00:1f \{ #QEMU s390x\n\s+option conf-file = "pxelinux\.cfg\/s390x\/192\.0\.2\.0_24";/, + qr/client-architecture = 00:1f \{ #QEMU s390x\n\s+option conf-file = "s390x\/192\.0\.2\.0_24";/, 'QEMU s390x receives its network configuration', ); diff --git a/xCAT-test/unit/dhcp_kea_plugin_intent.t b/xCAT-test/unit/dhcp_kea_plugin_intent.t index a3c97628a..95c4dbe35 100644 --- a/xCAT-test/unit/dhcp_kea_plugin_intent.t +++ b/xCAT-test/unit/dhcp_kea_plugin_intent.t @@ -133,8 +133,8 @@ my %network_entry = ( ok($classes{'xcat-s390x-qemu-10.0.0.0_24'}, 'the Kea subnet includes QEMU s390x boot policy'); is( $classes{'xcat-s390x-qemu-10.0.0.0_24'}{'option-data'}[0]{data}, - 'pxelinux.cfg/s390x/10.0.0.0_24', - 'the Kea subnet sends the complete s390x configuration path', + 's390x/10.0.0.0_24', + 'the Kea subnet sends the s390x configuration name', ); is_deeply( [ grep { /^xcat-s390x-/ } @{ $subnet->{additional_client_classes} } ],