diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index 9f7c4c051..92e0cd1bd 100755
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -195,7 +195,7 @@ sub parse_attr_for_osimage{
         if (!exists($attr_hash->{osvers})) {
             $tmp_osvers = xCAT::Utils->osver("all");
             $tmp_osvers =~ s/,//;
-            $attr_hash->{osvers} = $tmp_osvers; 
+            $attr_hash->{osvers} = $tmp_osvers;
         } else {
             $tmp_osvers =$attr_hash->{osvers};
         }
@@ -208,17 +208,17 @@ sub parse_attr_for_osimage{
         } else {
             $tmp_arch = $attr_hash->{osarch};
         }
-         
+
         #for ubuntu,the the arch attribute "ppc64le" should be modified to "ppc64el"
         if(($tmp_osvers =~ /^ubuntu/i) && ($tmp_arch =~ /^ppc64le/i)){
             $tmp_arch="ppc64el";
-            $attr_hash->{osarch} = "ppc64el"; 
-        } 
-        
+            $attr_hash->{osarch} = "ppc64el";
+        }
+
         $tmp_osname = $tmp_osvers;
         $tmp_ostype="Linux";  #like Linux, Windows
         $tmp_imagetype="linux";
-        my $prov_dir = ($tmp_provmethod eq "install") ? "install" : "netboot"; 
+        my $prov_dir = ($tmp_provmethod eq "install") ? "install" : "netboot";
         if (($tmp_osvers =~ /^win/) || ($tmp_osvers =~ /^imagex/)) {
             $tmp_osname="windows";
             $tmp_ostype="Windows";
@@ -243,7 +243,7 @@ sub parse_attr_for_osimage{
         $tmp_genos =~ s/\..*//;
         if ($tmp_genos =~ /rh.*s(\d*)/) {
             $tmp_genos = "rhel$1";
-        }             
+        }
         if (exists($attr_hash->{imagetype}) && ($attr_hash->{imagetype} !~ /^$tmp_imagetype/i)) {
             my $rsp;
             $rsp->{data}->[0] = "The input imagetype:$attr_hash->{imagetype} not match $tmp_imagetype.";
@@ -259,7 +259,7 @@ sub parse_attr_for_osimage{
             return -1;
         } elsif (!exists($attr_hash->{osname})) {
             $attr_hash->{osname} = $tmp_ostype;
-        } 
+        }
         #if (!exists($attr_hash->{osdistroname})) {
             $attr_hash->{osdistroname} = "$tmp_osvers-$tmp_arch";
         #}
@@ -300,7 +300,7 @@ sub parse_attr_for_osimage{
                 my $tmp_tmplfile = xCAT::SvrUtils->get_tmpl_file_name($cuspath, $tmp_profile, $tmp_osvers, $tmp_arch, $tmp_genos);
                 if (!$tmp_tmplfile) {
                     $tmp_tmplfile = xCAT::SvrUtils->get_tmpl_file_name($defpath, $tmp_profile, $tmp_osvers, $tmp_arch, $tmp_genos);
-                } 
+                }
                 if ($tmp_tmplfile) {
                     $attr_hash->{template} = $tmp_tmplfile;
                 }
@@ -399,16 +399,16 @@ sub processArgs
         }
     }
     if ( defined ($::args) && @{$::args} ) {
-      if ( scalar(@{$::args}) eq 1 and $::args->[0] eq '-S')
-      {
-        if ($::command eq "lsdef") {
-            push @ARGV, "-t";
-            push @ARGV, "node";
-            push @ARGV, "-s";
-        } else {
-            return 2;
+        if ( scalar(@{$::args}) eq 1 and $::args->[0] eq '-S')
+        {
+            if ($::command eq "lsdef") {
+                push @ARGV, "-t";
+                push @ARGV, "node";
+                push @ARGV, "-s";
+            } else {
+                return 2;
+            }
         }
-      }
     }
 
     if ($::command eq "lsdef") {
@@ -427,8 +427,8 @@ sub processArgs
     if (scalar(@ARGV) <= 0) {
         return 2;
     }
-   
-    # clean up all the global variables for each options 
+
+    # clean up all the global variables for each options
     # so def command can be called multiple times in one process
     undef $::opt_a;
     undef $::opt_c;
@@ -488,7 +488,6 @@ sub processArgs
         )
       )
     {
-
         my $rsp;
         $rsp->{data}->[0] = "Invalid option..";
         xCAT::MsgUtils->message("E", $rsp, $::callback);
@@ -627,10 +626,10 @@ sub processArgs
             # can not have spaces in the noderange
             if ($noderangespace)
             {
-               my $rsp;
-               $rsp->{data}->[0] = "noderange can not contain spaces.";
-               xCAT::MsgUtils->message("E", $rsp, $::callback);
-               return 2;
+                my $rsp;
+                $rsp->{data}->[0] = "noderange can not contain spaces.";
+                xCAT::MsgUtils->message("E", $rsp, $::callback);
+                return 2;
             }
             $noderangespace++;
             # the first arg could be a noderange or a list of args
@@ -716,8 +715,8 @@ sub processArgs
     # use -o instead
     if ($::command eq 'rmdef')
     {
-        if (defined($::opt_d) || defined($::opt_i) || defined($::opt_l) 
-           || defined($::opt_m) || defined($::opt_p) || defined($::opt_w) 
+        if (defined($::opt_d) || defined($::opt_i) || defined($::opt_l)
+           || defined($::opt_m) || defined($::opt_p) || defined($::opt_w)
            || defined($::opt_x) || defined($::opt_z) || defined($::opt_s))
         {
             my $rsp;
@@ -866,7 +865,7 @@ sub processArgs
                 my $schema = xCAT::Table->getTableSchema('site');
                 my $desc;
 
-                $rsp->{data}->[0] = "\nThere can only be one xCAT site definition. This definition consists \nof an unlimited list of user-defined attributes and values that represent \nglobal settings for the whole cluster. The following is a list \nof the attributes currently supported by xCAT."; 
+                $rsp->{data}->[0] = "\nThere can only be one xCAT site definition. This definition consists \nof an unlimited list of user-defined attributes and values that represent \nglobal settings for the whole cluster. The following is a list \nof the attributes currently supported by xCAT.";
 
                 $desc = $schema->{descriptions}->{'key'};
                 $rsp->{data}->[1] = $desc;
@@ -918,8 +917,8 @@ sub processArgs
                     }
                 }
                 my $desc = $this_attr->{description};
-                if (!defined($desc)) {     
-                    # description key not there, so go to the corresponding 
+                if (!defined($desc)) {
+                    # description key not there, so go to the corresponding
                     #    entry in tabspec to get the description
                     my ($tab, $at) = split(/\./, $this_attr->{tabentry});
                     my $schema = xCAT::Table->getTableSchema($tab);
@@ -949,7 +948,7 @@ sub processArgs
             if ($t eq 'monitoring') {
                 $rsp->{data}->[3] = "\nYou can also include additional monitoring plug-in specific settings. These settings will be used by the monitoring plug-in to customize the behavior such as event filter, sample interval, responses etc.";
             }
-            
+
             xCAT::MsgUtils->message("I", $rsp, $::callback);
         }
 
@@ -1135,7 +1134,6 @@ sub processArgs
     @::allobjnames = @::clobjnames;
     if (scalar(@::fileobjnames) > 0)
     {
-
         # add list from stanza or xml file
         push @::allobjnames, @::fileobjnames;
     }
@@ -1175,7 +1173,7 @@ sub processArgs
                     xCAT::MsgUtils->message("E", $rsp, $::callback);
                     return 1;
                 }
-             }
+            }
         }
     }
 
