From b5e28038cbc85e4e39bfc2b71927e2935b1f1673 Mon Sep 17 00:00:00 2001
From: Likitha Shetty <Likitha.Shetty@citrix.com>
Date: Thu, 7 Feb 2013 18:00:25 -0800
Subject: [PATCH] [EC2 Query API] DescribeAvailabilityZones doesn't have any
 filter support.

CLOUDSTACK-1118

Support will be available for filters - zone-name and message
---
 .../src/com/cloud/bridge/service/EC2RestServlet.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
index c3a86a00c69..8f364907595 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -107,6 +107,7 @@ import com.cloud.bridge.persist.dao.UserCredentialsDaoImpl;
 import com.cloud.bridge.service.controller.s3.ServiceProvider;
 import com.cloud.bridge.service.core.ec2.EC2AssociateAddress;
 import com.cloud.bridge.service.core.ec2.EC2AuthorizeRevokeSecurityGroup;
+import com.cloud.bridge.service.core.ec2.EC2AvailabilityZonesFilterSet;
 import com.cloud.bridge.service.core.ec2.EC2CreateImage;
 import com.cloud.bridge.service.core.ec2.EC2CreateKeyPair;
 import com.cloud.bridge.service.core.ec2.EC2CreateVolume;
@@ -1286,6 +1287,17 @@ public class EC2RestServlet extends HttpServlet {
                 if (null != value && 0 < value.length) EC2request.addZone( value[0] );
             }
         }		
+
+        // add filters
+        EC2Filter[] filterSet = extractFilters( request );
+        if ( filterSet != null ) {
+            EC2AvailabilityZonesFilterSet afs = new EC2AvailabilityZonesFilterSet();
+            for( int i=0; i < filterSet.length; i++ ) {
+                afs.addFilter(filterSet[i]);
+            }
+            EC2request.setFilterSet( afs );
+        }
+
         // -> execute the request
         DescribeAvailabilityZonesResponse EC2response = EC2SoapServiceImpl.toDescribeAvailabilityZonesResponse( ServiceProvider.getInstance().getEC2Engine().handleRequest( EC2request ));
         serializeResponse(response, EC2response);