You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/10/06 12:18:51 UTC
[1/3] brooklyn-server git commit:
JcloudsLocatoinSecurityGroupCustomizer: avoid ICMP for azure
Repository: brooklyn-server
Updated Branches:
refs/heads/master 6e3c27a35 -> 717fe3561
JcloudsLocatoinSecurityGroupCustomizer: avoid ICMP for azure
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/690661fa
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/690661fa
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/690661fa
Branch: refs/heads/master
Commit: 690661fa0dc5d1dc665900abf4ce646309d20653
Parents: c12e540
Author: Aled Sage <al...@gmail.com>
Authored: Fri Sep 9 14:44:49 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 27 11:41:08 2016 +0100
----------------------------------------------------------------------
.../networking/JcloudsLocationSecurityGroupCustomizer.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/690661fa/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java
index 810a5ce..e15ad68 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java
@@ -469,7 +469,9 @@ public class JcloudsLocationSecurityGroupCustomizer extends BasicJcloudsLocation
.toPort(65535);
addPermission(allWithinGroup.ipProtocol(IpProtocol.TCP).build(), group, securityApi);
addPermission(allWithinGroup.ipProtocol(IpProtocol.UDP).build(), group, securityApi);
- addPermission(allWithinGroup.ipProtocol(IpProtocol.ICMP).fromPort(-1).toPort(-1).build(), group, securityApi);
+ if (!isAzure(location)) {
+ addPermission(allWithinGroup.ipProtocol(IpProtocol.ICMP).fromPort(-1).toPort(-1).build(), group, securityApi);
+ }
IpPermission sshPermission = IpPermission.builder()
.fromPort(22)
@@ -512,6 +514,11 @@ public class JcloudsLocationSecurityGroupCustomizer extends BasicJcloudsLocation
return location.getParent() != null && Iterables.contains(computeIds, location.getParent().getId());
}
+ private boolean isAzure(Location location) {
+ Set<String> computeIds = getJcloudsLocationIds("azurecompute");
+ return location.getParent() != null && Iterables.contains(computeIds, location.getParent().getId());
+ }
+
protected SecurityGroup addSecurityGroupInLocation(final String groupName, final Location location, final SecurityGroupExtension securityApi) {
LOG.debug("Creating security group {} in {}", groupName, location);
Callable<SecurityGroup> callable = new Callable<SecurityGroup>() {
[2/3] brooklyn-server git commit: JcloudsLocationSecurityGroupCustomizer: handle “openstack-mitaka-nova”
Posted by al...@apache.org.
JcloudsLocationSecurityGroupCustomizer: handle \u201copenstack-mitaka-nova\u201d
There is a different jclouds provider/api available for OpenStack
Mitaka release. Look for that, as well as the \u201copenstack-nova\u201d name.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c12e540c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c12e540c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c12e540c
Branch: refs/heads/master
Commit: c12e540cdb474d11316a03b929e9ae155d34af21
Parents: b964e8b
Author: Aled Sage <al...@gmail.com>
Authored: Fri Sep 9 10:06:39 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Sep 27 11:41:08 2016 +0100
----------------------------------------------------------------------
.../JcloudsLocationSecurityGroupCustomizer.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c12e540c/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java
index 4dcce1a..810a5ce 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java
@@ -20,6 +20,7 @@ package org.apache.brooklyn.location.jclouds.networking;
import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Collection;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.Callable;
@@ -454,11 +455,9 @@ public class JcloudsLocationSecurityGroupCustomizer extends BasicJcloudsLocation
private SecurityGroup createBaseSecurityGroupInLocation(String groupName, Location location, SecurityGroupExtension securityApi) {
SecurityGroup group = addSecurityGroupInLocation(groupName, location, securityApi);
- Set<String> openstackNovaIds = getJcloudsLocationIds("openstack-nova");
-
String groupId = group.getProviderId();
int fromPort = 0;
- if (location.getParent() != null && Iterables.contains(openstackNovaIds, location.getParent().getId())) {
+ if (isOpenstackNova(location)) {
groupId = group.getId();
fromPort = 1;
}
@@ -484,11 +483,15 @@ public class JcloudsLocationSecurityGroupCustomizer extends BasicJcloudsLocation
}
private Set<String> getJcloudsLocationIds(final String jcloudsApiId) {
+ return getJcloudsLocationIds(ImmutableList.of(jcloudsApiId));
+ }
+
+ private Set<String> getJcloudsLocationIds(final Collection<? extends String> jcloudsApiIds) {
Set<String> openstackNovaProviders = FluentIterable.from(Providers.all())
.filter(new Predicate<ProviderMetadata>() {
@Override
public boolean apply(ProviderMetadata providerMetadata) {
- return providerMetadata.getApiMetadata().getId().equals(jcloudsApiId);
+ return jcloudsApiIds.contains(providerMetadata.getApiMetadata().getId());
}
}).transform(new Function<ProviderMetadata, String>() {
@Nullable
@@ -500,10 +503,15 @@ public class JcloudsLocationSecurityGroupCustomizer extends BasicJcloudsLocation
return new ImmutableSet.Builder<String>()
.addAll(openstackNovaProviders)
- .add(jcloudsApiId)
+ .addAll(jcloudsApiIds)
.build();
}
+ private boolean isOpenstackNova(Location location) {
+ Set<String> computeIds = getJcloudsLocationIds(ImmutableList.of("openstack-nova", "openstack-mitaka-nova", "openstack-devtest-compute"));
+ return location.getParent() != null && Iterables.contains(computeIds, location.getParent().getId());
+ }
+
protected SecurityGroup addSecurityGroupInLocation(final String groupName, final Location location, final SecurityGroupExtension securityApi) {
LOG.debug("Creating security group {} in {}", groupName, location);
Callable<SecurityGroup> callable = new Callable<SecurityGroup>() {
[3/3] brooklyn-server git commit: This closes #353
Posted by al...@apache.org.
This closes #353
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/717fe356
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/717fe356
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/717fe356
Branch: refs/heads/master
Commit: 717fe35613dd462f74f2ee84d633877774650ba6
Parents: 6e3c27a 690661f
Author: Aled Sage <al...@gmail.com>
Authored: Thu Oct 6 13:18:34 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Oct 6 13:18:34 2016 +0100
----------------------------------------------------------------------
.../JcloudsLocationSecurityGroupCustomizer.java | 27 +++++++++++++++-----
1 file changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------