use IP_SUFFIX_START for IPs of node, better mail layout

1 files changed, 26 insertions, 16 deletions

diff --git a/leap-platform-test b/leap-platform-test
index 980114c..6192d81 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -29,21 +29,23 @@ EOF
 }
 
 add_nodes() {
+  suffix=$IP_SUFFIX_START
   for i in $@
   do
     node=${i%:*}
     services=${i#*:}
-
+    let suffix++
+    ip="${IP_PREFIX}.$suffix"
     case $services in
       openvpn)
-        config='openvpn.gateway_address:10.5.5.98 openvpn.second_gateway_address:10.5.5.99'
+        config="openvpn.gateway_address:${IP_PREFIX}.98 openvpn.second_gateway_address:${IP_PREFIX}.99"
         ;;
       *)
         config=''
         ;;
     esac
 
-    $LEAP_CMD node add --local $node $config services:$services
+    $LEAP_CMD node add --local $node  ip_address:$ip  $config services:$services
   done
 }
 
@@ -81,6 +83,8 @@ create_provider() {
   $LEAP_CMD $OPTS add-user --self --ssh-pub-key=$SSHKEY
   $LEAP_CMD $OPTS cert ca && leap cert csr
 
+  # copy for faster testing
+  #cp $ROOTDIR/dh.pem.test $PROVIDERDIR/files/ca/dh.pem
   $LEAP_CMD $OPTS cert dh
   add_nodes $NODES
 }
@@ -92,10 +96,10 @@ deploy() {
 
   # we need to deploy with verbose level 2, and filter out unwanted stuff
   # until puppet errors show up in verbose level 0 +1 (#1750)
-  FILTER_CLI='= read|= loading|= no change|   - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path|   - cd .*; rsync -|   - hiera| = created hiera/|   - cd /root/|   - rolling backexecuting|   - files/ca/client_ca.crt|\[bin,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v|   - \[.*\] ok'
+  FILTER_CLI='= read|= loading|= no change|   - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path|   - cd .*; rsync -|   - hiera| = created hiera/|  = updated hiera/|   - cd /root/|   - rolling backexecuting|   - files/ca/client_ca.crt|\[bin,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v|   - \[.*\] ok'
 
   FILTER_PUPPET='] notice: |] No change to hostname|] Puppet apply complete|] warning: Dynamic lookup|] warning: Scope\(Class'
-  FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET)"
+  FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_COMMON)"
 
 
   for vm in $@
@@ -113,11 +117,16 @@ deploy() {
     if [ -s $ERRLOG1 ]
     then
       versions=`versions`
-      msg="From: $MAIL_FROM\nTo: $MAIL_TO\nSubject: Deploy to \"$vm\" had errors !\n\n"
-      msg="$msg \nOutput of error log below:\n `cat $ERRLOG1` \n\n"
-      msg="$msg\n Tested with following versions/git commit IDs: \n$versions"
-      echo "Deploy to \"$vm\" on `date` had errors." | tee -a $LOG1 $LOG2 $ERRLOG2
+      msg="From: $MAIL_FROM\nTo: $MAIL_TO\nSubject: leap_platform $PLATFORM_BRANCH branch on \"$vm\" had errors !\n\n"
+      echo "`date`: $msg" | tee -a $LOG1 $LOG2 $ERRLOG2
       echo
+      msg="${msg} Output of error log below:\n\n`cat $ERRLOG1` \n\n"
+      msg="${msg}-------------------------------------------------------------------\n\n"
+      msg="${msg}error log: ${ERRLOG1}\n"
+      msg="${msg}comlete log: ${LOG2}\n\n"
+
+      msg="${msg}Tested on `date` on \"$vm\" with following versions/git commit IDs: \n\n$versions"
+
       cat $ERRLOG1 
       
       if [ "$MAIL_TO" != '' ]; then
@@ -180,6 +189,8 @@ wait_for_node() {
       ip_pingable $ip && online=1
       sleep 1
   done
+  # wait until ssh is up
+  sleep 4
 }
 
 update_leap_cli () {
@@ -209,19 +220,16 @@ versions () {
     provider_head='not under version control'
   fi  
 
-  echo "Provider:"
-  echo 
-  echo "provider ($PROVIDERDIR): $provider_head"
+  echo "Provider ($PROVIDERDIR): $provider_head"
   echo
 
-  echo "leap_cli:"
-  echo
-  echo leap cli: $cli_head
+  #echo leap cli: $cli_head
   $LEAP_CMD -v 2 list | grep ' = leap command v'
   echo "$cli_commit"
   echo
+  echo
   
-  echo "leap_platform:"
+  #echo "leap_platform:"
   $LEAP_CMD -v 2 list | grep ' = leap platform v'
   echo "$platform_commit"
   echo
@@ -235,6 +243,8 @@ versions () {
 config=""
 all=false
 print_versions=false
+# default in lib/leap_cli/leapfile.rb
+IP_PREFIX='10.5.5'
 
 if ! options=$(getopt -o avVc:h -l all,verbose,versions,config:,help -- "$@")
 then