You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/11/03 21:35:47 UTC
git commit: Cleaning up CloudStack SecurityGroupExtension work
Updated Branches:
refs/heads/master e2f67a756 -> cf597121b
Cleaning up CloudStack SecurityGroupExtension work
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/cf597121
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/cf597121
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/cf597121
Branch: refs/heads/master
Commit: cf597121b264cf036823e662e32ce9150ecaf734
Parents: e2f67a7
Author: Andrew Bayer <an...@gmail.com>
Authored: Fri Nov 1 17:06:54 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Fri Nov 1 17:06:54 2013 -0700
----------------------------------------------------------------------
.../CloudStackSecurityGroupExtension.java | 45 ++++++++++----------
.../predicates/SecurityGroupPredicates.java | 16 +++----
...loudStackSecurityGroupExtensionLiveTest.java | 13 +++---
3 files changed, 36 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/cf597121/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
index 599c37c..0c7d54e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtension.java
@@ -151,31 +151,34 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
org.jclouds.cloudstack.domain.SecurityGroup group =
api.getSecurityGroupApi().getSecurityGroup(id);
- if (group != null) {
- for (IngressRule rule : group.getIngressRules()) {
- jobComplete.apply(api.getSecurityGroupApi().revokeIngressRule(rule.getId()));
- }
+ if (group == null) {
+ return false;
+ }
- 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());
- }
+ for (IngressRule rule : group.getIngressRules()) {
+ jobComplete.apply(api.getSecurityGroupApi().revokeIngressRule(rule.getId()));
+ }
+
+ api.getSecurityGroupApi().deleteSecurityGroup(id);
- return true;
+ // 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());
}
- return false;
+ return true;
}
@Override
public SecurityGroup addIpPermission(IpPermission ipPermission, SecurityGroup group) {
+ checkNotNull(group, "group");
+ checkNotNull(ipPermission, "ipPermission");
String id = checkNotNull(group.getId(), "group.getId()");
- if (ipPermission.getCidrBlocks().size() > 0) {
+ if (!ipPermission.getCidrBlocks().isEmpty()) {
jobComplete.apply(api.getSecurityGroupApi().authorizeIngressPortsToCIDRs(id,
ipPermission.getIpProtocol().toString().toUpperCase(),
ipPermission.getFromPort(),
@@ -183,7 +186,7 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
ipPermission.getCidrBlocks()));
}
- if (ipPermission.getTenantIdGroupNamePairs().size() > 0) {
+ if (!ipPermission.getTenantIdGroupNamePairs().isEmpty()) {
jobComplete.apply(api.getSecurityGroupApi().authorizeIngressPortsToSecurityGroups(id,
ipPermission.getIpProtocol().toString().toUpperCase(),
ipPermission.getFromPort(),
@@ -212,12 +215,14 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
@Override
public SecurityGroup removeIpPermission(IpPermission ipPermission, SecurityGroup group) {
+ checkNotNull(group, "group");
+ checkNotNull(ipPermission, "ipPermission");
String id = checkNotNull(group.getId(), "group.getId()");
org.jclouds.cloudstack.domain.SecurityGroup rawGroup = api.getSecurityGroupApi()
.getSecurityGroup(id);
- if (ipPermission.getCidrBlocks().size() > 0) {
+ if (!ipPermission.getCidrBlocks().isEmpty()) {
for (IngressRule rule : filter(rawGroup.getIngressRules(),
ruleCidrMatches(ipPermission.getIpProtocol().toString(),
ipPermission.getFromPort(),
@@ -227,7 +232,7 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
}
}
- if (ipPermission.getTenantIdGroupNamePairs().size() > 0) {
+ if (!ipPermission.getTenantIdGroupNamePairs().isEmpty()) {
for (IngressRule rule : filter(rawGroup.getIngressRules(),
ruleGroupMatches(ipPermission.getIpProtocol().toString(),
ipPermission.getFromPort(),
@@ -276,8 +281,4 @@ public class CloudStackSecurityGroupExtension implements SecurityGroupExtension
return false;
}
- protected Iterable<? extends org.jclouds.cloudstack.domain.SecurityGroup> pollSecurityGroups() {
- return api.getSecurityGroupApi().listSecurityGroups();
- }
-
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/cf597121/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
index 99b6e9e..598b491 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/SecurityGroupPredicates.java
@@ -191,10 +191,10 @@ public class SecurityGroupPredicates {
@Override
public String toString() {
- return "ruleCidrMatches(" + protocol
- + "," + startPort
- + "," + endPort
- + ",[" + cidrs
+ return "ruleCidrMatches(protocol:" + protocol
+ + ",startPort:" + startPort
+ + ",endPort:" + endPort
+ + ",cidrs:[" + cidrs
+ "])";
}
};
@@ -229,10 +229,10 @@ public class SecurityGroupPredicates {
@Override
public String toString() {
- return "ruleGroupMatches(" + protocol
- + "," + startPort
- + "," + endPort
- + ",[" + accountGroupNames
+ return "ruleGroupMatches(protocol:" + protocol
+ + ",startPort:" + startPort
+ + ",endPort:" + endPort
+ + ",accountGroupNames:[" + accountGroupNames
+ "])";
}
};
http://git-wip-us.apache.org/repos/asf/jclouds/blob/cf597121/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java
index 50bd968..973c164 100644
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/extensions/CloudStackSecurityGroupExtensionLiveTest.java
@@ -24,8 +24,6 @@ import org.jclouds.sshj.config.SshjSshClientModule;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
import com.google.inject.Module;
/**
@@ -48,14 +46,13 @@ public class CloudStackSecurityGroupExtensionLiveTest extends BaseSecurityGroupE
super.setupContext();
CloudStackApi api = view.unwrapApi(CloudStackApi.class);
- zone = Iterables.find(api.getZoneApi().listZones(), new Predicate<Zone>() {
-
- @Override
- public boolean apply(Zone arg0) {
- return arg0.isSecurityGroupsEnabled();
+ for (Zone z: api.getZoneApi().listZones()) {
+ if (z.isSecurityGroupsEnabled()) {
+ zone = z;
+ break;
}
+ }
- });
if (zone == null)
securityGroupsSupported = false;
}