From a246b048c57c95f3a5725c55afbc42166f2c9d58 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Thu, 15 Jun 2017 21:23:53 -0400
Subject: [PATCH] modified depending on comments

---
 .../testcase/simulator/clear_simulator        |  6 +-
 .../testcase/simulator/config_simulator.sh    | 42 ++++++----
 .../testcase/simulator/setup_simulator        | 76 +------------------
 3 files changed, 33 insertions(+), 91 deletions(-)

diff --git a/xCAT-test/autotest/testcase/simulator/clear_simulator b/xCAT-test/autotest/testcase/simulator/clear_simulator
index 1c3df64c9..03c442fd9 100644
--- a/xCAT-test/autotest/testcase/simulator/clear_simulator
+++ b/xCAT-test/autotest/testcase/simulator/clear_simulator
@@ -6,18 +6,18 @@ end
 
 start:clear_openbmc_simulator_multiple_100
 description:clear evironment that simulate 100 OpenBMCs
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN 100
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN $$bmcusername $$bmcpasswd 100
 check:rc==0
 end
 
 start:clear_openbmc_simulator_multiple_1000
 description:clear evironment that simulate 1000 OpenBMCs
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN 1000
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN $$bmcusername $$bmcpasswd 1000
 check:rc==0
 end
 
 start:clear_openbmc_simulator_multiple_5000
 description:clear evironment that simulate 5000 OpenBMCs
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN 5000
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -c $$MN $$CN $$bmcusername $$bmcpasswd 5000
 check:rc==0
 end
diff --git a/xCAT-test/autotest/testcase/simulator/config_simulator.sh b/xCAT-test/autotest/testcase/simulator/config_simulator.sh
index 6f9a1377f..715d4cfd0 100755
--- a/xCAT-test/autotest/testcase/simulator/config_simulator.sh
+++ b/xCAT-test/autotest/testcase/simulator/config_simulator.sh
@@ -1,9 +1,11 @@
 #!/bin/bash
 
-flag=$1
-mnhn=$2
-cnhn=$3
-nodes=$4
+flag=$1  # -s:setup simulator -c:clear simulator env
+mnhn=$2  # MN hostname
+cnhn=$3  # CN hostname
+username=$4  # bmcusername
+password=$5  # bmcpassword
+nodes=$6  # number of IPs want to config
 
 mnip=`ping $mnhn -c 1 | grep "64 bytes from" |awk -F'(' '{print $2}'|awk -F')' '{print $1}'`
 if [ $nodes ]; then
@@ -14,27 +16,37 @@ if [ $nodes ]; then
     elif [ $nodes = "5000" ]; then
         range=`echo $(echo 10.100.{1..50}.{1..100})`
     else
-        range=`echo $(echo 10.100.{1..10}.{1..10})`
+        range=`echo $(echo 10.100.1.{1..100})`
     fi
 fi
 
 if [ $flag = "-s" ]; then
+    os=`cat /etc/*release*`
+    if [[ "$os" =~ "Red Hat" ]] || [[ "$os" =~ "suse" ]]; then
+        yum install git -y
+        if [ $? != 0 ]; then
+            echo "Install git Failed"
+            exit 1
+        fi
+    elif [[ "$os" =~ "ubuntu" ]]; then
+        apt-get install git -y
+        if [ $? != 0 ]; then
+            echo "Install git Failed"
+            exit 1
+        fi
+    fi
+
+    cd /root/ && git clone git@github.com:xuweibj/openbmc_simulator.git
+
     if [ $nodes ]; then
         lsdef $cnhn -z > /tmp/$cnhn.stanza
         rmdef $cnhn
 
         /root/openbmc_simulator/simulator -n $nic -r $range 
 