@@ -1199,7 +1197,7 @@ sub processArgs
         {
             if($::AttrList[$i] =~ /^(nic\w+)\.(.*)$/)
             {
-                $::AttrList[$i] = $1; 
+                $::AttrList[$i] = $1;
                 push @{$::NicsAttrHash{$::AttrList[$i]}}, $2;
             }
         }
@@ -1444,9 +1442,9 @@ sub defmk
 
         # we don't want to overwrite any existing table row.  This could
         #    happen if there are multiple table keys. (ex. networks table -
-        #        where the object name is not either of the table keys - net 
+        #        where the object name is not either of the table keys - net
         #        & mask)
-        #  just handle network objects for now - 
+        #  just handle network objects for now -
         if ($type eq 'network') {
             my @nets = xCAT::DBobjUtils->getObjectsOfType('network');
             my %objhash;
@@ -1462,7 +1460,7 @@ sub defmk
                     $error = 1;
                     delete $::FINALATTRS{$obj};
                     next OBJ;
-                }    
+                }
             }
         }
 
@@ -1514,7 +1512,7 @@ sub defmk
             {
                 if ($::opt_d)
                 {
-                    # For dynamic node group, 
+                    # For dynamic node group,
                     # can not assign attributes for inherit
                     # only the 'objtype' in %::FINALATTRS
                     if (scalar(keys %{$::FINALATTRS{$obj}}) > 1)
@@ -1525,7 +1523,7 @@ sub defmk
                         $error = 1;
                         delete($::FINALATTRS{$obj});
                         next;
-                    } 
+                    }
                     $::FINALATTRS{$obj}{grouptype} = 'dynamic';
                     $::FINALATTRS{$obj}{members}   = 'dynamic';
                 }
