From 0e30e06d04311f1013faf6bb947a4cbd5efe4789 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 3 Apr 2012 15:26:52 +0000
Subject: [PATCH] Change clicmds argument passing to be more flexible

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

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 5c6abb7c7..b5bc0be52 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -3981,7 +3981,7 @@ sub clicmds {
 
   # most of these commands should be able to be done
   # through SNMP, but they produce various errors.
-  foreach my $cmd (@_) {
+  foreach my $cmd (@{$args{cmds}}) {
     if ($cmd =~ /^swnet|pd1|pd2|sshcfg|rscanfsp|USERID|HMC|=/) {
       if (($cmd =~ /^textid/) and ($nodeid > 0)) {
         push @unhandled,$cmd;
@@ -4939,7 +4939,7 @@ sub dompa {
         $rc = 1;
         $args = [];
       } else {
-        $result = clicmds($mpa,$user,$pass,$node,$slot,@exargs);
+        $result = clicmds($mpa,$user,$pass,$node,$slot,args=>\@exargs);
         $rc |= @$result[0];
         $args = @$result[1];
       }
@@ -4990,7 +4990,7 @@ sub dompa {
       if ($mptype eq "cmm") {
         # For the cmm, call the rscanfsp to discover the fsp for ppc blade
         my @telargs = ("rscanfsp");
-        clicmds($mpa,$user,$pass,$node,$slot,@telargs);
+        clicmds($mpa,$user,$pass,$node,$slot,args=>\@telargs);
       }
     }
   }
diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index f1a804c84..5e4c67d04 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -780,7 +780,7 @@ sub invoke_cmd {
                     $target_dev->{username},
                     $target_dev->{password},
                     0,
-                    @cmds );
+                    cmds=>\@cmds );
         }
         elsif($target_dev->{'type'} eq 'hmc')
         {