xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-14 02:10:23 +00:00
Code Issues Releases Wiki Activity

enhance invalid node name error msg (#4931)

Browse Source
This commit is contained in:
Yuan Bai
2018-03-14 13:49:08 +08:00
committed by yangsong
parent c61a253a45
commit c0314a36b6
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
View File

@ -1554,6 +1554,7 @@ sub defmk
} else {
my $invalidobjname = ();
my $invalidnodename = ();
my $nodewithdomain = ();
foreach my $node (@::allobjnames) {
my $myobjtype=$::opt_t;
if(!$myobjtype and $::FILEATTRS{$node}{'objtype'}){
@ -1563,10 +1564,22 @@ sub defmk
unless(isobjnamevalid($node,$myobjtype)){
$invalidobjname .= ",$node";
}
if (($node =~ /[A-Z]/) && (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node"))) {
$invalidnodename .= ",$node";
if (((!$::opt_t) && (!$::FILEATTRS{$node}{'objtype'})) || ($::FILEATTRS{$node}{'objtype'} eq "node") || ($::opt_t eq "node")) {
if($node =~ /[A-Z]/){
$invalidnodename .= ",$node";
}elsif($node =~ /\./){
$nodewithdomain .= ",$node";
}
}
}
if ($nodewithdomain) {
$nodewithdomain =~ s/,//;
my $rsp;
$rsp->{data}->[0] = "The object name \'$nodewithdomain\' is invalid, Cannot use '.' in node name.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
$error = 1;
return 1;
}
if ($invalidobjname) {
$invalidobjname =~ s/,//;
my $rsp;