@@ -1718,8 +1716,8 @@ sub defmk
             if ($rc) {
                 $error = $rc;
                 next;
-            } 
-        } 
+            }
+        }
 
     } # end of each obj
 
@@ -1881,14 +1879,14 @@ sub defch
                 xCAT::MsgUtils->message("E", $rsp, $::callback);
                 return 1;
             }
-            
+
             my $index = 0;
             my @taben = @{$chnamehash{$tb}};
-            # In the @taben, there are several pair of value for 
+            # In the @taben, there are several pair of value for
             # changing the key value of a table entry
             my @keystrs = ();
             while ($taben[$index]) {
-                # Make a key word string to avoid that changing 
+                # Make a key word string to avoid that changing
                 # one table record multiple times
                 my $keystr;
                 foreach my $key (sort(keys %{$taben[$index]})) {
@@ -1909,7 +1907,7 @@ sub defch
         my $rsp;
         push @{$rsp->{data}}, "Changed the object name from $::clobjnames[0] to $::opt_n.";
         xCAT::MsgUtils->message("I", $rsp, $::callback);
-        
+
         return 0;
     }
 
@@ -1945,7 +1943,7 @@ sub defch
         &defch_usage;
         return 1;
     }
-    
+
     if ($::opt_t eq "osimage" && $::opt_setattr && ($::opt_p || $::opt_m)) {
         my $rsp;
         $rsp->{data}->[0] = "Cannot use \'-u\' with \'-p\' or \'-m\'.";
@@ -2127,18 +2125,18 @@ sub defch
             my %objhash;
             if ($::opt_d)
             {
-               # For dynamic node group,
-               # can not assign attributes for inherit
-               # only the 'objtype' in %::FINALATTRS
-               if (scalar(keys %{$::FINALATTRS{$obj}}) > 1)
-               {
-                   my $rsp;
-                   $rsp->{data}->[0] = "Can not assign attributes to dynamic node group \'$obj\'.";
-                   xCAT::MsgUtils->message("E", $rsp, $::callback);
-                   $error = 1;
-                   delete($::FINALATTRS{$obj});
-                   next;
-               }
+                # For dynamic node group,
+                # can not assign attributes for inherit
+                # only the 'objtype' in %::FINALATTRS
+                if (scalar(keys %{$::FINALATTRS{$obj}}) > 1)
+                {
+                    my $rsp;
+                    $rsp->{data}->[0] = "Can not assign attributes to dynamic node group \'$obj\'.";
+                    xCAT::MsgUtils->message("E", $rsp, $::callback);
+                    $error = 1;
+                    delete($::FINALATTRS{$obj});
+                    next;
+                }
             }
             if ($isDefined)
             {
@@ -2159,11 +2157,11 @@ sub defch
                 if (($grptype eq "dynamic") && (scalar(keys %{$::FINALATTRS{$obj}}) > 1))
                 {
                     my $rsp;
-                   $rsp->{data}->[0] = "Can not assign attributes to dynamic node group \'$obj\'.";
-                   xCAT::MsgUtils->message("E", $rsp, $::callback);
-                   $error = 1; 
-                   delete($::FINALATTRS{$obj});
-                   next;
+                    $rsp->{data}->[0] = "Can not assign attributes to dynamic node group \'$obj\'.";
+                    xCAT::MsgUtils->message("E", $rsp, $::callback);
+                    $error = 1;
+                    delete($::FINALATTRS{$obj});
+                    next;
                 }
                 # for now all groups are static
                 #$grptype = 'static';
@@ -2244,10 +2242,10 @@ sub defch
                     my $rc = xCAT::Utils->parse_selection_string(\@wherevals, \%::WhereHash);
                     if ($rc != 0)
                     {
-                         my $rsp;
-                         $rsp->{data}->[0] = "Incorrect selection string";
-                         xCAT::MsgUtils->message("E", $rsp, $::callback);
-                         return 3;
+                        my $rsp;
+                        $rsp->{data}->[0] = "Incorrect selection string";
+                        xCAT::MsgUtils->message("E", $rsp, $::callback);
+                        return 3;
                     }
 
                     # get the attrs for these nodes
@@ -2501,7 +2499,7 @@ sub defch
         #        xCAT::MsgUtils->message("E", $rsp, $::callback);
         $error = 1;
     }
-    
+
     if ($error)
     {
         my $rsp;
@@ -2530,7 +2528,7 @@ sub defch
                     $n++;
                 }
             } else {
-                $rsp->{data}->[0] = 
+                $rsp->{data}->[0] =
                 "No database was updated";
             }
             xCAT::MsgUtils->message("I", $rsp, $::callback);
