2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-06-24 16:30:47 +00:00

Merge pull request #7521 from VersatusHPC/fix/rspconfig-same-ip-verification

Fix/rspconfig same ip verification
This commit is contained in:
Markus Hilger
2026-04-26 20:18:50 +02:00
committed by GitHub
+9 -10
View File
@@ -3839,17 +3839,16 @@ sub rspconfig_response {
$nic =~ s/(.*\/)//g;
$status_info{RSPCONFIG_DHCPDIS_REQUEST}{init_url} =~ s/#NIC#/$nic/g
}
} else {
if (($content{Address} eq $check_ip) and
($content{PrefixLength} eq $check_netmask) and
($content{Gateway} eq $check_gateway)) {
if ($check_vlan) {
if (defined($response_info->{data}->{$path}->{Id}) and $response_info->{data}->{$path}->{Id} eq $check_vlan) {
$check_result = 1;
}
} else {
$check_result = 1;
}
if (($content{Address} eq $check_ip) and
($content{PrefixLength} eq $check_netmask) and
($content{Gateway} eq $check_gateway)) {
if ($check_vlan) {
if (defined($response_info->{data}->{$path}->{Id}) and $response_info->{data}->{$path}->{Id} eq $check_vlan) {
$check_result = 1;
}
} else {
$check_result = 1;
}
}
}