xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-09-04 20:17:55 +00:00
Code Issues Releases Wiki Activity

test(debian): nothing connects the subiquity helpers to mkinstall

Browse Source 
subiquity_nfsroot_server and subiquity_kcmdline each have tests, but reverting
the call site in mkinstall -- putting xCAT::NetworkUtils->getipaddr back in
place of subiquity_nfsroot_server, which is precisely the regression the fix
removes -- leaves the whole unit suite green. A helper can be perfectly covered
while nothing links it to production, and that is the shape the review found.

mkinstall needs a management node, so this drives the composition it performs:
resolve the install server, then build the command line, or explain why not.
It fails at the extraction guard until that composition is a routine that can
be called, so the behavioural proof is the mutation on top of the fix, not this
red alone.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
This commit is contained in:
Daniel Hilst
2026-09-01 21:05:20 -03:00
parent 1cebb4d9e8
commit da0bfdbd22
1 changed files with 82 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-test/unit/debian_subiquity_boot_params.t
+82
View File
@@ -0,0 +1,82 @@
#!/usr/bin/env perl
use strict;
use warnings;
use File::Spec;
use FindBin;
use Test::More;
# Regression: the helpers were covered and the call site was not.
#
# subiquity_nfsroot_server and subiquity_kcmdline each had tests, but reverting the CALL SITE in
# mkinstall -- putting `xCAT::NetworkUtils->getipaddr($instserver)` back in place of
# subiquity_nfsroot_server, i.e. the exact regression the fix removes -- left the whole unit
# suite green. A helper can be perfectly covered while nothing connects it to production.
#
# mkinstall needs a management node, so the composition it performs (resolve the install server,
# then build the command line, or explain why not) lives in subiquity_boot_params, which takes
# its inputs and returns an answer. The caller keeps report_node_error and the loop's `next`.
my $repo_root = File::Spec->rel2abs(
File::Spec->catdir( $FindBin::Bin, '..', '..' )
);
my $plugin = File::Spec->catfile(
$repo_root, 'xCAT-server', 'lib', 'xcat', 'plugins', 'debian.pm'
);
plan skip_all => "debian.pm not found" unless -f $plugin;
my $src = do { local $/; open my $fh, '<', $plugin or die $!; <$fh> };
# BAIL_OUT rather than skip, so a rename fails loudly instead of silently covering nothing.
my $body = '';
for my $name (qw(subiquity_nfsroot_server subiquity_kcmdline subiquity_boot_params)) {
my ($sub) = $src =~ /\n(sub \Q$name\E \{.*?\n\})\n/s;
BAIL_OUT("could not extract $name from debian.pm") unless defined $sub;
$body .= "$sub\n";
}
{
package T;
eval "$body; 1" or main::BAIL_OUT("could not eval the subiquity helpers: $@");
}
my $resolver = sub { $_[0] eq 'mn.cluster' ? '10.0.0.1' : undef };
# The regression this exists to catch: an unset noderes.xcatmaster gives '!myipfn!', and the
# boot config must still be produced with the placeholder intact, because pxe.pm and grub2.pm
# substitute it with an address when they write the config.
{
my ($kcmdline, $err) = T::subiquity_boot_params(
'nofb utf8 auto xcatd=!myipfn!', '!myipfn!',
'/install/ubuntu24.04/x86_64', '80', 'cn1', $resolver );
ok( !defined $err, 'a node with no xcatmaster still gets a boot config' )
or diag("error was: $err");
like( $kcmdline, qr/nfsroot=!myipfn!:/,
'and nfsroot keeps the placeholder for pxe.pm/grub2.pm to substitute' );
like( $kcmdline, qr/boot=casper/, 'the casper boot flag survives the composition' );
}
# A resolvable name still becomes an address, because klibc's nfsmount has no resolver.
{
my ($kcmdline, $err) = T::subiquity_boot_params(
'nofb utf8 auto xcatd=mn.cluster', 'mn.cluster',
'/install/ubuntu24.04/x86_64', '80', 'cn1', $resolver );
ok( !defined $err, 'a resolvable install server produces a boot config' );
like( $kcmdline, qr{nfsroot=10\.0\.0\.1:/install/ubuntu24\.04/x86_64},
'and nfsroot carries the address, not the name' );
like( $kcmdline, qr{ds=nocloud-net;s=http://mn\.cluster:80/},
'while the cloud-init seed URL keeps the name, where DNS works' );
}
# The guard the original commit added must survive: a name that does not resolve is an error,
# not a command line with a name in nfsroot.
{
my ($kcmdline, $err) = T::subiquity_boot_params(
'nofb utf8 auto xcatd=nosuchhost', 'nosuchhost',
'/install/ubuntu24.04/x86_64', '80', 'cn1', $resolver );
ok( !defined $kcmdline, 'an unresolvable install server yields no boot config' );
like( $err, qr/nosuchhost/, 'and the error names the server that failed' );
like( $err, qr/klibc|nfsmount|address/i, 'and says why it matters' );
}
done_testing();