Merge branch 'hqapi-2.x'

ChangeLog

@@ -79,6 +79,8 @@ Changes in HQApi 3.0
 
 Changes in HQApi 2.4
 
+ *) [HHQ-3960] Allow filtering of alert definitions by priority.
+
  *) [HHQ-3925] Add agent transferPlugin() AgentAPI and associated CLI command
 
  *) [HHQ-3924] Add agent ping CLI command.

src/org/hyperic/hq/hqapi1/tools/AlertDefinitionCommand.java

@@ -67,6 +67,7 @@ public class AlertDefinitionCommand extends AbstractCommand {
     private static String OPT_RESOURCE_NAME = "resourceName";
     private static String OPT_RESOURCE_DESC = "resourceDescription";
     private static String OPT_ALERT_NAME = "alertName";
+    private static String OPT_ALERT_PRIORITY = "alertPriority";
     private static String OPT_ID   = "id";
     private static String OPT_BATCH_SIZE = "batchSize";
     private static String OPT_ESCLATION = "escalation";
@@ -152,6 +153,10 @@ private void list(String[] args) throws Exception {
                                     "which have at least one condition of the " +
                                     "given type")
                 .withRequiredArg().ofType(Integer.class);
+        p.accepts(OPT_ALERT_PRIORITY, "If specified, only include alerts with " +
+                                      "the given priority.  3 = high, 2 = medium, " +
+                                      "1 = low")
+                .withRequiredArg().ofType(Integer.class);
 
         OptionSet options = getOptions(p, args);
 
@@ -254,6 +259,17 @@ private void list(String[] args) throws Exception {
             }
         }
 
+        if (options.has(OPT_ALERT_PRIORITY)) {
+            Integer priority = (Integer)getRequired(options, OPT_ALERT_PRIORITY);
+            for (Iterator<AlertDefinition> i =
+                    alertDefs.getAlertDefinition().iterator(); i.hasNext(); ) {
+                AlertDefinition d = i.next();
+                if (d.getPriority() != priority) {
+                    i.remove();
+                }
+            }
+        }
+
         checkSuccess(alertDefs);
         XmlUtil.serialize(alertDefs, System.out, Boolean.TRUE);        
     }