Repository: jclouds-labs-google Updated Branches: refs/heads/master 2717e8e82 -> 7070016cd
JCLOUDS-661: Supporting single port firewall rules in GCE Corresponding test added in https://git-wip-us.apache.org/repos/asf?p=jclouds.git;h=f3778b6 Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/commit/7070016c Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/tree/7070016c Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/diff/7070016c Branch: refs/heads/master Commit: 7070016cd98b604bedb25d757496546c122b6c92 Parents: 2717e8e Author: Stuart Hendren <[email protected]> Authored: Tue Aug 12 10:26:05 2014 +0100 Committer: Andrew Phillips <[email protected]> Committed: Thu Aug 14 12:57:49 2014 -0400 ---------------------------------------------------------------------- .../GoogleComputeEngineSecurityGroupExtension.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-google/blob/7070016c/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java ---------------------------------------------------------------------- diff --git a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java index fb35bed..9a5b39f 100644 --- a/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java +++ b/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/extensions/GoogleComputeEngineSecurityGroupExtension.java @@ -220,8 +220,12 @@ public class GoogleComputeEngineSecurityGroupExtension implements SecurityGroupE } Firewall.Rule.Builder ruleBuilder = Firewall.Rule.builder(); ruleBuilder.IpProtocol(ipPermission.getIpProtocol()); - if (ipPermission.getToPort() > 0) { - ruleBuilder.addPortRange(ipPermission.getFromPort(), ipPermission.getToPort()); + if (ipPermission.getFromPort() > 0) { + if (ipPermission.getFromPort() == ipPermission.getToPort()) { + ruleBuilder.addPort(ipPermission.getToPort()); + } else { + ruleBuilder.addPortRange(ipPermission.getFromPort(), ipPermission.getToPort()); + } } fwOptions.addAllowedRule(ruleBuilder.build());
