From 96dffa2155f99eea15b690fe5a293c2407b76439 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Wed, 9 May 2012 23:19:56 -0700
Subject: [PATCH] CS-14837 [ec2-describe-snapshots] Unable to find
 responseObjName:[snapshot]. Returning null! Exception:
 java.lang.NumberFormatException: For input string: <job-id>

- Changing JobId to String since CS 3.0.x uses String Ids now.
---
 .../stack/models/CloudStackPortForwardingRule.java   | 12 ++++++------
 .../cloud/stack/models/CloudStackSecurityGroup.java  |  4 ++--
 .../com/cloud/stack/models/CloudStackSnapshot.java   |  4 ++--
 .../cloud/stack/models/CloudStackSnapshotPolicy.java |  8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java b/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java
index 3697686e8f9..208f32dae07 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackPortForwardingRule.java
@@ -24,13 +24,13 @@ import com.google.gson.annotations.SerializedName;
  */
 public class CloudStackPortForwardingRule {
 	@SerializedName(ApiConstants.ID)
-	private Long id;
+	private String id;
 	@SerializedName(ApiConstants.CIDR_LIST)
 	private String cidrList;
 	@SerializedName(ApiConstants.IP_ADDRESS)
 	private String ipAddress;
 	@SerializedName(ApiConstants.IP_ADDRESS_ID)
-	private Long ipAddressId;
+	private String ipAddressId;
 	@SerializedName(ApiConstants.PRIVATE_END_PORT)
 	private Long privateEndPort;
 	@SerializedName(ApiConstants.PRIVATE_PORT)
@@ -46,7 +46,7 @@ public class CloudStackPortForwardingRule {
 	@SerializedName(ApiConstants.VIRTUAL_MACHINE_DISPLAY_NAME)
 	private String virtualMachineDisplayName;
 	@SerializedName(ApiConstants.VIRTUAL_MACHINE_ID)
-	private Long virtualMachineId;
+	private String virtualMachineId;
 	@SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)
 	private String virtualMachineName;
 	
@@ -60,7 +60,7 @@ public class CloudStackPortForwardingRule {
 	/**
 	 * @return the id
 	 */
-	public Long getId() {
+	public String getId() {
 		return id;
 	}
 
@@ -81,7 +81,7 @@ public class CloudStackPortForwardingRule {
 	/**
 	 * @return the ipAddressId
 	 */
-	public Long getIpAddressId() {
+	public String getIpAddressId() {
 		return ipAddressId;
 	}
 
@@ -137,7 +137,7 @@ public class CloudStackPortForwardingRule {
 	/**
 	 * @return the virtualMachineId
 	 */
-	public Long getVirtualMachineId() {
+	public String getVirtualMachineId() {
 		return virtualMachineId;
 	}
 
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java b/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java
index e55b44e97ed..b978ef8f56a 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackSecurityGroup.java
@@ -31,7 +31,7 @@ public class CloudStackSecurityGroup {
     @SerializedName(ApiConstants.DOMAIN_ID)
     private String domainId;
     @SerializedName(ApiConstants.JOB_ID)
-    private Long jobId;
+    private String jobId;
     @SerializedName(ApiConstants.JOB_STATUS)
     private Integer jobStatus;
     @SerializedName(ApiConstants.NAME)
@@ -67,7 +67,7 @@ public class CloudStackSecurityGroup {
 		return domainName;
 	}
 
-	public Long getJobId() {
+	public String getJobId() {
 		return jobId;
 	}
 
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackSnapshot.java b/awsapi/src/com/cloud/stack/models/CloudStackSnapshot.java
index cb08df9326a..a43ff55409a 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackSnapshot.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackSnapshot.java
@@ -31,7 +31,7 @@ public class CloudStackSnapshot {
     @SerializedName(ApiConstants.INTERVAL_TYPE)
     private String intervalType;
     @SerializedName(ApiConstants.JOB_ID)
-    private Long jobId;
+    private String jobId;
     @SerializedName(ApiConstants.JOB_STATUS)
     private Integer jobStatus;
     @SerializedName(ApiConstants.NAME)
@@ -90,7 +90,7 @@ public class CloudStackSnapshot {
 		return name;
 	}
 
-	public Long getJobId() {
+	public String getJobId() {
 		return jobId;
 	}
 
diff --git a/awsapi/src/com/cloud/stack/models/CloudStackSnapshotPolicy.java b/awsapi/src/com/cloud/stack/models/CloudStackSnapshotPolicy.java
index b70e3ed842c..664c9fbccec 100644
--- a/awsapi/src/com/cloud/stack/models/CloudStackSnapshotPolicy.java
+++ b/awsapi/src/com/cloud/stack/models/CloudStackSnapshotPolicy.java
@@ -25,7 +25,7 @@ import com.google.gson.annotations.SerializedName;
 public class CloudStackSnapshotPolicy {
 	
 	@SerializedName(ApiConstants.ID)
-	private Long id;
+	private String id;
 	@SerializedName(ApiConstants.INTERVAL_TYPE)
 	private String intervalType;
 	@SerializedName(ApiConstants.MAX_SNAPS)
@@ -35,7 +35,7 @@ public class CloudStackSnapshotPolicy {
 	@SerializedName(ApiConstants.TIMEZONE)
 	private String timeZone;
 	@SerializedName(ApiConstants.VOLUME_ID)
-	private Long volumeId;
+	private String volumeId;
 
 	/**
 	 * 
@@ -46,7 +46,7 @@ public class CloudStackSnapshotPolicy {
 	/**
 	 * @return the id
 	 */
-	public Long getId() {
+	public String getId() {
 		return id;
 	}
 
@@ -81,7 +81,7 @@ public class CloudStackSnapshotPolicy {
 	/**
 	 * @return the volumeId
 	 */
-	public Long getVolumeId() {
+	public String getVolumeId() {
 		return volumeId;
 	}