You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/08 18:37:54 UTC
[4/4] brooklyn-library git commit: minor tidies of salt work
minor tidies of salt work
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/d78795ee
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/d78795ee
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/d78795ee
Branch: refs/heads/master
Commit: d78795eeb1fc8f4d9da62c58e4723f4e899796fc
Parents: 20ff02b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Feb 8 17:28:03 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Feb 8 17:37:36 2016 +0000
----------------------------------------------------------------------
software/cm/salt/pom.xml | 5 -----
.../java/org/apache/brooklyn/entity/cm/salt/SaltEntity.java | 2 ++
.../org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java | 2 ++
.../org/apache/brooklyn/entity/cm/salt/impl/SaltSshTasks.java | 3 ++-
.../java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java | 1 +
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d78795ee/software/cm/salt/pom.xml
----------------------------------------------------------------------
diff --git a/software/cm/salt/pom.xml b/software/cm/salt/pom.xml
index f2ba74d..40d150d 100644
--- a/software/cm/salt/pom.xml
+++ b/software/cm/salt/pom.xml
@@ -46,11 +46,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.brooklyn</groupId>
- <artifactId>brooklyn-software-database</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.brooklyn</groupId>
<artifactId>brooklyn-camp</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d78795ee/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/SaltEntity.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/SaltEntity.java b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/SaltEntity.java
index 00d017d..4428658 100644
--- a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/SaltEntity.java
+++ b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/SaltEntity.java
@@ -19,6 +19,7 @@
package org.apache.brooklyn.entity.cm.salt;
import com.google.common.reflect.TypeToken;
+
import org.apache.brooklyn.api.catalog.Catalog;
import org.apache.brooklyn.api.entity.ImplementedBy;
import org.apache.brooklyn.api.sensor.AttributeSensor;
@@ -43,6 +44,7 @@ public interface SaltEntity extends SoftwareProcess, SaltConfig {
ConfigKey<String> SUGGESTED_VERSION = ConfigKeys.newConfigKeyWithDefault(
BrooklynConfigKeys.SUGGESTED_VERSION, "stable");
+ @SuppressWarnings("serial")
AttributeSensor<List<String>> STATES = Sensors.newSensor(new TypeToken<List<String>>() {}, "salt.states",
"Salt Highstate states");
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d78795ee/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
index 5f5069a..e48c0b2 100644
--- a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
+++ b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltHighstate.java
@@ -19,6 +19,7 @@
package org.apache.brooklyn.entity.cm.salt.impl;
import com.google.common.reflect.TypeToken;
+
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.sensor.AttributeSensor;
import org.apache.brooklyn.core.sensor.Sensors;
@@ -41,6 +42,7 @@ public class SaltHighstate {
public static final String HIGHSTATE_SENSOR_PREFIX = "salt.state";
+ @SuppressWarnings("serial")
public static TypeToken<Map<String, Object>> STATE_FUNCTION_TYPE =
new TypeToken<Map<String, Object>>() {};
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d78795ee/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltSshTasks.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltSshTasks.java b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltSshTasks.java
index 177843f..a8e1af6 100644
--- a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltSshTasks.java
+++ b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltSshTasks.java
@@ -212,7 +212,8 @@ public class SaltSshTasks {
public static SshEffectorTaskFactory<Integer> invokeSaltUtility(String functionName, String args, boolean permitFailure) {
final SshEffectorTaskFactory<Integer> taskFactory =
- ssh(sudo("/bin/bash -c '. /etc/salt/salt_utilities.sh ; " + functionName + " " + args + "'"));
+ ssh(sudo("/bin/bash -c '. /etc/salt/salt_utilities.sh ; " + functionName + " " + args + "'"))
+ .summary(functionName);
if (permitFailure) {
taskFactory.allowingNonZeroExitCode();
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/d78795ee/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
index 6163262..4f9ef1f 100644
--- a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
+++ b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/HighstateTest.java
@@ -65,6 +65,7 @@ public class HighstateTest {
SaltHighstate.applyHighstate(contents, entity);
final List<String> states = entity.sensors().get(SaltEntity.STATES);
+ LOG.info("Test states are: "+states);
assertThat(states)
.contains("apache")
.contains("apache-reload")