You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/06/26 14:45:12 UTC
[37/50] [abbrv] jclouds git commit: Remove firewall-tag filtering
Remove firewall-tag filtering
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/465a62aa
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/465a62aa
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/465a62aa
Branch: refs/heads/master
Commit: 465a62aa2767427018d83c2711fd427e90e97ef4
Parents: 5adfce8
Author: Daniel Broudy <br...@google.com>
Authored: Wed May 20 13:28:57 2015 -0700
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue May 26 15:53:06 2015 +0200
----------------------------------------------------------------------
.../functions/FirewallTagNamingConvention.java | 12 ------------
.../compute/functions/InstanceToNodeMetadata.java | 17 +----------------
.../functions/InstanceToNodeMetadataTest.java | 13 +------------
3 files changed, 2 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/465a62aa/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java
index 1fe5928..61e4fd0 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/FirewallTagNamingConvention.java
@@ -22,8 +22,6 @@ import javax.inject.Inject;
import org.jclouds.compute.functions.GroupNamingConvention;
-import com.google.common.base.Predicate;
-
/**
* The convention for naming instance tags that firewall rules recognise.
*/
@@ -58,14 +56,4 @@ public final class FirewallTagNamingConvention {
return String.format("%s-%s", sharedResourceName, Integer.toHexString(result));
}
-
-
- public Predicate<String> isFirewallTag() {
- return new Predicate<String>() {
- @Override
- public boolean apply(String input) {
- return input != null && input.startsWith(sharedResourceName + "-port-");
- }
- };
- }
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/465a62aa/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java
index 81e40b9..aab8cf9 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadata.java
@@ -16,11 +16,9 @@
*/
package org.jclouds.googlecomputeengine.compute.functions;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.compute.util.ComputeServiceUtils.groupFromMapOrName;
import java.net.URI;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -36,7 +34,6 @@ import org.jclouds.domain.Location;
import org.jclouds.googlecomputeengine.domain.Instance;
import com.google.common.base.Function;
-import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableList;
@@ -47,33 +44,21 @@ public final class InstanceToNodeMetadata implements Function<Instance, NodeMeta
private final Map<URI, URI> diskToSourceImage;
private final Supplier<Map<URI, Hardware>> hardwares;
private final Supplier<Map<URI, Location>> locationsByUri;
- private final FirewallTagNamingConvention.Factory firewallTagNamingConvention;
@Inject InstanceToNodeMetadata(Map<Instance.Status, NodeMetadata.Status> toPortableNodeStatus,
GroupNamingConvention.Factory namingConvention,
Map<URI, URI> diskToSourceImage,
@Memoized Supplier<Map<URI, Hardware>> hardwares,
- @Memoized Supplier<Map<URI, Location>> locationsByUri,
- FirewallTagNamingConvention.Factory firewallTagNamingConvention) {
+ @Memoized Supplier<Map<URI, Location>> locationsByUri) {
this.toPortableNodeStatus = toPortableNodeStatus;
this.nodeNamingConvention = namingConvention.createWithoutPrefix();
this.diskToSourceImage = diskToSourceImage;
this.hardwares = hardwares;
this.locationsByUri = locationsByUri;
- this.firewallTagNamingConvention = checkNotNull(firewallTagNamingConvention, "firewallTagNamingConvention");
}
@Override public NodeMetadata apply(Instance input) {
String group = groupFromMapOrName(input.metadata().asMap(), input.name(), nodeNamingConvention);
- Predicate<String> isFirewallTag = firewallTagNamingConvention.get(group).isFirewallTag();
- if (group != null) {
- for (Iterator<String> tag = input.tags().items().iterator(); tag.hasNext(); ) {
- if (isFirewallTag.apply(tag.next())) {
- tag.remove();
- }
- }
- }
-
NodeMetadataBuilder builder = new NodeMetadataBuilder();
Location zone = locationsByUri.get().get(input.zone());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/465a62aa/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java
index 6888b24..fff0891 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/functions/InstanceToNodeMetadataTest.java
@@ -178,18 +178,7 @@ public class InstanceToNodeMetadataTest {
namingConventionFactory,
ImmutableMap.of(instance.disks().get(0).source(), imageUrl),
hardwareSupplier,
- locationSupplier,
- new FirewallTagNamingConvention.Factory(namingConventionFactory));
- }
-
- @Test
- public final void testTagFilteringWorks() {
- NodeMetadata nodeMetadata = groupGroupNodeParser.apply(instance);
- assertEquals(nodeMetadata.getId(), instance.selfLink().toString());
- assertEquals(nodeMetadata.getTags(), ImmutableSet.of(
- "aTag" // "aTag" kept as a non firewall tag.
- // "Group-port-42" filtered out as a firewall tag.
- ));
+ locationSupplier);
}
@Test