You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2015/03/26 19:28:17 UTC
[4/6] incubator-brooklyn git commit: Add fields for main URI sensor
to Riak entities
Add fields for main URI sensor to Riak entities
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dd3a7e4f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dd3a7e4f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dd3a7e4f
Branch: refs/heads/master
Commit: dd3a7e4fee0ba58e6b4575036c35f31de05872dd
Parents: 1e67a52
Author: Andrew Kennedy <gr...@apache.org>
Authored: Thu Mar 26 14:23:34 2015 +0000
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Thu Mar 26 14:23:34 2015 +0000
----------------------------------------------------------------------
.../src/main/java/brooklyn/entity/nosql/riak/RiakCluster.java | 5 +++++
.../src/main/java/brooklyn/entity/nosql/riak/RiakNode.java | 4 ++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dd3a7e4f/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakCluster.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakCluster.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakCluster.java
index b5543ee..a5a3838 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakCluster.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakCluster.java
@@ -18,11 +18,13 @@
*/
package brooklyn.entity.nosql.riak;
+import java.net.URI;
import java.util.Map;
import brooklyn.catalog.Catalog;
import brooklyn.config.ConfigKey;
import brooklyn.entity.Entity;
+import brooklyn.entity.basic.Attributes;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.group.DynamicCluster;
import brooklyn.entity.proxying.ImplementedBy;
@@ -51,4 +53,7 @@ public interface RiakCluster extends DynamicCluster {
AttributeSensor<Boolean> IS_FIRST_NODE_SET = Sensors.newBooleanSensor("riak.cluster.isFirstNodeSet", "Flag to determine if the first node has been set");
AttributeSensor<String> NODE_LIST = Sensors.newStringSensor("riak.cluster.nodeList", "List of nodes (including ports), comma separated");
+
+ AttributeSensor<URI> RIAK_CONSOLE_URI = Attributes.MAIN_URI;
+
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dd3a7e4f/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
index 7e18119..7fe93fb 100644
--- a/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
+++ b/software/nosql/src/main/java/brooklyn/entity/nosql/riak/RiakNode.java
@@ -18,12 +18,14 @@
*/
package brooklyn.entity.nosql.riak;
+import java.net.URI;
import java.util.List;
import brooklyn.catalog.Catalog;
import brooklyn.config.ConfigKey;
import brooklyn.entity.annotation.Effector;
import brooklyn.entity.annotation.EffectorParam;
+import brooklyn.entity.basic.Attributes;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.MethodEffector;
import brooklyn.entity.basic.SoftwareProcess;
@@ -155,6 +157,8 @@ public interface RiakNode extends SoftwareProcess {
RIAK_OBJECT_COUNTER_MERGE_TIME_MEAN, RIAK_OBJECT_SET_MERGE_TIME_MEAN, RIAK_OBJECT_MAP_MERGE_TIME_MEAN,
RIAK_CONSISTENT_GET_TIME_MEAN, RIAK_CONSISTENT_PUT_TIME_MEAN);
+ AttributeSensor<URI> RIAK_CONSOLE_URI = Attributes.MAIN_URI;
+
// accessors, for use from template file
Integer getRiakWebPort();