From 91bde4f9268b93c5b716d5f60c775af89db1d412 Mon Sep 17 00:00:00 2001 From: Likitha Shetty Date: Tue, 15 May 2012 16:34:35 +0530 Subject: [PATCH] CS-14732. ec2-revoke: Revoking an ingress rule relatng one cidr results in revoking an ingress rule pointing to a different cidr, when the protocol and port are the same. Resolved. In the request set the cidr correctly. --- awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java index 7177c4e5034..3787b74e0db 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java +++ b/awsapi/src/com/cloud/bridge/service/EC2SoapServiceImpl.java @@ -155,8 +155,10 @@ public class EC2SoapServiceImpl implements AmazonEC2SkeletonInterface { IpRangeSetType ranges = ipPerm.getIpRanges(); if (ranges != null && ranges.getItem() != null) { IpRangeItemType[] rangeItems = ranges.getItem(); - for (IpRangeItemType ipRange: rangeItems) - perm.addIpRange( ipRange.getCidrIp() ); + for (IpRangeItemType ipRange: rangeItems) { + perm.addIpRange( ipRange.getCidrIp() ); + perm.setCIDR(ipRange.getCidrIp()); + } } request.addIpPermission( perm );