apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS-19828: EC2 API tool errors while parsing response for detachVolume, describeAddress and revokeSecurityGroupIngress

Browse Source 
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
This commit is contained in:
Prachi Damle 2014-07-14 16:29:11 -07:00
parent 5b37c65577
commit 2f2efb0954
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
View File

@ -30,15 +30,12 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.UUID; import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import com.cloud.bridge.model.CloudStackServiceOfferingVO; import com.cloud.bridge.model.CloudStackServiceOfferingVO;
import com.cloud.bridge.persist.dao.CloudStackAccountDao; import com.cloud.bridge.persist.dao.CloudStackAccountDao;
import com.cloud.bridge.persist.dao.CloudStackSvcOfferingDao; 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.stack.models.CloudStackZone;
import com.cloud.utils.component.ManagerBase; import com.cloud.utils.component.ManagerBase;
/** /**
* EC2Engine processes the ec2 commands and calls their cloudstack analogs * EC2Engine processes the ec2 commands and calls their cloudstack analogs
* *
@ -1175,6 +1173,7 @@ public class EC2Engine extends ManagerBase {
resp.setState(vol.getState()); resp.setState(vol.getState());
resp.setType(vol.getVolumeType()); resp.setType(vol.getVolumeType());
resp.setVMState(vol.getVirtualMachineState()); resp.setVMState(vol.getVirtualMachineState());
resp.setAttachmentState("detached");
resp.setZoneName(vol.getZoneName()); resp.setZoneName(vol.getZoneName());
} }
} catch (Exception e) { } catch (Exception e) {

2
awsapi/src/com/cloud/stack/models/ApiConstants.java
View File

@ -394,7 +394,7 @@ public class ApiConstants {
public static final String RESTART_NETWORK = "restartNetwork"; public static final String RESTART_NETWORK = "restartNetwork";
public static final String RESTART_NETWORK_RESPONSE = "restartnetworkresponse"; 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 = "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_ID = "rootdeviceid";
public static final String ROOT_DEVICE_TYPE = "rootdevicetype"; public static final String ROOT_DEVICE_TYPE = "rootdevicetype";
public static final String RULE_ID = "ruleid"; public static final String RULE_ID = "ruleid";