@@ -2570,9 +2568,8 @@ sub defch
                     $rsp->{data}->[0] = "The node name \'$invalidnodename\' contains capital letters which may not be resolved correctly by the dns server.";
                     xCAT::MsgUtils->message("W", $rsp, $::callback);
                 }
-   
             }
-        }  
+        }
         return 0;
     }
 }
@@ -2681,7 +2678,7 @@ sub setFINALattrs
                 }
 
             }
-            # need to make sure the node attr is set otherwise nothing 
+            # need to make sure the node attr is set otherwise nothing
             #    gets set in the nodelist table
             if ($::FINALATTRS{$objname}{objtype} eq "node") {
                 $::FINALATTRS{$objname}{node} = $objname;
@@ -2715,7 +2712,7 @@ sub setFINALattrs
                             $rsp->{data}->[0] = "Could not open the \'nics\' table.";
                             xCAT::MsgUtils->message("E", $rsp, $::callback);
                             return 1;
-                        } 
+                        }
                         my $nichash = $nicstable->getNodeAttribs($objname, [$tmpnicattr]);
                         if ($nichash && $nichash->{$tmpnicattr})
                         {
@@ -2764,7 +2761,7 @@ sub setFINALattrs
             }
 
         }
-        # need to make sure the node attr is set otherwise nothing 
+        # need to make sure the node attr is set otherwise nothing
         #   gets set in the nodelist table
         if ($::FINALATTRS{$objname}{objtype} eq "node") {
             $::FINALATTRS{$objname}{node} = $objname;
@@ -2853,9 +2850,9 @@ sub defls
     if ($::opt_s) {
         $long = 0;
     }
-    
+
     # which attrs do we want?
-    # this is a temp hack to help scaling when you only 
+    # this is a temp hack to help scaling when you only
     #   want a list of nodes - needs to be fully implemented
     if ($::opt_l || $::opt_w) {
         # if long or -w then get all the attrs
@@ -2893,7 +2890,7 @@ sub defls
             @neededattrs = (@neededattrs, @whereattrs);
         }
     }
