xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-03 03:50:08 +00:00
Code Issues Releases Wiki Activity

enhance netname/net/mask duplicate or invalid

Browse Source
This commit is contained in:
bybai 2017-08-11 02:42:12 -04:00
parent e1a230e10c
commit 7afbaaded1
2 changed files with 101 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1693,7 +1693,6 @@ sub defmk
{
my $type = $::FINALATTRS{$obj}{objtype};
# check to make sure we have type
if (!$type)
{
@ -1714,10 +1713,30 @@ sub defmk
my @nets = xCAT::DBobjUtils->getObjectsOfType('network');
my %objhash;
foreach my $n (@nets) {
# netname is duplicate
if ( $obj eq $n ) {
my $rsp;
$rsp->{data}->[0] = "A network definition called \'$n\' already exists. Cannot create a definition for \'$obj\'.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
$error = 1;
delete $::FINALATTRS{$obj};
next OBJ;
}
$objhash{$n} = $type;
}
# When adding a new network entry, net and mask cannot be empty
if (!($::FINALATTRS{$obj}{net} && $::FINALATTRS{$obj}{mask}))
{
my $rsp;
$rsp->{data}->[0] = "Net or mask value should not be empty for xCAT network object \'$obj\'.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
$error = 1;
delete $::FINALATTRS{$obj};
next OBJ;
}
my %nethash = xCAT::DBobjUtils->getobjdefs(\%objhash);
foreach my $o (keys %nethash) {
# there is a network entry contains the same net and mask
if (($nethash{$o}{net} eq $::FINALATTRS{$obj}{net}) && ($nethash{$o}{mask} eq $::FINALATTRS{$obj}{mask})) {
my $rsp;
$rsp->{data}->[0] = "A network definition called \'$o\' already exists that contains the same net and mask values. Cannot create a definition for \'$obj\'.";
@ -1727,6 +1746,7 @@ sub defmk
next OBJ;
}
}
}
# if object already exists
@ -2370,6 +2390,74 @@ sub defch
$isDefined = 1;
}
if ($type eq 'network')
{
my $isInvalid = 0;
# When adding a new network entry, net and mask cannot be empty
if (!$isDefined && !($::FINALATTRS{$obj}{'net'} && $::FINALATTRS{$obj}{'mask'}))
{
my $rsp;
$rsp->{data}->[0] = "Net or mask value should not be empty for xCAT network object \'$obj\'.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
$error = 1;
$isInvalid = 1;
delete($::FINALATTRS{$obj});
next;
}
my @nets = xCAT::DBobjUtils->getObjectsOfType('network');
my %objhash;
foreach my $n (@nets) {
$objhash{$n} = $type;
}
# get original networks data
my %nethash = xCAT::DBobjUtils->getobjdefs(\%objhash);
foreach my $o (keys %nethash) {
# the netname already exists
if ($isDefined)
{
# when net is empty, chdef command should add net value, $::FINALATTRS{$obj}{net} should have value
if ((!$nethash{$o}{net}) && (!$::FINALATTRS{$obj}{net}))
{
$isInvalid=1;
my $rsp;
$rsp->{data}->[0] = "Attribute \'net\' is not specified for network entry \'$obj\', skipping.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
$error = 1;
last;
}
# when mask is empty, chdef command should add mask value, $::FINALATTRS{$obj}{mask} should have value
if ((!$nethash{$o}{mask}) && (!$::FINALATTRS{$obj}{mask}))
{
$isInvalid=1;
my $rsp;
$rsp->{data}->[0] = "Attribute \'mask\' is not specified for network entry \'$obj\', skipping.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
$error = 1;
last;
}
}
# the netname does not exist
else {
# there is a network definition already contains the same net and mask, it is duplicate
if (($nethash{$o}{net} eq $::FINALATTRS{$obj}{net}) && ($nethash{$o}{mask} eq $::FINALATTRS{$obj}{mask}))
{
$isInvalid=1;
my $rsp;
$rsp->{data}->[0] = "A network definition called \'$o\' already exists that contains the same net and mask values. Cannot create a definition for \'$obj\'.";
xCAT::MsgUtils->message("E", $rsp, $::callback);
$error = 1;
last;
}
}
}
if($isInvalid)
{
delete($::FINALATTRS{$obj});
next;
}
}
if (!$isDefined && ($type eq 'node') && (!defined($::FINALATTRS{$obj}{'groups'}) || !$::FINALATTRS{$obj}{'groups'}))
{
my $rsp;

15
xCAT-server/lib/xcat/plugins/networks.pm
View File

@ -325,7 +325,6 @@ sub donets
# - compare net and mask values
my $foundmatch = 0;
foreach my $netn (@netlist) {
# split definition mask
my ($dm1, $dm2, $dm3, $dm4) = split('\.', $nethash{$netn}{'mask'});
@ -359,7 +358,7 @@ sub donets
if ($foundmatch) {
next;
}
# add new network def
$nettab->setAttribs({ 'net' => $net, 'mask' => $netmask }, { 'netname' => $netname, 'gateway' => $gateway, 'mgtifname' => $i });
}
@ -450,6 +449,7 @@ sub donets
{ #should be the lines to think about, do something with U, and something else with UG
my $foundmatch = 0;
my $netnamematch = 0;
my $rsp;
my $net;
my $mask;
@ -504,7 +504,12 @@ sub donets
my ($n1, $n2, $n3, $n4) = split('\.', $net);
foreach my $netn (@netlist) {
# check if this netname is already defined
if ( $netname eq $netn ) {
$netnamematch = 1;
$callback->({ warning => "The network entry \'$netname\' already exists in xCAT networks table. Cannot create a definition for \'$netname\'" });
last;
}
# split definition mask
my ($dm1, $dm2, $dm3, $dm4) = split('\.', $nethash{$netn}{'mask'});
@ -519,6 +524,10 @@ sub donets
}
}
# if this net entry exists, go to next line in networks table
if ($netnamematch) {
last;
}
# get mtu value
my $mtu;
my @rowm;