From 6db0afe70c65d1d4a1054ee61a8afd7711a5ac75 Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 21 Dec 2011 08:42:05 +0000
Subject: [PATCH] Make the nodetype.nodetype to be ppc for fsp and NGP ppc
 blade, and to be mp for the mm and common blade

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11282 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/blade.pm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 8ac101636..da6b3012c 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -1506,12 +1506,10 @@ sub rscan {
 
     my ($k4, $u4);
     $k4->{node} = $name;
-    if ($type eq "blade" || $type eq "ppcblade"){
-      $u4->{nodetype} = "blade";
-    } elsif ($type eq "mm" || $type eq "cmm") {
-      $u4->{nodetype} = "blade";
-    } elsif ($type eq "fsp") {
+    if ($type eq "ppcblade" || $type eq "fsp"){
       $u4->{nodetype} = "ppc";
+    } elsif ($type eq "mm" || $type eq "cmm" || $type eq "blade") {
+      $u4->{nodetype} = "mp";
     }
     $db{nodetype}->setAttribs($k4,$u4);
     $db{nodetype}{commit} = 1;
@@ -1556,10 +1554,10 @@ sub rscan_xml {
         if ( /^name$/ ) {
             next;
         } elsif ( /^nodetype$/ ) {
-            if ($type eq "fsp") {
+            if ($origtype eq "fsp" || $origtype eq "ppcblade") {
               $d = "ppc";
             } else {
-              $d = $type;
+              $d = "mp";
             }
         } elsif ( /^groups$/ ) {
             $d = "$type,all";
@@ -1644,10 +1642,10 @@ sub rscan_stanza {
         if ( /^name$/ ) {
             next; 
         } elsif ( /^nodetype$/ ) {
-            if ($type eq "fsp") {
+            if ($origtype eq "fsp" || $origtype eq "ppcblade") {
               $d = "ppc";
             } else {
-              $d = $type;
+              $d = "mp";
             }
         } elsif ( /^groups$/ ) {
             $d = "$type,all";