xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-07-31 10:09:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7606 from VersatusHPC/refactor/dbobjutils-only-if-matcher

Browse Source 
refactor(dbobjutils): reuse only-if matcher for table routing
This commit is contained in:
Daniel Hilst
2026-07-24 12:24:19 -03:00
committed by GitHub
parent 1424188693 8a4fe18cbf
commit 4652a023c1
2 changed files with 98 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
perl-xCAT/xCAT/DBobjUtils.pm
+6 -11
View File
@@ -1090,17 +1090,12 @@ sub setobjdefs
next;
}
my $grp_matches_check_value = 0;
foreach my $tmpgrp (@tmplgrplist) {
if ($DBgroupsattr{$tmpgrp}{$check_attr} && $DBgroupsattr{$tmpgrp}{$check_attr} =~ /\b$check_value\b/) {
$grp_matches_check_value = 1;
last;
}
}
my $obj_val = $objhash{$objname}{$check_attr} || '';
my $db_val = $DBattrvals{$objname}{$check_attr} || '';
if (!($obj_val =~ /\b$check_value\b/) && !($db_val =~ /\b$check_value\b/) && !$grp_matches_check_value) {
if (!_only_if_value_matches(
$objhash{$objname},
$DBattrvals{$objname},
\%DBgroupsattr,
$check_attr,
$check_value)) {
if ($invalidattr->{$attr_name}->{valid} != 1) {
$invalidattr->{$attr_name}->{valid} = 0;
$invalidattr->{$attr_name}->{condition}=$check_attr;
xCAT-test/unit/dbobjutils_only_if.t
+92
View File
@@ -49,4 +49,96 @@ my %groupattrs = (openbmcgrp => { mgt => 'openbmc' });
@failures = xCAT::DBobjUtils->validate_only_if_attrs('node01', 'node', \%group_openbmc, {}, \%groupattrs);
is(scalar @failures, 0, 'group mgt=openbmc satisfies bmc only_if validation');
{
package DBobjUtilsOnlyIf::TableRecorder;
sub setAttribs {
my ($self, $keys, $updates) = @_;
push @{ $self->{writes} }, {
table => $self->{table},
keys => { %$keys },
updates => { %$updates },
};
return (1, undef);
}
sub commit { return 1; }
}
sub check_literal_only_if_routing {
my ($source) = @_;
my @writes;
local $xCAT::Schema::defspec{routing_fixture} = {
objkey => 'name',
attrhash => {},
attrs => [
{
attr_name => 'groups',
tabentry => 'route_source.groups',
access_tabentry => 'route_source.node=attr:name',
},
{
attr_name => 'selector',
tabentry => 'route_source.selector',
access_tabentry => 'route_source.node=attr:name',
},
{
attr_name => 'payload',
only_if => 'selector=a.b',
tabentry => 'route_wrong.payload',
access_tabentry => 'route_wrong.node=attr:name',
},
{
attr_name => 'payload',
only_if => 'selector=axb',
tabentry => 'route_expected.payload',
access_tabentry => 'route_expected.node=attr:name',
},
],
};
no warnings 'redefine';
local *xCAT::DBobjUtils::getobjdefs = sub {
my ($class, $objects) = @_;
return (node01 => { selector => 'axb' })
if $source eq 'database' && exists $objects->{node01};
return (literalgroup => { selector => 'axb' })
if $source eq 'group' && exists $objects->{literalgroup};
return ();
};
local *xCAT::Table::getTableSchema = sub {
return { keys => ['node'] };
};
local *xCAT::Table::new = sub {
my ($class, $table) = @_;
return bless {
table => $table,
writes => \@writes,
}, 'DBobjUtilsOnlyIf::TableRecorder';
};
my %attrs = (
objtype => 'routing_fixture',
payload => 'stored',
);
$attrs{selector} = 'axb' if $source eq 'explicit';
$attrs{groups} = 'literalgroup' if $source eq 'group';
my %objects = (node01 => \%attrs);
my $rc = xCAT::DBobjUtils->setobjdefs(\%objects);
is($rc, 0, "$source source passes only_if validation");
my @payload_tables = sort map { $_->{table} }
grep { exists $_->{updates}{payload} } @writes;
is_deeply(
\@payload_tables,
['route_expected'],
"$source source routes through only the literal-matching only_if entry",
);
}
check_literal_only_if_routing($_) for qw(explicit database group);
done_testing();