From 1f3f65a35a027bf1c92ce1785227fcce3d97495c Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Wed, 19 Apr 2017 08:38:15 -0400
Subject: [PATCH] standardize rpower testcase name

---
 .../autotest/bundle/ubuntu14.04.3_x86_64.bundle      | 12 ++++++------
 .../autotest/bundle/ubuntu14.04.4_x86_64.bundle      | 12 ++++++------
 xCAT-test/autotest/testcase/dockercommand/cases0     | 12 ++++++------
 xCAT-test/autotest/testcase/rpower/cases0            |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
index 48d7290d3..039e6cbc3 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
@@ -245,12 +245,12 @@ nodeset_cmdline
 nodeset_runimg
 nodeset_check_warninginfo
 Full_installation_flat_docker
-rpower_stop
-rpower_start
-rpower_state
-rpower_restart
-rpower_pause
-rpower_unpause
+rpower_stop_docker
+rpower_start_docker
+rpower_state_docker
+rpower_restart_docker
+rpower_pause_docker
+rpower_unpause_docker
 mkdocker_h
 mkdocker_command
 rmdocker_h
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
index 51738cfbe..07a4513f3 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
@@ -267,12 +267,12 @@ nodeset_cmdline
 nodeset_runimg
 nodeset_check_warninginfo
 Full_installation_flat_docker
-rpower_stop
-rpower_start
-rpower_state
-rpower_restart
-rpower_pause
-rpower_unpause
+rpower_stop_docker
+rpower_start_docker
+rpower_state_docker
+rpower_restart_docker
+rpower_pause_docker
+rpower_unpause_docker
 mkdocker_h
 mkdocker_command
 rmdocker_h
diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0
index a8b4844d5..4b21baac0 100644
--- a/xCAT-test/autotest/testcase/dockercommand/cases0
+++ b/xCAT-test/autotest/testcase/dockercommand/cases0
@@ -1,4 +1,4 @@
-start:rpower_stop
+start:rpower_stop_docker
 description:stop a created docker instance
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
@@ -25,7 +25,7 @@ check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end
-start:rpower_start
+start:rpower_start_docker
 description:start a created docker instance
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
@@ -50,7 +50,7 @@ cmd:rmdef $$DOCKERCN
 check:rc==0
 end
 
-start:rpower_state
+start:rpower_state_docker
 description:get state of the instance
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
@@ -82,7 +82,7 @@ cmd:rmdef $$DOCKERCN
 check:rc==0
 end
 
-start:rpower_restart
+start:rpower_restart_docker
 description:restart a created docker instance
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
@@ -112,7 +112,7 @@ cmd:rmdef $$DOCKERCN
 check:rc==0
 end
 
-start:rpower_pause
+start:rpower_pause_docker
 decription:pause all processes in the instance
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
@@ -139,7 +139,7 @@ cmd:rmdef $$DOCKERCN
 check:rc==0
 end
 
-start:rpower_unpause
+start:rpower_unpause_docker
 description:unpause all processes in the instance
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index 3d0ccc7ab..ee6974eac 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -53,7 +53,7 @@ cmd:rpower $$CN status
 check:output=~Running|on
 end
 
-start:rpower_state_bmc
+start:rpower_state
 description:checkout rpower node status could get node's stauts
 cmd:rpower $$CN off
 cmd:a=0;while ! `rpower $$CN state|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done