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

JCLOUDS-1307: Invalidate SG on removal even if already externally deleted

This commit is contained in:
Svetoslav Neykov 2017-06-09 12:41:16 +03:00
parent 65ba26eca7
commit 624e4cb6af
No known key found for this signature in database
GPG Key ID: 979090BE59D0A896
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
View File

@ -23,6 +23,7 @@ import static com.google.common.collect.Iterables.transform;
import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.ruleCidrMatches;
import static org.jclouds.cloudstack.predicates.SecurityGroupPredicates.ruleGroupMatches;
import java.util.Map;
import java.util.Set;
import javax.inject.Inject;
@ -150,6 +151,7 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
api.getSecurityGroupApi().getSecurityGroup(id);
if (group == null) {
invalidateCache(id);
return false;
}
@ -159,17 +161,19 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
api.getSecurityGroupApi().deleteSecurityGroup(id);
// TODO find something better here maybe - hard to map zones to groups
for (Location location : locations.get()) {
groupCreator.invalidate(ZoneSecurityGroupNamePortsCidrs.builder()
.zone(location.getId())
.name(group.getName())
.build());
}
invalidateCache(id);
return true;
}
private void invalidateCache(String id) {
for (Map.Entry<ZoneAndName, org.jclouds.cloudstack.domain.SecurityGroup> sg : groupCreator.asMap().entrySet()) {
if (id.equals(sg.getValue().getId())) {
groupCreator.invalidate(sg.getKey());
break;
}
}
}
@Override
public SecurityGroup addIpPermission(IpPermission ipPermission, SecurityGroup group) {
checkNotNull(group, "group");

10
apis/ec2/src/main/java/org/jclouds/ec2/compute/extensions/EC2SecurityGroupExtension.java
View File

@ -172,17 +172,15 @@ public class EC2SecurityGroupExtension implements SecurityGroupExtension {
String region = parts[0];
String groupName = parts[1];
boolean deleted = false;
if (!client.getSecurityGroupApi().get().describeSecurityGroupsInRegion(region, groupName).isEmpty()) {
client.getSecurityGroupApi().get().deleteSecurityGroupInRegion(region, groupName);
// TODO: test this clear happens
groupCreator.invalidate(new RegionNameAndIngressRules(region, groupName, null, false, null));
return true;
deleted = true;
}
return false;
groupCreator.invalidate(new RegionNameAndIngressRules(region, groupName, null, false, null));
return deleted;
}
@Override
public SecurityGroup addIpPermission(IpPermission ipPermission, SecurityGroup group) {
String region = AWSUtils.getRegionFromLocationOrNull(group.getLocation());