-    
+
     if ($::objectsfrom_opto || $::objectsfrom_nr || $::objectsfrom_args)
     {
         my $type = $::clobjtypes[0];
@@ -3043,14 +3040,14 @@ sub defls
                     my $osimagename;
                     #provmethod can be set to osimage name
                     if($myhash{$obj}{'provmethod'} && ($myhash{$obj}{'provmethod'} ne 'install')
-                      && ($myhash{$obj}{'provmethod'} ne 'netboot') && ($myhash{$obj}{'provmethod'} ne 'statelite')) 
+                      && ($myhash{$obj}{'provmethod'} ne 'netboot') && ($myhash{$obj}{'provmethod'} ne 'statelite'))
                     {
                         $osimagename = $myhash{$obj}{'provmethod'};
                     }
                     else
                     {
                         # prvomethod = install/netboot/statelite,
-                        # search /opt/xcat/share/xcat/<provmethod/<platform> 
+                        # search /opt/xcat/share/xcat/<provmethod/<platform>
                         # and /install/custom/<provmethod/<platform>
                         my $profile = $myhash{$obj}{'profile'};
                         my $os = $myhash{$obj}{'os'};
@@ -3078,7 +3075,7 @@ sub defls
                             $nodeosimagehash{$obj}{'provmethod'} = $tmpprofilelist{$os}{$arch}{$provmethod}{$profile}{'provmethod'};
                             next;
                         }
