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 41fe56e3308..c8b0099f7aa 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) { diff --git a/awsapi/src/com/cloud/stack/models/ApiConstants.java b/awsapi/src/com/cloud/stack/models/ApiConstants.java index 8eeebb025b7..e54f23895c4 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";