Merge lp:~psivaa/ue-qa-kernel-tests-infrastructure/cdu-ip-and-command-change into lp:ue-qa-kernel-tests-infrastructure

[Para Siva]

This is the change to accommodate cdu ip addresses ( still as ip's there is no dns names yet) and the corresponding command change due to the type of cdu (APC) now being used. Unfortunately now the cdu command fence_apc does not work with the outlet names and only work with their plug id's. Hence function cdu_outlet_id().

[Paul Larson (pwlars)]

8 - Onibi|Onza|Zmeu|Zuijin) CDU_HOST=10.98.0.30;;
9 - Alkaid|Phact|Rukbah|Tarf) CDU_HOST="10.98.0.32";;
10 + Onibi|Zuijin|Tarf|Phact) CDU_HOST=10.98.4.42;;
11 + Alkaid|Onza|Rukbah|Zmeu) CDU_HOST=10.98.4.43;;
Use the hostnames instead.
Otherwise, +1

review: Approve

[lp:~psivaa/ue-qa-kernel-tests-infrastructure/cdu-ip-and-command-change]

348. By Para Siva on 2013-11-20

Fixing the ips to host names of cdu servers

[Para Siva (psivaa)]

Thanks. Just noticed the dns names for the cdu devices. Have change accordingly

review: Needs Resubmitting

=== modified file 'kernel-sru/jenkins-script-bare-metal-kteam.sh'
--- kernel-sru/jenkins-script-bare-metal-kteam.sh	2013-11-08 15:30:35 +0000
+++ kernel-sru/jenkins-script-bare-metal-kteam.sh	2013-11-20 15:02:55 +0000
@@ -7,8 +7,19 @@
   # sets CDU_HOST
   #
   case $TESTHOST in
-    Onibi|Onza|Zmeu|Zuijin) CDU_HOST=10.98.0.30;;
-    Alkaid|Phact|Rukbah|Tarf) CDU_HOST="10.98.0.32";;
+    Onibi|Zuijin|Tarf|Phact) CDU_HOST=cdu-1ss-b-07-a;;
+    Alkaid|Onza|Rukbah|Zmeu) CDU_HOST=cdu-1ss-b-07-b;;
+    *) sys_exit_KO "unknown test host $TESTHOST, croaking";;
+  esac
+}
+
+function cdu_outlet_id()
+{
+  case $TESTHOST in
+     Alkaid|Phact) OUTLET_ID=3;;
+     Rukbah|Tarf) OUTLET_ID=4;;
+     Onibi|Onza) OUTLET_ID=7;;
+     Zuijin|Zmeu) OUTLET_ID=8;;
     *) sys_exit_KO "unknown test host $TESTHOST, croaking";;
   esac
 }
@@ -92,14 +103,15 @@
 #
 #cobbler_reboot $SYS_HOST
 cdu_host
-sys_ssh $COBBLER_SERVER "fence_cdu -v -a $CDU_HOST -l ubuntu -p ubuntu -n $SYS_HOST -o off"
+cdu_outlet_id
+sys_ssh $COBBLER_SERVER "fence_apc -v -a $CDU_HOST -l ubuntu -p ubuntu --shell-timeout 30 --login-timeout 60 -n $OUTLET_ID -x -o off"
 RC=$?
 [ $RC -ne 0 ] && sys_exit_KO "failed to command power-off for  system $SYS_HOST on Cobbler, bailing out"
 #
 # burned once, etc, etc. Wait 15 seconds
 #
 sleep 15
-sys_ssh $COBBLER_SERVER "fence_cdu -v -a $CDU_HOST -l ubuntu -p ubuntu -n $SYS_HOST -o on"
+sys_ssh $COBBLER_SERVER "fence_apc -v -a $CDU_HOST -l ubuntu -p ubuntu --shell-timeout 30 --login-timeout 60 -n $OUTLET_ID -x -o on"
 RC=$?
 [ $RC -ne 0 ] && sys_exit_KO "failed to command power-on for  system $SYS_HOST on Cobbler, bailing out"
 #