Repository: cloudstack
Updated Branches:
refs/heads/master 5b37c6557 -> 2f2efb095
CS-19828: EC2 API tool errors while parsing response for detachVolume,
describeAddress and revokeSecurityGroupIngress
Changes:
- Set the mandatory response properties in case of DetachVolume and
DescribeAddress API responses
- Use the correct CS API responsename for revokesecuritygroupingress
Conflicts:
awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2f2efb09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2f2efb09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2f2efb09
Branch: refs/heads/master
Commit: 2f2efb095454025b51dafd08dcbb31e4e83d3cdb
Parents: 5b37c65
Author: Prachi Damle <prachi.da...@citrix.com>
Authored: Mon Jul 14 16:29:11 2014 -0700
Committer: Prachi Damle <prachi.da...@citrix.com>
Committed: Wed Jul 16 14:28:11 2014 -0700
----------------------------------------------------------------------
awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java | 5 ++---
awsapi/src/com/cloud/stack/models/ApiConstants.java | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f2efb09/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index 41fe56e..c8b0099 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -30,15 +30,12 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.UUID;
-
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import javax.xml.parsers.ParserConfigurationException;
-
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.xml.sax.SAXException;
-
import com.cloud.bridge.model.CloudStackServiceOfferingVO;
import com.cloud.bridge.persist.dao.CloudStackAccountDao;
import com.cloud.bridge.persist.dao.CloudStackSvcOfferingDao;
@@ -75,6 +72,7 @@ import com.cloud.stack.models.CloudStackVolume;
import com.cloud.stack.models.CloudStackZone;
import com.cloud.utils.component.ManagerBase;
+
/**
* EC2Engine processes the ec2 commands and calls their cloudstack analogs
*
@@ -1175,6 +1173,7 @@ public class EC2Engine extends ManagerBase {
resp.setState(vol.getState());
resp.setType(vol.getVolumeType());
resp.setVMState(vol.getVirtualMachineState());
+ resp.setAttachmentState("detached");
resp.setZoneName(vol.getZoneName());
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f2efb09/awsapi/src/com/cloud/stack/models/ApiConstants.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/stack/models/ApiConstants.java
b/awsapi/src/com/cloud/stack/models/ApiConstants.java
index 8eeebb0..e54f238 100644
--- a/awsapi/src/com/cloud/stack/models/ApiConstants.java
+++ b/awsapi/src/com/cloud/stack/models/ApiConstants.java
@@ -394,7 +394,7 @@ public class ApiConstants {
public static final String RESTART_NETWORK = "restartNetwork";
public static final String RESTART_NETWORK_RESPONSE =
"restartnetworkresponse";
public static final String REVOKE_SECURITY_GROUP_INGRESS =
"revokeSecurityGroupIngress";
- public static final String REVOKE_SECURITY_GROUP_INGRESS_RESPONSE =
"revokesecuritygroupingress";
+ public static final String REVOKE_SECURITY_GROUP_INGRESS_RESPONSE =
"revokesecuritygroupingressresponse";
public static final String ROOT_DEVICE_ID = "rootdeviceid";
public static final String ROOT_DEVICE_TYPE = "rootdevicetype";
public static final String RULE_ID = "ruleid";
