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 2015/09/14 17:48:04 UTC
[1/3] incubator-brooklyn git commit: Adds test for mapping propagated
sensor
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 07ec193bb -> 92c45eab3
Adds test for mapping propagated sensor
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/f53d5362
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/f53d5362
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/f53d5362
Branch: refs/heads/master
Commit: f53d53628df76d92383d6a132338a5cd268fe78a
Parents: e92dd1e
Author: Martin Harris <gi...@nakomis.com>
Authored: Thu Sep 10 16:31:32 2015 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Thu Sep 10 16:40:28 2015 +0100
----------------------------------------------------------------------
.../stock/SensorPropagatingEnricherTest.java | 41 +++++++++++++++++++-
1 file changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/f53d5362/core/src/test/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricherTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricherTest.java b/core/src/test/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricherTest.java
index c660df1..c938bc2 100644
--- a/core/src/test/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricherTest.java
+++ b/core/src/test/java/org/apache/brooklyn/enricher/stock/SensorPropagatingEnricherTest.java
@@ -29,8 +29,6 @@ import org.apache.brooklyn.core.sensor.BasicNotificationSensor;
import org.apache.brooklyn.core.sensor.Sensors;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
import org.apache.brooklyn.core.test.entity.TestEntity;
-import org.apache.brooklyn.enricher.stock.Enrichers;
-import org.apache.brooklyn.enricher.stock.Propagator;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.test.EntityTestUtils;
import org.apache.brooklyn.util.collections.MutableMap;
@@ -215,4 +213,43 @@ public class SensorPropagatingEnricherTest extends BrooklynAppUnitTestSupport {
if (ise == null) throw e;
}
}
+
+ @Test
+ public void testPropagateToDynamicSensor() {
+ /*
+
+ This test attempts to replicate the following YAML
+
+ location: localhost
+ services:
+ - type: org.apache.brooklyn.core.test.entity.TestApplication
+ brooklyn.children:
+ - type: org.apache.brooklyn.core.test.entity.TestEntity
+ id: childid
+
+ brooklyn.enrichers:
+ - type: org.apache.brooklyn.enricher.stock.Propagator
+ brooklyn.config:
+ producer: $brooklyn:component("child", "childid")
+ propagating:
+ - $brooklyn:sensor("test.name")
+ - type: org.apache.brooklyn.enricher.stock.Propagator
+ brooklyn.config:
+ sensorMapping:
+ $brooklyn:sensor("test.name"): $brooklyn:sensor("newSensor")
+ */
+ AttributeSensor<Object> targetSensor = Sensors.newSensor(Object.class, "newSensor");
+ AttributeSensor<Object> sourceSensorFromYaml = Sensors.newSensor(Object.class, TestEntity.NAME.getName());
+ app.addEnricher(Enrichers.builder()
+ .propagating(Sensors.newSensor(Object.class, TestEntity.NAME.getName()))
+ .from(entity)
+ .build());
+ app.addEnricher(Enrichers.builder()
+ .propagating(ImmutableMap.of(sourceSensorFromYaml, targetSensor))
+ .from(app)
+ .build());
+ EntityTestUtils.assertAttributeEqualsEventually(app, targetSensor, entity.sensors().get(TestEntity.NAME));
+ entity.sensors().set(TestEntity.NAME, "newName");
+ EntityTestUtils.assertAttributeEqualsEventually(app, targetSensor, "newName");
+ }
}
[2/3] incubator-brooklyn git commit: Changes propagator
getDestinationSensor to lookup on sensor name, rather than sensor equality
Posted by al...@apache.org.
Changes propagator getDestinationSensor to lookup on sensor name, rather than sensor equality
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dab66540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dab66540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dab66540
Branch: refs/heads/master
Commit: dab66540056e6b19932cd3eaa0214d2c932a37dc
Parents: f53d536
Author: Martin Harris <gi...@nakomis.com>
Authored: Thu Sep 10 15:33:32 2015 +0100
Committer: Martin Harris <gi...@nakomis.com>
Committed: Thu Sep 10 16:40:35 2015 +0100
----------------------------------------------------------------------
.../apache/brooklyn/enricher/stock/Propagator.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dab66540/core/src/main/java/org/apache/brooklyn/enricher/stock/Propagator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/enricher/stock/Propagator.java b/core/src/main/java/org/apache/brooklyn/enricher/stock/Propagator.java
index e6050fd..195fc9c 100644
--- a/core/src/main/java/org/apache/brooklyn/enricher/stock/Propagator.java
+++ b/core/src/main/java/org/apache/brooklyn/enricher/stock/Propagator.java
@@ -39,6 +39,7 @@ import org.apache.brooklyn.util.core.task.ValueResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -162,7 +163,7 @@ public class Propagator extends AbstractEnricher implements SensorEventListener<
// propagate upwards
Sensor<?> sourceSensor = event.getSensor();
Sensor<?> destinationSensor = getDestinationSensor(sourceSensor);
-
+
if (!sensorFilter.apply(sourceSensor)) {
return; // ignoring excluded sensor
}
@@ -195,7 +196,15 @@ public class Propagator extends AbstractEnricher implements SensorEventListener<
}
}
- private Sensor<?> getDestinationSensor(Sensor<?> sourceSensor) {
- return sensorMapping.containsKey(sourceSensor) ? sensorMapping.get(sourceSensor): sourceSensor;
+ private Sensor<?> getDestinationSensor(final Sensor<?> sourceSensor) {
+ Optional<? extends Sensor<?>> mappingSensor = Iterables.tryFind(sensorMapping.keySet(), new Predicate<Sensor<?>>() {
+ @Override
+ public boolean apply(Sensor<?> sensor) {
+ return sourceSensor.getName().equals(sensor.getName());
+ }
+ });
+
+ return mappingSensor.isPresent() ? sensorMapping.get(mappingSensor.get()) : sourceSensor;
}
+
}
[3/3] incubator-brooklyn git commit: This closes #888
Posted by al...@apache.org.
This closes #888
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/92c45eab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/92c45eab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/92c45eab
Branch: refs/heads/master
Commit: 92c45eab3dd86f8cb6caf95eea56952c837e5f18
Parents: 07ec193 dab6654
Author: Aled Sage <al...@gmail.com>
Authored: Mon Sep 14 16:47:47 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Sep 14 16:47:47 2015 +0100
----------------------------------------------------------------------
.../brooklyn/enricher/stock/Propagator.java | 15 +++++--
.../stock/SensorPropagatingEnricherTest.java | 41 +++++++++++++++++++-
2 files changed, 51 insertions(+), 5 deletions(-)
----------------------------------------------------------------------