CLOUDSTACK-1444. Fix EC2 Query API to support latest ec2 api version 2012-08-15 [Support for EC2 API version 2012-08-15]

Likitha Shetty · Likitha Shetty · commit d908f857496b · 2013-07-04T10:09:00.000+05:30
Signed-off-by: Likitha Shetty &lt;likitha.shetty@citrix.com&gt;
diff --git a/awsapi/conf/ec2-service.properties.in b/awsapi/conf/ec2-service.properties.in
@@ -18,7 +18,7 @@
 managementServer=127.0.0.1
 cloudAPIPort=8080
 cloudstackVersion=2.2.0
-WSDLVersion=2010-11-15
+WSDLVersion=2012-08-15
 keystore=xes.keystore
 keystorePass=apache
 
diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java
@@ -208,7 +208,7 @@ public void init( ServletConfig config ) throws ServletException {
             }
             String keystore  = EC2Prop.getProperty( "keystore" );
             keystorePassword = EC2Prop.getProperty( "keystorePass" );
-            wsdlVersion      = EC2Prop.getProperty( "WSDLVersion", "2010-11-15" );
+            wsdlVersion      = EC2Prop.getProperty( "WSDLVersion", "2012-08-15" );
             version = EC2Prop.getProperty( "cloudbridgeVersion", "UNKNOWN VERSION" );
 
             String installedPath = System.getenv("CATALINA_HOME");

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public void init( ServletConfig config ) throws ServletException {`
`208`	`208`	`}`
`209`	`209`	`String keystore = EC2Prop.getProperty( "keystore" );`
`210`	`210`	`keystorePassword = EC2Prop.getProperty( "keystorePass" );`
`211`		`- wsdlVersion = EC2Prop.getProperty( "WSDLVersion", "2010-11-15" );`
	`211`	`+ wsdlVersion = EC2Prop.getProperty( "WSDLVersion", "2012-08-15" );`
`212`	`212`	`version = EC2Prop.getProperty( "cloudbridgeVersion", "UNKNOWN VERSION" );`
`213`	`213`
`214`	`214`	`String installedPath = System.getenv("CATALINA_HOME");`