Fix api nodefilter issues [#324 state:needs_verification]

rundeck · Jun 3, 2011 · 25c058d · 25c058d
2 parents 2ec51f5 + 28f3dd5
commit 25c058d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -2850,9 +2850,14 @@ class ScheduledExecutionController  {
         //convert api parameters to node filter parameters
         def filters = FrameworkController.extractApiNodeFilterParams(params)
         if (filters) {
+            inparams.extra['_replaceNodeFilters']='true'
+            inparams.extra['doNodedispatch']=true
             filters.each {k, v ->
                 inparams.extra[k] = v
             }
+            if(null==inparams.extra['nodeExcludePrecedence']){
+                inparams.extra['nodeExcludePrecedence'] = true
+            }
         }
 
         def result = executeScheduledExecution(scheduledExecution, framework, rolelist, inparams)
@@ -2932,9 +2937,13 @@ class ScheduledExecutionController  {
         //convert api parameters to node filter parameters
         def filters=FrameworkController.extractApiNodeFilterParams(params)
         if(filters){
+            filters['doNodedispatch']=true
             filters.each{k,v->
                 params[k]=v
             }
+            if (null == params['nodeExcludePrecedence']) {
+                params['nodeExcludePrecedence'] = true
+            }
         }
 
         def results=runAdhoc()
@@ -3000,9 +3009,13 @@ class ScheduledExecutionController  {
         //convert api parameters to node filter parameters
         def filters=FrameworkController.extractApiNodeFilterParams(params)
         if(filters){
+            filters['doNodedispatch'] = true
             filters.each{k,v->
                 params[k]=v
             }
+            if (null == params['nodeExcludePrecedence']) {
+                params['nodeExcludePrecedence'] = true
+            }
         }
 
         def results=runAdhoc()

diff --git a/rundeckapp/grails-app/services/ExecutionService.groovy b/rundeckapp/grails-app/services/ExecutionService.groovy
@@ -765,18 +765,18 @@ class ExecutionService implements ApplicationContextAware, CommandInterpreter{
      */
     public static NodeSet filtersAsNodeSet(BaseNodeFilters econtext) {
         final NodeSet nodeset = new NodeSet();
-        nodeset.createExclude(excludeFiltersAsNodeSetMap(econtext)).setDominant(econtext.nodeExcludePrecedence);
-        nodeset.createInclude(includeFiltersAsNodeSetMap(econtext)).setDominant(!econtext.nodeExcludePrecedence);
+        nodeset.createExclude(excludeFiltersAsNodeSetMap(econtext)).setDominant(econtext.nodeExcludePrecedence ? true : false);
+        nodeset.createInclude(includeFiltersAsNodeSetMap(econtext)).setDominant(!econtext.nodeExcludePrecedence ? true : false);
         return nodeset
     }
     /**
      * Return a NodeSet using the filters in the execution context
      */
     public static NodeSet filtersAsNodeSet(ExecutionContext econtext) {
         final NodeSet nodeset = new NodeSet();
-        nodeset.createExclude(excludeFiltersAsNodeSetMap(econtext)).setDominant(econtext.nodeExcludePrecedence);
-        nodeset.createInclude(includeFiltersAsNodeSetMap(econtext)).setDominant(!econtext.nodeExcludePrecedence);
-        nodeset.setKeepgoing(econtext.nodeKeepgoing)
+        nodeset.createExclude(excludeFiltersAsNodeSetMap(econtext)).setDominant(econtext.nodeExcludePrecedence ? true : false);
+        nodeset.createInclude(includeFiltersAsNodeSetMap(econtext)).setDominant(!econtext.nodeExcludePrecedence ? true : false);
+        nodeset.setKeepgoing(econtext.nodeKeepgoing?true:false)
         nodeset.setThreadCount(econtext.nodeThreadcount?econtext.nodeThreadcount:1)
         return nodeset
     }