-Fix problem with the noderes sample

-Provide sane error when a csv has unrecognized columns, TODO: option to drop unrecognized column on restore


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2598 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd

xCAT-server/lib/xcat/plugins/tabutils.pm

@@ -266,6 +266,10 @@ sub tabrestore
     }
     $tab->delEntries();    #Yes, delete *all* entries
     my $header = shift @{$request->{data}};
+    unless ($header =~ /^#/) {
+        $cb->({error => "Data missing header line starting with #",errorcode=>1});
+        return;
+    }
     $header =~ s/"//g;     #Strip " from overzealous CSV apps
     $header =~ s/^#//;
     $header =~ s/\s+$//;

xCAT/templates/e1350/noderes.csv

@@ -1,2 +1,2 @@
-#node,servicenode,netboot,tftpserver,nfsserver,kernel,initrd,kcmdline,nfsdir,serialport,installnic,primarynic,xcatmaster,current_osimage,next_osimage,comments,disable
+#node,servicenode,netboot,tftpserver,nfsserver,nfsdir,installnic,primarynic,xcatmaster,current_osimage,next_osimage,comments,disable
 "compute",,pxe,,