-                        if ($myhash{$obj}{'os'} && $myhash{$obj}{'arch'} 
+                        if ($myhash{$obj}{'os'} && $myhash{$obj}{'arch'}
                            && $myhash{$obj}{'provmethod'} && $myhash{$obj}{'profile'})
                         {
                             #$osimagename = "$myhash{$obj}{'os'}-$myhash{$obj}{'arch'}-$myhash{$obj}{'provmethod'}-$myhash{$obj}{'profile'}";
@@ -3100,7 +3097,7 @@ sub defls
                             $tmpprofilelist{$os}{$arch}{$provmethod}{$profile}{'profile'} = $profile;
                             $nodeosimagehash{$obj}{'provmethod'} = $provmethod;
                             $tmpprofilelist{$os}{$arch}{$provmethod}{$profile}{'provmethod'} = $provmethod;
-                                
+
                             # pkgdir both diskful and diskless
 			                $nodeosimagehash{$obj}{'pkgdir'} = "$installroot/$os/$arch";
 			                $tmpprofilelist{$os}{$arch}{$provmethod}{$profile}{'pkgdir'} = "$installroot/$os/$arch";
@@ -3215,7 +3212,7 @@ sub defls
 
             # Put the osimage definition in %nodeosimagehash
             foreach my $obj (keys %myhash)
-            {    
+            {
                 if ($myhash{$obj}{'objtype'} eq 'node')
                 {
                     my $imgname = $nodeosimgname{$obj};
@@ -3255,46 +3252,46 @@ sub defls
                     $xcatdefaultspbs = $tablerow->{postbootscripts};
                     last;
                 }
-             }
-         }
-         foreach my $obj (keys %myhash)
-         {
-             if ($myhash{$obj}{objtype} eq 'node')
-             {
-                 if($xcatdefaultsps)
-                 {
-                     if ($myhash{$obj}{postscripts})
-                     {
-                         $myhash{$obj}{postscripts} = $xcatdefaultsps . ',' . $myhash{$obj}{postscripts};
-                     }
-                     else
-                     {
-                         $myhash{$obj}{postscripts} = $xcatdefaultsps;
-                     }
-                     if($::opt_V && ($myhash{$obj}{postscripts} eq $xcatdefaultsps))
-                     {
-                         $myhash{$obj}{postscripts} .= "     (Table:postscripts - Key:node - Column:postscripts)";
-                     }
-                 }
-                 if($xcatdefaultspbs)
-                 {
-                     if ($myhash{$obj}{postbootscripts})
-                     {
-                         $myhash{$obj}{postbootscripts} = $xcatdefaultspbs . ',' . $myhash{$obj}{postbootscripts};
-                     }
-                     else
-                     {
-                         $myhash{$obj}{postbootscripts} = $xcatdefaultspbs;
-                     }
-                     if($::opt_V && ($myhash{$obj}{postbootscripts} eq $xcatdefaultspbs))
-                     {
-                         $myhash{$obj}{postbootscripts} .= "       (Table:postscripts - Key:node - Column:postbootscripts)";
-                     }
-                 }
-             }
-         }
+            }
+        }
+        foreach my $obj (keys %myhash)
+        {
+            if ($myhash{$obj}{objtype} eq 'node')
+            {
+                if($xcatdefaultsps)
+                {
+                    if ($myhash{$obj}{postscripts})
+                    {
+                        $myhash{$obj}{postscripts} = $xcatdefaultsps . ',' . $myhash{$obj}{postscripts};
+                    }
+                    else
+                    {
+                        $myhash{$obj}{postscripts} = $xcatdefaultsps;
+                    }
+                    if($::opt_V && ($myhash{$obj}{postscripts} eq $xcatdefaultsps))
+                    {
+                        $myhash{$obj}{postscripts} .= "     (Table:postscripts - Key:node - Column:postscripts)";
+                    }
+                }
+                if($xcatdefaultspbs)
+                {
+                    if ($myhash{$obj}{postbootscripts})
+                    {
+                        $myhash{$obj}{postbootscripts} = $xcatdefaultspbs . ',' . $myhash{$obj}{postbootscripts};
+                    }
+                    else
+                    {
+                        $myhash{$obj}{postbootscripts} = $xcatdefaultspbs;
+                    }
+                    if($::opt_V && ($myhash{$obj}{postbootscripts} eq $xcatdefaultspbs))
+                    {
+                        $myhash{$obj}{postbootscripts} .= "       (Table:postscripts - Key:node - Column:postbootscripts)";
+                    }
+                }
+            }
+        }
     }
-      
+
     # the list of objects may be limited by the "-w" option
     # see which objects have attr/val that match the where values
     #        - if provided