-        if [ $nodes = "1000" ]; then
-            chdef -t group $cnhn mgt=openbmc bmc="|\D+(\d+)$|10.100.(1+((\$1)/100)).((\$1)%100+1)|" bmcusername=root bmcpassword=0penBmc
-            chdef simulator_test_[0-999] groups=$cnhn
-        elif [ $nodes = "5000" ]; then
-            chdef -t group $cnhn mgt=openbmc bmc="|\D+(\d+)$|10.100.(1+((\$1)/100)).((\$1)%100+1)|" bmcusername=root bmcpassword=0penBmc
-            chdef simulator_test_[0-4999] groups=$cnhn
-        else 
-            chdef -t group $cnhn mgt=openbmc bmc="|\D+(\d+)$|10.100.(1+((\$1)/10)).((\$1)%10+1)|" bmcusername=root bmcpassword=0penBmc
-            chdef simulator_test_[0-99] groups=$cnhn
-        fi
+        node_end=$[nodes-1]
+        chdef -t group $cnhn mgt=openbmc bmc="|\D+(\d+)$|10.100.(1+((\$1)/100)).((\$1)%100+1)|" bmcusername=$username bmcpassword=$password
+        chdef simulator_test_[0-$node_end] groups=$cnhn  # use CN hostname as group, so when run command against CN will rpower against all nodes added here
     else 
         cnip=`lsdef $cnhn -i bmc -c | awk -F '=' '{print $2}'`
         echo $cnip > "/tmp/simulator"
diff --git a/xCAT-test/autotest/testcase/simulator/setup_simulator b/xCAT-test/autotest/testcase/simulator/setup_simulator
index e69f8c562..8ab412829 100644
--- a/xCAT-test/autotest/testcase/simulator/setup_simulator
+++ b/xCAT-test/autotest/testcase/simulator/setup_simulator
@@ -1,93 +1,23 @@
 start:setup_openbmc_simulator
 description:install dependent packaages, setup and start openbmc simulator
-cmd:#!/bin/bash
-os=`cat /etc/*release*`
-if [[ "$os" =~ "Red Hat" ]] || [[ "$os" =~ "suse" ]]; then
-    yum install git -y
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-elif [[ "$os" =~ "ubuntu" ]]; then
-    apt-get install git -y
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-fi
-exit 0
-check:rc==0
-cmd:cd /root/ && git clone git@github.com:xuweibj/openbmc_simulator.git
-check:rc==0
-cmd:/root/openbmc_simulator/simulator &
-check:rc==0
 cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN
 check:rc==0
 end
 
 start:setup_openbmc_simulator_multiple_100
 description:install dependent packaages, setup and start 100 openbmc simulator
-cmd:#!/bin/bash
-os=`cat /etc/*release*`
-if [[ "$os" =~ "Red Hat" ]] || [[ "$os" =~ "suse" ]]; then
-    yum install git -y
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-elif [[ "$os" =~ "ubuntu" ]]; then
-    apt-get install git -y
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-fi
-exit 0
-check:rc==0
-cmd:cd /root/ && git clone git@github.com:xuweibj/openbmc_simulator.git
-check:rc==0
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN 100
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 100
 check:rc==0
 end
 
 start:setup_openbmc_simulator_multiple_1000
 description:install dependent packaages, setup and start 1000 openbmc simulator
-cmd:#!/bin/bash
-os=`cat /etc/*release*`
-if [[ "$os" =~ "Red Hat" ]] || [[ "$os" =~ "suse" ]]; then
-    yum install git -y
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-elif [[ "$os" =~ "ubuntu" ]]; then
-    apt-get install git -y
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-fi
-exit 0
-check:rc==0
-cmd:cd /root/ && git clone git@github.com:xuweibj/openbmc_simulator.git
-check:rc==0
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN 1000
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 1000
 check:rc==0
 end
 
 start:setup_openbmc_simulator_multiple_5000
 description:install dependent packaages, setup and start 5000 openbmc simulator
-cmd:#!/bin/bash
-os=`cat /etc/*release*`
-if [[ "$os" =~ "Red Hat" ]] || [[ "$os" =~ "suse" ]]; then
-    yum install git -y
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-elif [[ "$os" =~ "ubuntu" ]]; then
-    apt-get install git -y
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-fi
-exit 0
-check:rc==0
-cmd:cd /root/ && git clone git@github.com:xuweibj/openbmc_simulator.git
-check:rc==0
-cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN 5000
+cmd:/opt/xcat/share/xcat/tools/autotest/testcase/simulator/config_simulator.sh -s $$MN $$CN $$bmcusername $$bmcpasswd 5000
 check:rc==0
 end