You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by li...@apache.org on 2014/01/31 06:31:10 UTC
git commit: updated refs/heads/master to 7f6b3c0
Updated Branches:
refs/heads/master 580ebb001 -> 7f6b3c08d
CLOUDSTACK-5998. [AWSAPI] describe addresses call returns a fault with "domain cannot be null!!".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7f6b3c08
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7f6b3c08
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7f6b3c08
Branch: refs/heads/master
Commit: 7f6b3c08db5fb3809ffab1a181df2392333f4e24
Parents: 580ebb0
Author: Likitha Shetty <li...@citrix.com>
Authored: Fri Jan 31 10:52:02 2014 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Fri Jan 31 10:52:50 2014 +0530
----------------------------------------------------------------------
awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f6b3c08/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
----------------------------------------------------------------------
diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
index dac18e4..d44f1d1 100644
--- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
+++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java
@@ -1977,6 +1977,7 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface {
DescribeAddressesResponseItemType item = new DescribeAddressesResponseItemType();
item.setPublicIp(addr.getIpAddress());
item.setInstanceId(addr.getAssociatedInstanceId());
+ item.setDomain("standard"); // Since VPC is not supported by AWSAPI default to 'standard'
items.add(item);
}
DescribeAddressesResponseInfoType descAddrRespInfoType = new DescribeAddressesResponseInfoType();