@@ -3324,17 +3321,17 @@ sub defls
     # for each type
     foreach my $type (@::clobjtypes)
     {
-       # Check if -i specifies valid attributes
-       # get the data type definition from Schema.pm
-       my %validattrslist;
-       if ($::opt_i)
-       {
-           my $datatype = $xCAT::Schema::defspec{$type};
-           foreach my $this_attr (sort @{$datatype->{'attrs'}})
-           {
-               my $a = $this_attr->{attr_name};
-               $validattrslist{$a} = 1;
-           }
+        # Check if -i specifies valid attributes
+        # get the data type definition from Schema.pm
+        my %validattrslist;
+        if ($::opt_i)
+        {
+            my $datatype = $xCAT::Schema::defspec{$type};
+            foreach my $this_attr (sort @{$datatype->{'attrs'}})
+            {
+                my $a = $this_attr->{attr_name};
+                $validattrslist{$a} = 1;
+            }
         }
 
         my %defhash;
@@ -3361,7 +3358,7 @@ sub defls
             return 0;
         }
 
-        
+
         if ($type eq "node") {
             my %newhash;
             my $listtab  = xCAT::Table->new( 'nodelist' );
@@ -3371,29 +3368,29 @@ sub defls
                  "Could not open nodelist table.";
                 xCAT::MsgUtils->message("E", $rsp, $::callback);
                 return 1;
-            } 
-            
+            }
+
             if (!defined($::opt_S) ) {
                 #my $tmp1=$listtab->getAllEntries("all");
                 #if (defined($tmp1) && (@$tmp1 > 0)) {
                 #    foreach(@$tmp1) {
                 #        $newhash{$_->{node}} = 1;
                 #    }
-                #}                
-            
+                #}
+
                 foreach my $n (keys %defhash) {
                     #if ($newhash{$n} eq 1) {
                         my ($hidhash) = $listtab->getNodeAttribs($n ,['hidden']);
                         if ($hidhash) {
-                            if ( $hidhash->{hidden} eq 1)  {  
+                            if ( $hidhash->{hidden} eq 1)  {
                                 delete $defhash{$n};
                             }
                         }
                     #}
                 }
             }
-        }            
-            
+        }
+
         # Get all the objects of this type
         my @allobjoftype;
         @allobjoftype = xCAT::DBobjUtils->getObjectsOfType($type);
@@ -3432,14 +3429,14 @@ sub defls
                             xCAT::MsgUtils->message("E", $rsp, $::callback);
                             next;
                         }
-                   }
+                    }
                 }
             } else {
                 # get the list of all attrs for this type object
                 # get the data type  definition from Schema.pm
                 my $datatype =
                   $xCAT::Schema::defspec{$type};
-    
+
                 foreach my $this_attr (@{$datatype->{'attrs'}})
                 {
                     if (!grep(/^$this_attr->{attr_name}$/, @attrlist)) {
@@ -3448,7 +3445,7 @@ sub defls
                 }
             }
         }
-            
+
         # for each object
         foreach my $obj (sort keys %defhash)
         {
@@ -3498,7 +3495,7 @@ sub defls
             }
             else
             {
-                
+
                 # display all data
                 # do we want the short or long output?
                 if ($long)
@@ -3519,7 +3516,7 @@ sub defls
                             if (!$::opt_c)
                             {
                                 push (@{$rsp_info->{data}}, "Object name: $obj");
-                            } 
+                            }
                         }
                     }
 
@@ -3588,12 +3585,12 @@ sub defls
                                         if (!$::opt_c)
                                         {
                                             push (@{$rsp_info->{data}}, "    $showattr=$attrval");
-                                        } 
+                                        }
                                         else
                                         {
                                             push (@{$rsp_info->{data}}, "$obj: $showattr=$attrval");
 
-                                        } 
+                                        }
                                     }
                                 }
                             }
@@ -3720,7 +3717,7 @@ sub defls
     if (defined($rsp_info->{data}) && scalar(@{$rsp_info->{data}}) > 0) {
         xCAT::MsgUtils->message("I", $rsp_info, $::callback);
     }
-    
+
     return 0;
 }
 
@@ -3991,7 +3988,7 @@ sub defrm
             if ( $ntype =~ /^(cec|frame)$/ )  {
                 my $cnodep = xCAT::DBobjUtils->getchildren($tob);
                 if ($cnodep) {
-                    my $cnode = join ',', @$cnodep;            
+                    my $cnode = join ',', @$cnodep;
                     $childrenhash{$tob} = $cnode;
                     $typehash{$tob} = $ntype;
                 }
@@ -4045,9 +4042,9 @@ sub defrm
                     my $rsp;
                     $rsp->{data}->[0] =
                       "You have removed a $typehash{$tn} node, please remove these nodes belongs to it manually: $childrenhash{$tn} .";
-                    xCAT::MsgUtils->message("W", $rsp, $::callback);                
+                    xCAT::MsgUtils->message("W", $rsp, $::callback);
                 }
-            }            
+            }
         }
         else
         {