From b769c4b1bccafe24d5cb60f75b3aac5e2713642f Mon Sep 17 00:00:00 2001
From: Jia Zhao <jiazhbj@cn.ibm.com>
Date: Thu, 2 Apr 2015 15:23:09 +0800
Subject: [PATCH] Update nodeimport error messages for kvm nodes

---
 perl-xCAT/xCAT/ProfiledNodeUtils.pm           | 33 +++++++++++++++++++
 xCAT-server/lib/xcat/plugins/profilednodes.pm | 15 +++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/perl-xCAT/xCAT/ProfiledNodeUtils.pm b/perl-xCAT/xCAT/ProfiledNodeUtils.pm
index ce7989c72..f33136263 100644
--- a/perl-xCAT/xCAT/ProfiledNodeUtils.pm
+++ b/perl-xCAT/xCAT/ProfiledNodeUtils.pm
@@ -996,6 +996,39 @@ sub is_fsp_node
 
 #-------------------------------------------------------------------------------
 
+=head3 is_kvm_node
+      Description : Judge whether nodes are KVM nodes.
+      Arguments   : $hardwareprofile - hardwareprofile name
+      Returns     : 1 - KVM nodes
+                    0 - Not KVM nodes
+=cut
+
+#-------------------------------------------------------------------------------
+sub is_kvm_node
+{
+    my $class = shift;
+    my $hardwareprofile = shift;
+    
+    if (not $hardwareprofile) {
+        return 0;
+    }
+ 
+    #Get hardwareprofile mgt
+    my $nodehmtab = xCAT::Table->new('nodehm');
+    my $mgtentry = $nodehmtab->getNodeAttribs($hardwareprofile, ['mgt']);  
+    my $mgt = undef;
+    $mgt = $mgtentry->{'mgt'} if ($mgtentry->{'mgt'});
+    $nodehmtab->close();
+    
+    if ($mgt eq 'kvm') {
+        return 1;
+    } 
+    
+    return 0;
+}
+
+#-------------------------------------------------------------------------------
+
 =head3 get_nodes_cmm
       Description : Get the CMM of nodelist 
       Arguments   : $nodelist - the ref of node list array
diff --git a/xCAT-server/lib/xcat/plugins/profilednodes.pm b/xCAT-server/lib/xcat/plugins/profilednodes.pm
index 1fa828253..3c6d53918 100644
--- a/xCAT-server/lib/xcat/plugins/profilednodes.pm
+++ b/xCAT-server/lib/xcat/plugins/profilednodes.pm
@@ -2439,6 +2439,13 @@ sub validate_node_entry{
     # validate if node use FSP network
     my $is_fsp = xCAT::ProfiledNodeUtils->is_fsp_node($args_dict{'networkprofile'});
     
+    # Check whether this node is a KVM node
+    my $is_kvm = xCAT::ProfiledNodeUtils->is_kvm_node($args_dict{'hardwareprofile'});
+    if (not $node_entry{'vmhost'} and $is_kvm) {
+        # Using kvm hardware profile but not define vmhost in nodeinfo file
+        $errmsg .= "Specified KVM guest hardwareprofile must define hypervisor host name 'vmhost' in nodeinfo file.\n";
+    }
+    
     # validate each single value.
     foreach (keys %node_entry){
         if ($_ eq "mac"){
@@ -2598,8 +2605,12 @@ sub validate_node_entry{
         }elsif ($_ eq "vmhost") {
             # Support PowerKVM vms
             my $vm_host= $node_entry{"vmhost"};
-            if (! exists $allvmhosts{$node_entry{$_}}){
-                $errmsg .= "The VM host name $node_entry{$_} that is specified in the node information file is not defined in the system.\n";
+            if (! exists $allvmhosts{$vm_host}){
+                $errmsg .= "The Hypervisor host name '$vm_host' that is specified in the node information file is not defined in the system.\n";
+            }
+            
+            if (not $is_kvm) {
+                $errmsg .= "Specified hypervisor host name '$vm_host' in nodeinfo file must use KVM guest hardwareprofile.\n";
             }
         }else{
            $errmsg .= "Invalid attribute $_ specified\n";