From bbc0bfddbcb140bf0cd081f3fb680f065e533d0a Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 28 Jun 2011 13:43:00 +0000
Subject: [PATCH] fix bug 3340664: lsvm/rmvm failed on node created by mkvm,
 3339340:rscan -w cannot write the nodetype table in 2.6.6 6/28 build

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9973 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/PPCdb.pm | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/perl-xCAT/xCAT/PPCdb.pm b/perl-xCAT/xCAT/PPCdb.pm
index 2267d7745..dd67b3b8d 100644
--- a/perl-xCAT/xCAT/PPCdb.pm
+++ b/perl-xCAT/xCAT/PPCdb.pm
@@ -43,6 +43,15 @@ my %defaultgrp = (
     cec   => "cec",
     
 );
+my %globlehwtype = (
+    fsp   => $::NODETYPE_FSP,
+    bpa   => $::NODETYPE_BPA,
+    lpar  => $::NODETYPE_LPAR,
+    hmc   => $::NODETYPE_HMC,
+    ivm   => $::NODETYPE_IVM,
+    frame => $::NODETYPE_FRAME,
+    cec   => $::NODETYPE_CEC,
+);
 
 
 ##########################################################################
@@ -56,16 +65,6 @@ sub add_ppc {
     my $otherinterfaces = shift;
     my @tabs     = qw(ppc vpd nodehm nodelist nodetype hosts mac); 
     my %db       = ();
-    my %nodetype = (
-        fsp   => $::NODETYPE_FSP,
-        bpa   => $::NODETYPE_BPA,
-        lpar  =>"$::NODETYPE_LPAR,$::NODETYPE_OSI",
-        hmc   => $::NODETYPE_HMC,
-        ivm   => $::NODETYPE_IVM,
-        frame => $::NODETYPE_FRAME,
-        cec   => $::NODETYPE_CEC,
-    );
-
     ###################################
     # Open database needed
     ###################################
@@ -97,6 +96,9 @@ sub add_ppc {
         if ( $type =~ /^(fsp|bpa|hmc|ivm|frame|cec)$/ ) {
             $db{nodetype}->setNodeAttribs( $name,{nodetype=>'ppc'} );
             $db{nodetype}{commit} = 1;
+        } elsif ($type =~ /^lpar$/) {
+            $db{nodetype}->setNodeAttribs( $name,{nodetype=>'ppc,osi'} );
+            $db{nodetype}{commit} = 1;
         }
         ###############################
         # If cannot be overwroten, get
@@ -147,7 +149,7 @@ sub add_ppc {
                  id=>$id,
                  pprofile=>$pprofile,
                  parent=>$parent,
-                 nodetype=>$nodetype{$type},
+                 nodetype=>$globlehwtype{$type},
                }); 
             $db{ppc}{commit} = 1;
 
@@ -228,13 +230,6 @@ sub update_ppc {
     my $not_overwrite = shift;
     my @tabs     = qw(ppc vpd nodehm nodelist nodetype ppcdirect hosts mac); 
     my %db       = ();
-    my %nodetype = (
-        fsp  => $::NODETYPE_FSP,
-        bpa  => $::NODETYPE_BPA,
-        lpar =>"$::NODETYPE_LPAR,$::NODETYPE_OSI",
-        hmc  => $::NODETYPE_HMC,
-        ivm  => $::NODETYPE_IVM,
-    );
     my @update_list = ();
 
     ###################################