Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #697 from vijaykiran/issue-816 

Fixes #816 unable to set security group ingress with AWSEC2Client
This commit is contained in:
Adrian Cole 2012-07-04 15:27:31 -07:00
parent bc94e367ce 769ace1640
commit f95070a88e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/ec2/src/main/java/org/jclouds/ec2/util/IpPermissions.java
View File

@ -73,8 +73,9 @@ public class IpPermissions extends IpPermissionImpl {
i = 0; i = 0;
for (Entry<String, String> userIdGroupNamePair : checkNotNull(permission.getUserIdGroupPairs(), for (Entry<String, String> userIdGroupNamePair : checkNotNull(permission.getUserIdGroupPairs(),
"userIdGroupNamePairs").entries()) { "userIdGroupNamePairs").entries()) {
headers.put(prefix + i++ + ".UserId", userIdGroupNamePair.getKey()); headers.put(prefix + i + ".UserId", userIdGroupNamePair.getKey());
headers.put(prefix + i + ".GroupName", userIdGroupNamePair.getValue()); headers.put(prefix + i + ".GroupName", userIdGroupNamePair.getValue());
i++;
} }
prefix = "IpPermissions.%d.IpRanges."; prefix = "IpPermissions.%d.IpRanges.";
i = 0; i = 0;

2
apis/ec2/src/test/java/org/jclouds/ec2/util/IpPermissionsTest.java
View File

@ -103,6 +103,6 @@ public class IpPermissionsTest {
"groupId"); "groupId");
assertEquals( assertEquals(
IpPermissions.buildFormParametersForIndex(0, authorization).toString(), IpPermissions.buildFormParametersForIndex(0, authorization).toString(),
"{IpPermissions.0.IpProtocol=[icmp], IpPermissions.0.FromPort=[-1], IpPermissions.0.ToPort=[-1], IpPermissions.0.Groups.0.UserId=[userId], IpPermissions.0.Groups.1.GroupName=[groupId]}"); "{IpPermissions.0.IpProtocol=[icmp], IpPermissions.0.FromPort=[-1], IpPermissions.0.ToPort=[-1], IpPermissions.0.Groups.0.UserId=[userId], IpPermissions.0.Groups.0.GroupName=[groupId]}");
} }
} }