You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2015/06/01 11:26:08 UTC
[4/8] incubator-brooklyn git commit: add coercion from string to set,
and test location config set/map
add coercion from string to set, and test location config set/map
including notes on inheriting, confirming that sets/maps are NOT merged when coming from properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/aec2d830
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/aec2d830
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/aec2d830
Branch: refs/heads/master
Commit: aec2d830482d4d80344f0a0278a761a1822e5afc
Parents: 42e9aad
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri May 29 09:15:39 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri May 29 09:21:45 2015 +0100
----------------------------------------------------------------------
.../java/brooklyn/util/flags/TypeCoercions.java | 7 +++
.../location/jclouds/JcloudsLocationConfig.java | 1 +
.../jclouds/JcloudsLocationResolverTest.java | 57 ++++++++++++++++++--
3 files changed, 61 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aec2d830/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/flags/TypeCoercions.java b/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
index 6c6ecac..a556f6b 100644
--- a/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
+++ b/core/src/main/java/brooklyn/util/flags/TypeCoercions.java
@@ -51,6 +51,7 @@ import brooklyn.event.AttributeSensor;
import brooklyn.event.basic.BasicAttributeSensor;
import brooklyn.internal.BrooklynInitialization;
import brooklyn.util.JavaGroovyEquivalents;
+import brooklyn.util.collections.MutableSet;
import brooklyn.util.collections.QuorumCheck;
import brooklyn.util.collections.QuorumCheck.QuorumChecks;
import brooklyn.util.exceptions.Exceptions;
@@ -703,6 +704,12 @@ public class TypeCoercions {
return JavaStringEscapes.unwrapJsonishListIfPossible(input);
}
});
+ registerAdapter(String.class, Set.class, new Function<String,Set>() {
+ @Override
+ public Set<String> apply(final String input) {
+ return MutableSet.copyOf(JavaStringEscapes.unwrapJsonishListIfPossible(input)).asUnmodifiable();
+ }
+ });
registerAdapter(String.class, QuorumCheck.class, new Function<String,QuorumCheck>() {
@Override
public QuorumCheck apply(final String input) {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aec2d830/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
index fb3e2ad..d8b5350 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocationConfig.java
@@ -202,6 +202,7 @@ public interface JcloudsLocationConfig extends CloudLocationConfig {
public static final ConfigKey<String> CUSTOM_MACHINE_SETUP_SCRIPT_URL = ConfigKeys.newStringConfigKey(
"setup.script", "Custom script to customize a node");
+ @SuppressWarnings("serial")
public static final ConfigKey<List<String>> CUSTOM_MACHINE_SETUP_SCRIPT_URL_LIST = ConfigKeys.newConfigKey(new TypeToken<List<String>>() {},
"setup.scripts", "A list of scripts to customize a node");
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/aec2d830/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationResolverTest.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
index e31b954..ec8e511 100644
--- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
+++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationResolverTest.java
@@ -23,6 +23,7 @@ import static org.testng.Assert.fail;
import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,14 +33,17 @@ import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import brooklyn.config.BrooklynProperties;
+import brooklyn.event.basic.MapConfigKey;
+import brooklyn.event.basic.SetConfigKey;
+import brooklyn.location.basic.LocationInternal;
import brooklyn.location.cloud.CloudLocationConfig;
import brooklyn.management.internal.LocalManagementContext;
import brooklyn.test.entity.LocalManagementContextForTests;
import brooklyn.util.collections.MutableMap;
+import brooklyn.util.collections.MutableSet;
public class JcloudsLocationResolverTest {
- @SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(JcloudsLocationResolverTest.class);
private LocalManagementContext managementContext;
@@ -240,13 +244,14 @@ public class JcloudsLocationResolverTest {
brooklynProperties.put("brooklyn.location.named.softlayer-was", "jclouds:softlayer:was01");
brooklynProperties.put("brooklyn.location.named.softlayer-was2", "jclouds:softlayer:was01");
brooklynProperties.put("brooklyn.location.named.softlayer-was2.region", "was02");
- conf = resolve("named:softlayer-was").getAllConfig(true);
+ conf = resolve("named:softlayer-was").config().getBag().getAllConfig();
assertEquals(conf.get("region"), "was01");
- conf = resolve("named:softlayer-was2").getAllConfig(true);
+ conf = resolve("named:softlayer-was2").config().getBag().getAllConfig();
assertEquals(conf.get("region"), "was02");
- conf = managementContext.getLocationRegistry().resolve("named:softlayer-was2", MutableMap.of("region", "was03")).getAllConfig(true);
+ conf = ((LocationInternal) managementContext.getLocationRegistry().resolve("named:softlayer-was2", MutableMap.of("region", "was03")))
+ .config().getBag().getAllConfig();;
assertEquals(conf.get("region"), "was03");
}
@@ -280,6 +285,50 @@ public class JcloudsLocationResolverTest {
assertEquals(l.config().getLocalBag().getStringKey("prop1"), "1");
}
+ @Test
+ public void testResolvesListAndMapProperties() throws Exception {
+ brooklynProperties.put("brooklyn.location.jclouds.softlayer.prop1", "[ a, b ]");
+ brooklynProperties.put("brooklyn.location.jclouds.softlayer.prop2", "{ a: 1, b: 2 }");
+ brooklynProperties.put("brooklyn.location.named.foo", "jclouds:softlayer:ams01");
+
+ JcloudsLocation l = resolve("named:foo");
+ assertJcloudsEquals(l, "softlayer", "ams01");
+ assertEquals(l.config().get(new SetConfigKey<String>(String.class, "prop1")), MutableSet.of("a", "b"));
+ assertEquals(l.config().get(new MapConfigKey<String>(String.class, "prop2")), MutableMap.of("a", 1, "b", 2));
+ }
+
+ @Test
+ public void testResolvesListAndMapPropertiesWithoutMergeOnInheritance() throws Exception {
+ // when we have a yaml way to specify config we may wish to have different semantics;
+ // it could depend on the collection config key whether to merge on inheritance
+ brooklynProperties.put("brooklyn.location.jclouds.softlayer.prop1", "[ a, b ]");
+ brooklynProperties.put("brooklyn.location.jclouds.softlayer.prop2", "{ a: 1, b: 2 }");
+ brooklynProperties.put("brooklyn.location.named.foo", "jclouds:softlayer:ams01");
+
+ brooklynProperties.put("brooklyn.location.named.foo.prop1", "[ a: 1, c: 3 ]");
+ brooklynProperties.put("brooklyn.location.named.foo.prop2", "{ b: 3, c: 3 }");
+ brooklynProperties.put("brooklyn.location.named.bar", "named:foo");
+ brooklynProperties.put("brooklyn.location.named.bar.prop2", "{ c: 4, d: 4 }");
+
+ // these do NOT affect the maps
+ brooklynProperties.put("brooklyn.location.named.foo.prop2.z", "9");
+ brooklynProperties.put("brooklyn.location.named.foo.prop3.z", "9");
+
+ JcloudsLocation l = resolve("named:bar");
+ assertJcloudsEquals(l, "softlayer", "ams01");
+
+ Set<? extends String> prop1 = l.config().get(new SetConfigKey<String>(String.class, "prop1"));
+ log.info("prop1: "+prop1);
+ assertEquals(prop1, MutableSet.of("a: 1", "c: 3"));
+
+ Map<String, String> prop2 = l.config().get(new MapConfigKey<String>(String.class, "prop2"));
+ log.info("prop2: "+prop2);
+ assertEquals(prop2, MutableMap.of("c", 4, "d", 4));
+
+ Map<String, String> prop3 = l.config().get(new MapConfigKey<String>(String.class, "prop3"));
+ log.info("prop3: "+prop3);
+ assertEquals(prop3, null);
+ }
private void assertJcloudsEquals(JcloudsLocation loc, String expectedProvider, String expectedRegion) {
assertEquals(loc.getProvider(), expectedProvider);