Minor changes and refactorings

Auxiliary scripts added.
CSV target files added.
Refactored/simplified some of the scripts.

Jenkinsfile

@@ -59,7 +59,7 @@ pipeline {
                         sh 'echo Docker containers before compositions tests ; docker ps -a'		// temporary
 
                         sh '(cd demo/simple ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
-                        sh '(cd demo/shibboleth ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
+                        //sh '(cd demo/shibboleth ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                         sh '(cd demo/postgresql ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                         // sh '(cd demo/complex ; bats tests ) 2>&1 | tee -a debug ; test ${PIPESTATUS[0]} -eq 0'
                     } catch (error) {

demo/complex/add-ref-groups.sh

@@ -1,2 +1,6 @@
-docker cp add-ref-groups.gsh complex_grouper_daemon_1:/tmp/
-docker exec complex_grouper_daemon_1 bash -c "/opt/grouper/grouper.apiBinary/bin/gsh /tmp/add-ref-groups.gsh"
+source ../../library.bash
+
+execute_gsh complex_grouper_daemon_1 add-ref-groups.gsh
+
+#docker cp add-ref-groups.gsh complex_grouper_daemon_1:/tmp/
+#docker exec complex_grouper_daemon_1 bash -c "/opt/grouper/grouper.apiBinary/bin/gsh /tmp/add-ref-groups.gsh"

demo/complex/get-import-sis-courses-status.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ../../library.bash
+
+get_task_execution_status "Import from SIS courses"

demo/complex/get-import-sis-persons-status.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source ../../library.bash
+
+get_task_execution_status "Import from SIS persons"

demo/complex/midpoint_server/container_files/mp-home/cs-portal.csv

@@ -0,0 +1 @@
+identifier,name,mail,courses

demo/complex/midpoint_server/container_files/mp-home/faculty-portal.csv

@@ -0,0 +1 @@
+uid,givenName,familyName,fullName,mail

demo/complex/midpoint_server/container_files/mp-home/mailing-lists.csv

@@ -0,0 +1 @@
+uid,mail,lists

demo/complex/update-bgasper-in-grouper.sh

@@ -1,2 +1,8 @@
-docker cp update-bgasper-in-grouper.gsh complex_grouper_daemon_1:/tmp/
-docker exec complex_grouper_daemon_1 bash -c "/opt/grouper/grouper.apiBinary/bin/gsh /tmp/update-bgasper-in-grouper.gsh"
+#!/bin/bash
+
+source ../../library.bash
+
+#docker cp update-bgasper-in-grouper.gsh complex_grouper_daemon_1:/tmp/
+#docker exec complex_grouper_daemon_1 bash -c "/opt/grouper/grouper.apiBinary/bin/gsh /tmp/update-bgasper-in-grouper.gsh"
+
+execute_gsh complex_grouper_daemon_1 update-bgasper-in-grouper.gsh

demo/complex/upload-async-update-task.sh

@@ -1,17 +1,5 @@
 #!/bin/bash
 
-function upload () {
-  local filename=$1
-  local regex="midpoint-objects.*/(.*)/(.*)"
-  if [[ $filename =~ $regex ]]
-  then
-    type="${BASH_REMATCH[1]}"
-    oid=`cat $filename | sed -n 's:.*oid=\"\([A-Za-z0-9\-]*\)\".*:\1:p' | sed -n '1 p'`
-    echo "Uploading $filename ($type, $oid)"
-    curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X PUT "https://localhost:8443/midpoint/ws/rest/$type/$oid?options=overwrite" --data-binary @$filename
-  else
-    echo "Skipping $filename"
-  fi
-}
+source ../../library.bash
 
-upload midpoint-objects-manual/tasks/task-async-update-grouper.xml
+upload_from_file midpoint-objects-manual/tasks/task-async-update-grouper.xml

demo/complex/upload-import-sis-courses.sh

@@ -1,17 +1,5 @@
 #!/bin/bash
 
-function upload () {
-  local filename=$1
-  local regex="midpoint-objects.*/(.*)/(.*)"
-  if [[ $filename =~ $regex ]]
-  then
-    type="${BASH_REMATCH[1]}"
-    oid=`cat $filename | sed -n 's:.*oid=\"\([A-Za-z0-9\-]*\)\".*:\1:p' | sed -n '1 p'`
-    echo "Uploading $filename ($type, $oid)"
-    curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X PUT "https://localhost:8443/midpoint/ws/rest/$type/$oid?options=overwrite" --data-binary @$filename
-  else
-    echo "Skipping $filename"
-  fi
-}
+source ../../library.bash
 
-upload midpoint-objects-manual/tasks/task-import-sis-courses.xml
+upload_from_file midpoint-objects-manual/tasks/task-import-sis-courses.xml

demo/complex/upload-import-sis-persons.sh

@@ -1,17 +1,5 @@
 #!/bin/bash
 
-function upload () {
-  local filename=$1
-  local regex="midpoint-objects.*/(.*)/(.*)"
-  if [[ $filename =~ $regex ]]
-  then
-    type="${BASH_REMATCH[1]}"
-    oid=`cat $filename | sed -n 's:.*oid=\"\([A-Za-z0-9\-]*\)\".*:\1:p' | sed -n '1 p'`
-    echo "Uploading $filename ($type, $oid)"
-    curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X PUT "https://localhost:8443/midpoint/ws/rest/$type/$oid?options=overwrite" --data-binary @$filename
-  else
-    echo "Skipping $filename"
-  fi
-}
+source ../../library.bash
 
-upload midpoint-objects-manual/tasks/task-import-sis-persons.xml
+upload_from_file midpoint-objects-manual/tasks/task-import-sis-persons.xml

demo/complex/upload-reconcile-grouper-groups.sh

@@ -1,17 +1,5 @@
 #!/bin/bash
 
-function upload () {
-  local filename=$1
-  local regex="midpoint-objects.*/(.*)/(.*)"
-  if [[ $filename =~ $regex ]]
-  then
-    type="${BASH_REMATCH[1]}"
-    oid=`cat $filename | sed -n 's:.*oid=\"\([A-Za-z0-9\-]*\)\".*:\1:p' | sed -n '1 p'`
-    echo "Uploading $filename ($type, $oid)"
-    curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X PUT "https://localhost:8443/midpoint/ws/rest/$type/$oid?options=overwrite" --data-binary @$filename
-  else
-    echo "Skipping $filename"
-  fi
-}
+source ../../library.bash
 
-upload midpoint-objects-manual/tasks/task-reconciliation-grouper-groups.xml
+upload_from_file midpoint-objects-manual/tasks/task-reconciliation-grouper-groups.xml

demo/complex/upload-reconcile-grouper-users.sh

@@ -1,17 +1,5 @@
 #!/bin/bash
 
-function upload () {
-  local filename=$1
-  local regex="midpoint-objects.*/(.*)/(.*)"
-  if [[ $filename =~ $regex ]]
-  then
-    type="${BASH_REMATCH[1]}"
-    oid=`cat $filename | sed -n 's:.*oid=\"\([A-Za-z0-9\-]*\)\".*:\1:p' | sed -n '1 p'`
-    echo "Uploading $filename ($type, $oid)"
-    curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X PUT "https://localhost:8443/midpoint/ws/rest/$type/$oid?options=overwrite" --data-binary @$filename
-  else
-    echo "Skipping $filename"
-  fi
-}
+source ../../library.bash
 
-upload midpoint-objects-manual/tasks/task-reconciliation-grouper-users.xml
+upload_from_file midpoint-objects-manual/tasks/task-reconciliation-grouper-users.xml

library.bash

@@ -304,7 +304,7 @@ function search_objects_by_name () {
 EOF
     local HTTP_CODE=$(sed '$!d' <<<"$(cat $TMPFILE)")
     sed -i '$ d' $TMPFILE
-    cat $TMPFILE
+    # cat $TMPFILE
 
     if [ "$HTTP_CODE" -eq 200 ]; then
         SEARCH_RESULT_FILE=$TMPFILE
@@ -418,6 +418,14 @@ function wait_for_task_completion () {
     return 1
 }
 
+function get_task_execution_status () {
+    local NAME=$1
+
+    search_objects_by_name tasks "$NAME"
+    TASK_EXECUTION_STATUS=$(xmllint --xpath "/*/*/*[local-name()='executionStatus']/text()" $SEARCH_RESULT_FILE) || (echo "Couldn't extract task status from task $NAME" ; cat $SEARCH_RESULT_FILE ; rm $SEARCH_RESULT_FILE ; return 1)
+    echo "Task execution status: $TASK_EXECUTION_STATUS"
+    return 0
+}
 
 function search_ldap_object_by_filter () {
     local BASE_CONTEXT_FOR_SEARCH=$1
@@ -556,3 +564,25 @@ function get_messages () {
     fi
     return 0
 }
+
+function upload_from_file () {
+  local FILENAME=$1
+  local OPTIONS_TO_ADD=$2
+  local REGEX="midpoint-objects.*/(.*)/(.*)"
+  if [[ $FILENAME =~ $REGEX ]]
+  then
+    TYPE="${BASH_REMATCH[1]}"
+    OID=`cat $FILENAME | sed -n 's:.*oid=\"\([A-Za-z0-9\-]*\)\".*:\1:p' | sed -n '1 p'`
+    echo "Uploading $FILENAME ($TYPE, $OID)"
+    curl -k --user administrator:5ecr3t -H "Content-Type: application/xml" -X PUT "https://localhost:8443/midpoint/ws/rest/$TYPE/$OID?options=overwrite$OPTIONS_TO_ADD" --data-binary @$FILENAME
+  else
+    echo "Skipping $FILENAME"
+  fi
+}
+
+function execute_gsh () {
+  local CONTAINER=$1
+  local FILE=$2
+  docker cp $FILE $CONTAINER:/tmp/
+  docker exec $CONTAINER bash -c "/opt/grouper/grouper.apiBinary/bin/gsh /tmp/$FILE"
+}