Repository: incubator-brooklyn Updated Branches: refs/heads/master 1caede417 -> 9ef37b2c9
Set the CAMP planId as an attribute so that it is not inherited Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/927556fc Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/927556fc Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/927556fc Branch: refs/heads/master Commit: 927556fcb23936b418d22711c6d26c93b4dbc734 Parents: 1caede4 Author: Andrew Kennedy <[email protected]> Authored: Tue Mar 24 18:04:02 2015 +0000 Committer: Andrew Kennedy <[email protected]> Committed: Tue Mar 24 18:04:02 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/camp/brooklyn/BrooklynCampConstants.java | 13 +++++++------ .../creation/BrooklynComponentTemplateResolver.java | 2 +- .../camp/brooklyn/spi/dsl/methods/DslComponent.java | 2 +- .../camp/brooklyn/VanillaBashNetcatYamlTest.java | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/927556fc/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/BrooklynCampConstants.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/BrooklynCampConstants.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/BrooklynCampConstants.java index 5a17cfe..7dc472a 100644 --- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/BrooklynCampConstants.java +++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/BrooklynCampConstants.java @@ -18,27 +18,28 @@ */ package io.brooklyn.camp.brooklyn; -import java.util.Set; +import io.brooklyn.camp.CampPlatform; -import com.google.common.collect.ImmutableSet; +import java.util.Set; -import io.brooklyn.camp.CampPlatform; import brooklyn.config.BrooklynServerConfig; import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; +import brooklyn.event.basic.AttributeSensorAndConfigKey; import brooklyn.event.basic.BasicAttributeSensorAndConfigKey; +import com.google.common.collect.ImmutableSet; + public class BrooklynCampConstants { /* These are only advertised as ConfigKeys currently, as they are not automatically set as sensors. * To fix if EntitySpec allows us to specify sensor values, or there is an automatic way they get converted from config. */ public static final String PLAN_ID_FLAG = "planId"; - public static final HasConfigKey<String> PLAN_ID = new BasicAttributeSensorAndConfigKey<String>(String.class, "camp.plan.id", + public static final AttributeSensorAndConfigKey<String,String> PLAN_ID = new BasicAttributeSensorAndConfigKey<String>(String.class, "camp.plan.id", "Identifier supplied in the deployment plan for component to which this entity corresponds " + "(human-readable, for correlating across plan, template, and instance)"); - public static final HasConfigKey<String> TEMPLATE_ID = new BasicAttributeSensorAndConfigKey<String>(String.class, "camp.template.id", + public static final AttributeSensorAndConfigKey<String,String> TEMPLATE_ID = new BasicAttributeSensorAndConfigKey<String>(String.class, "camp.template.id", "UID of the component in the CAMP template from which this entity was created"); public static final ConfigKey<CampPlatform> CAMP_PLATFORM = BrooklynServerConfig.CAMP_PLATFORM; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/927556fc/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java index 05faed5..89ec2b0 100644 --- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java +++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java @@ -324,7 +324,7 @@ public class BrooklynComponentTemplateResolver { String planId = (String)spec.getConfig().get(BrooklynCampConstants.PLAN_ID.getConfigKey()); if (planId != null) { - ((EntityInternal)entity).setConfig(BrooklynCampConstants.PLAN_ID, planId); + ((EntityInternal)entity).setAttribute(BrooklynCampConstants.PLAN_ID, planId); } if (spec.getLocations().size() > 0) { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/927556fc/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java index 21e8afc..ca6c2bd 100644 --- a/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java +++ b/usage/camp/src/main/java/io/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java @@ -123,7 +123,7 @@ public class DslComponent extends BrooklynDslDeferredSupplier<Entity> { throw new IllegalStateException("Unexpected scope "+scope); } - Optional<Entity> result = Iterables.tryFind(entitiesToSearch, EntityPredicates.configEqualTo(BrooklynCampConstants.PLAN_ID, componentId)); + Optional<Entity> result = Iterables.tryFind(entitiesToSearch, EntityPredicates.attributeEqualTo(BrooklynCampConstants.PLAN_ID, componentId)); if (result.isPresent()) return result.get(); http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/927556fc/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java index dd1b647..242e5ed 100644 --- a/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java +++ b/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/VanillaBashNetcatYamlTest.java @@ -63,7 +63,7 @@ public class VanillaBashNetcatYamlTest extends AbstractYamlTest { Assert.assertEquals(app.getDisplayName(), "Simple Netcat with Client"); // comparing by plan ID is one common way - Iterable<Entity> netcatI = Iterables.filter(app.getChildren(), EntityPredicates.configEqualTo(BrooklynCampConstants.PLAN_ID, "netcat-server")); + Iterable<Entity> netcatI = Iterables.filter(app.getChildren(), EntityPredicates.attributeEqualTo(BrooklynCampConstants.PLAN_ID, "netcat-server")); Assert.assertTrue(netcatI.iterator().hasNext(), "no 'netcat-server' child of app: "+app.getChildren()); Entity netcat = Iterables.getOnlyElement(netcatI);
