Include project info for job results for /api/jobs/import

rundeck · Feb 14, 2011 · 5dcd7c5 · 5dcd7c5
1 parent 01ee98c
commit 5dcd7c5
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 4 deletions.
diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -2329,6 +2329,7 @@ class ScheduledExecutionController  {
                     id(job.scheduledExecution.id.toString())
                     name(job.scheduledExecution.jobName)
                     group(job.scheduledExecution.groupPath?:'')
+                    project(job.scheduledExecution.project)
                     url(g.createLink(action:'show',id:job.scheduledExecution.id))
                 }
             }
@@ -2342,6 +2343,7 @@ class ScheduledExecutionController  {
                     }
                     name(job.scheduledExecution.jobName)
                     group(job.scheduledExecution.groupPath?:'')
+                    project(job.scheduledExecution.project)
                     StringBuffer sb = new StringBuffer()
                     job.scheduledExecution?.errors?.allErrors?.each{err->
                         if(sb.size()>0){
@@ -2369,6 +2371,7 @@ class ScheduledExecutionController  {
                     }
                     name(job.scheduledExecution.jobName)
                     group(job.scheduledExecution.groupPath?:'')
+                    project(job.scheduledExecution.project)
                     StringBuffer sb = new StringBuffer()
                     if(job.errmsg){
                         if(sb.size()>0){

diff --git a/test/api/test-jobs-import-invalid.sh b/test/api/test-jobs-import-invalid.sh
@@ -5,6 +5,13 @@
 errorMsg() {
    echo "$*" 1>&2
 }
+assert(){
+    # assert expected, actual
+    if [ "$1" != "$2" ] ; then
+        errorMsg "FAIL: Expected value \"$1\" but saw: \"$2\" ${3}"
+        exit 2
+    fi
+}
 
 DIR=$(cd `dirname $0` && pwd)
 
@@ -91,6 +98,80 @@ echo "TEST: /jobs/import without expected file content"
 CURL_REQ_OPTS="-F x=y" sh $DIR/api-expect-error.sh "${runurl}" "${params}" "No file was uploaded" || exit 2
 echo "OK"
 
+##
+# specify invalid import content
+##
+
+#No context/project value
+cat > $DIR/temp.out <<END
+<joblist>
+   <job>
+      <name>cli job</name>
+      <group>api-test</group>
+      <description></description>
+      <loglevel>INFO</loglevel>
+      <context>
+          <project>DNEProj</project>
+      </context>
+      <dispatch>
+        <threadcount>1</threadcount>
+        <keepgoing>true</keepgoing>
+      </dispatch>
+      <sequence>
+        <command>
+        <exec>$xmlargs</exec>
+        </command>
+      </sequence>
+   </job>
+</joblist>
+
+END
+
+params="format=xml"
+# specify the file for upload with curl, named "xmlBatch"
+ulopts="-F xmlBatch=@$DIR/temp.out"
+
+echo "TEST: /jobs/import with bad definition"
+
+# get listing
+$CURL $ulopts --header "$VERSHEADER" ${runurl}?${params} > $DIR/curl.out
+if [ 0 != $? ] ; then
+    errorMsg "ERROR: failed query request"
+    exit 2
+fi
+
+sh $DIR/api-test-success.sh $DIR/curl.out || exit 2
+
+# expect a /result/failed item
+
+failedcount=$($XMLSTARLET sel -T -t -v "/result/failed/@count" $DIR/curl.out)
+succount=$($XMLSTARLET sel -T -t -v "/result/succeeded/@count" $DIR/curl.out)
+skipcount=$($XMLSTARLET sel -T -t -v "/result/skipped/@count" $DIR/curl.out)
+
+if [ "1" != "$failedcount" ] ; then
+    errorMsg  "Upload was not successful."
+    exit 2
+fi
+
+# verify results
+jid=$($XMLSTARLET sel -T -t -v "/result/failed/job/id" $DIR/curl.out)
+jname=$($XMLSTARLET sel -T -t -v "/result/failed/job/name" $DIR/curl.out)
+jgroup=$($XMLSTARLET sel -T -t -v "/result/failed/job/group" $DIR/curl.out)
+jproj=$($XMLSTARLET sel -T -t -v "/result/failed/job/project" $DIR/curl.out)
+
+assert "cli job" "$jname" "Wrong job name: $jname"
+assert "api-test" "$jgroup" "Wrong job group: $jgroup"
+assert "DNEProj" "$jproj" "Wrong job project: $jproj"
+
+if [ "" != "$jid" ] ; then
+    errorMsg "Did not expect job id in result: $jid"
+    exit 2
+fi
+
+echo "OK"
+
+
+
 rm $DIR/curl.out
 rm $DIR/temp.out
 
diff --git a/test/api/test-jobs-import.sh b/test/api/test-jobs-import.sh
@@ -5,6 +5,14 @@
 errorMsg() {
    echo "$*" 1>&2
 }
+assert(){
+    # assert expected, actual
+    if [ "$1" != "$2" ] ; then
+        errorMsg "FAIL: Expected value \"$1\" but saw: \"$2\" ${3}"
+        exit 2
+    fi
+}
+
 
 DIR=$(cd `dirname $0` && pwd)
 
@@ -88,11 +96,24 @@ skipcount=$($XMLSTARLET sel -T -t -v "/result/skipped/@count" $DIR/curl.out)
 if [ "1" != "$succount" ] ; then
     errorMsg  "Upload was not successful."
     exit 2
-else
-    echo "OK"
 fi
 
+# verify results
+jid=$($XMLSTARLET sel -T -t -v "/result/succeeded/job/id" $DIR/curl.out)
+jname=$($XMLSTARLET sel -T -t -v "/result/succeeded/job/name" $DIR/curl.out)
+jgroup=$($XMLSTARLET sel -T -t -v "/result/succeeded/job/group" $DIR/curl.out)
+jproj=$($XMLSTARLET sel -T -t -v "/result/succeeded/job/project" $DIR/curl.out)
 
-rm $DIR/curl.out
-rm $DIR/temp.out
+assert "cli job" "$jname" "Wrong job name: $jname"
+assert "api-test" "$jgroup" "Wrong job group: $jgroup"
+assert "$project" "$jproj" "Wrong job project: $jproj"
+
+if [ -z "$jid" ] ; then
+    errorMsg "Expected job id in result: $jid"
+    exit 2
+fi
 
+echo "OK"
+
+rm $DIR/curl.out
+rm $DIR/temp.out