From a9cc5750c0520a3b8357dd4dbb3f36b9c7090be6 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Thu, 7 Apr 2016 08:39:13 -0400
Subject: [PATCH] modify docker testcase according to comments

---
 .../autotest/testcase/dockercommand/cases0    | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0
index 85ff74ce9..59f327d31 100644
--- a/xCAT-test/autotest/testcase/dockercommand/cases0
+++ b/xCAT-test/autotest/testcase/dockercommand/cases0
@@ -18,10 +18,10 @@ cmd:rpower $$DOCKERCN stop
 check:rc==0
 cmd:rpower $$DOCKERCN state
 check:output=~exited
-cmd:makehosts -d $$DOCKERCN
-check:rc==0
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
+cmd:makehosts -d $$DOCKERCN
+check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end
@@ -42,10 +42,10 @@ check:output=~success
 cmd:rpower  $$DOCKERCN state
 check:rc==0
 check:output=~running 
-cmd:makehosts -d $$DOCKERCN
-check:rc==0
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
+cmd:makehosts -d $$DOCKERCN
+check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end
@@ -74,10 +74,10 @@ cmd:rpower $$DOCKERCN start
 check:rc==0
 cmd:rpower $$DOCKERCN state
 check:output=~running
-cmd:makehosts -d $$DOCKERCN
-check:rc==0
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
+cmd:makehosts -d $$DOCKERCN
+check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end
@@ -104,10 +104,10 @@ check:rc==0
 check:output=~success
 cmd:rpower $$DOCKERCN state
 check:output=~running
-cmd:makehosts -d $$DOCKERCN
-check:rc==0
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
+cmd:makehosts -d $$DOCKERCN
+check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end
@@ -131,10 +131,10 @@ cmd:rpower $$DOCKERCN state
 check:output=~paused
 cmd:rpower $$DOCKERCN unpause
 check:rc==0
-cmd:makehosts -d $$DOCKERCN
-check:rc==0
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
+cmd:makehosts -d $$DOCKERCN
+check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end
@@ -158,10 +158,10 @@ cmd:sleep 6
 cmd:rpower $$DOCKERCN state
 check:output=~running
 cmd:sleep 6
-cmd:makehosts -d $$DOCKERCN
-check:rc==0
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
+cmd:makehosts -d $$DOCKERCN
+check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end
@@ -172,7 +172,7 @@ check:rc==0
 check:output=~Usage: mkdocker
 end
 start:mkdocker_command
-description:create docker instance
+description:create docker instance image should be ubuntu and command should be bash here 
 cmd:chdef $$DOCKERCN  dockerhost=$$DOCKERHOST:2375 dockercpus=1 ip=$$DOCKERCONIP dockermemory=4096 groups=docker,all mgt=docker
 check:rc==0
 cmd:makehosts $$DOCKERCN
@@ -195,9 +195,9 @@ check:output=~$$DOCKERCN
 check:rc==0
 cmd:ping $$DOCKERCN -c 3
 check:output=~64 bytes from $$DOCKERCN
-cmd:makehosts -d $$DOCKERCN
+cmd:rmdocker $$DOCKERCN -f
 check:rc==0
-cmd:rmdocker $$DOCKERCN -f 
+cmd:makehosts -d $$DOCKERCN
 check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
@@ -226,6 +226,8 @@ check:rc!=0
 check:output=~ Error: No such container
 cmd:makehosts -d $$DOCKERCN
 check:rc==0
+cmd:rmdef $$DOCKERCN
+check:rc==0
 end
 start:rmdocker_f_command
 description:force to remove docker instance 
@@ -243,11 +245,11 @@ check:rc==0
 cmd:rmdocker $$DOCKERCN
 chec:rc!=0
 check:output=~Stop the container before attempting removal or use -f
-cmd:makehosts -d $$DOCKERCN
-check:rc==0
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
 check:output=~$$DOCKERCN: success
+cmd:makehosts -d $$DOCKERCN
+check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end
@@ -268,10 +270,10 @@ check:rc==0
 cmd:lsdocker -l $$DOCKERCN
 check:rc==0
 check:output=~$$DOCKERCN
-cmd:makehosts -d $$DOCKERCN
-check:rc==0
 cmd:rmdocker $$DOCKERCN -f
 check:rc==0
+cmd:makehosts -d $$DOCKERCN
+check:rc==0
 cmd:rmdef $$DOCKERCN
 check:rc==0
 end