You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/07/24 12:01:21 UTC
[1/3] brooklyn-server git commit: Adds
RecordingSshTool.customOneOffResponse
Repository: brooklyn-server
Updated Branches:
refs/heads/master 04bdb7590 -> 29583d8c5
Adds RecordingSshTool.customOneOffResponse
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/759c14fe
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/759c14fe
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/759c14fe
Branch: refs/heads/master
Commit: 759c14fed980f5bce85847ba82d08b309d137caa
Parents: 6e5c2c2
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 19 11:27:55 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 19 11:27:55 2017 +0100
----------------------------------------------------------------------
.../core/internal/ssh/RecordingSshTool.java | 32 ++++++
.../core/internal/ssh/RecordingSshToolTest.java | 110 +++++++++++++++++++
2 files changed, 142 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/759c14fe/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
index 6825523..86b0d66 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshTool.java
@@ -27,6 +27,7 @@ import java.io.OutputStream;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
@@ -185,6 +186,37 @@ public class RecordingSshTool implements SshTool {
customResponses.put(cmdRegex, checkNotNull(response, "response").toGenerator());
}
+ /**
+ * The given response generator will be used the first time the cmdRegex matches, and not again.
+ * (However if concurrent executions are happening, multiple may match and use this generator).
+ *
+ * An example usage of this is to inject a one-off failure, such as a 'launch' failure where
+ * a retry would resolve the problem.
+ */
+ public static void setCustomOneOffResponse(String cmdRegex, CustomResponseGenerator response) {
+ checkNotNull(response, "response");
+ AtomicReference<CustomResponseGenerator> wrapperRef = new AtomicReference<>();
+ CustomResponseGenerator wrapper = new CustomResponseGenerator() {
+ @Override public CustomResponse generate(ExecParams execParams) throws Exception {
+ try {
+ return response.generate(execParams);
+ } finally {
+ customResponses.remove(cmdRegex);
+ }
+ }
+ };
+ wrapperRef.set(wrapper);
+ customResponses.put(cmdRegex, wrapper);
+ }
+
+ /**
+ * The given response will be used the first time the cmdRegex matches, and not again.
+ * (However if concurrent executions are happening, multiple may match and use this generator).
+ */
+ public static void setCustomOneOffResponse(String cmdRegex, CustomResponse response) {
+ setCustomOneOffResponse(cmdRegex, checkNotNull(response, "response").toGenerator());
+ }
+
public static List<ExecCmd> getExecCmds() {
return ImmutableList.copyOf(execScriptCmds);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/759c14fe/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshToolTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshToolTest.java b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshToolTest.java
new file mode 100644
index 0000000..75f2b3d
--- /dev/null
+++ b/core/src/test/java/org/apache/brooklyn/util/core/internal/ssh/RecordingSshToolTest.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.util.core.internal.ssh;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+
+import org.apache.brooklyn.api.location.LocationSpec;
+import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport;
+import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.util.core.internal.ssh.RecordingSshTool.CustomResponse;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+
+public class RecordingSshToolTest extends BrooklynMgmtUnitTestSupport {
+
+ private SshMachineLocation machine;
+
+ @BeforeMethod(alwaysRun=true)
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ RecordingSshTool.clear();
+ machine = mgmt.getLocationManager().createLocation(LocationSpec.create(SshMachineLocation.class)
+ .configure("address", "1.2.3.4")
+ .configure(SshMachineLocation.SSH_TOOL_CLASS, RecordingSshTool.class.getName()));
+ }
+
+ @AfterMethod(alwaysRun=true)
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ RecordingSshTool.clear();
+ }
+
+ @Test
+ public void testCustomOneOffResponse() throws Exception {
+ RecordingSshTool.setCustomOneOffResponse(".*mycmd.*", new CustomResponse(1, "mystdout", "mystderr"));
+ ExecResult result1 = execScript(machine, "mycmd");
+ ExecResult result2 = execScript(machine, "mycmd");
+ assertEquals(result1, new ExecResult(1, "mystdout", "mystderr"));
+ assertEquals(result2, new ExecResult(0, "", ""));
+ }
+
+ private ExecResult execScript(SshMachineLocation machine, String cmd) {
+ OutputStream outStream = new ByteArrayOutputStream();
+ OutputStream errStream = new ByteArrayOutputStream();
+ int exitCode = machine.execScript(ImmutableMap.of("out", outStream, "err", errStream), "mysummary", ImmutableList.of(cmd));
+ String outString = outStream.toString();
+ String errString = errStream.toString();
+ return new ExecResult(exitCode, outString, errString);
+ }
+
+ static class ExecResult {
+ final int exitCode;
+ final String out;
+ final String err;
+
+ ExecResult(int exitCode, String out, String err) {
+ this.exitCode = exitCode;
+ this.out = out;
+ this.err = err;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof ExecResult)) return false;
+ ExecResult o = (ExecResult) obj;
+ return (exitCode == o.exitCode) && Objects.equal(out, o.out) && Objects.equal(err, o.err);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(exitCode, out, err);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("exitCode", exitCode)
+ .add("out", out)
+ .add("err", err)
+ .toString();
+ }
+ }
+}
[2/3] brooklyn-server git commit: Adds TaskPredicates methods
Posted by dr...@apache.org.
Adds TaskPredicates methods
* hasTag(Object)
* isEffector()
* isTransient()
* isInessential()
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/36260656
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/36260656
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/36260656
Branch: refs/heads/master
Commit: 36260656af706350e2e187b769e371cac1afa0ca
Parents: 759c14f
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 19 11:56:38 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 19 11:56:38 2017 +0100
----------------------------------------------------------------------
.../brooklyn/util/core/task/TaskPredicates.java | 78 +++++++++++++++++++-
.../util/core/task/TaskPredicatesTest.java | 70 ++++++++++++++++++
2 files changed, 147 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/36260656/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
index 9c2f7b0..ee34fb7 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
@@ -21,6 +21,7 @@ package org.apache.brooklyn.util.core.task;
import static com.google.common.base.Preconditions.checkNotNull;
import org.apache.brooklyn.api.mgmt.Task;
+import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -69,7 +70,7 @@ public class TaskPredicates {
private static class IsDone implements Predicate<Task<?>> {
@Override
public boolean apply(Task<?> input) {
- return input.isDone();
+ return (input != null) && input.isDone();
}
@Override
public String toString() {
@@ -77,4 +78,79 @@ public class TaskPredicates {
}
}
+ /**
+ * @since 0.12.0
+ */
+ public static Predicate<Task<?>> hasTag(Object tag) {
+ return new HasTag(tag);
+ }
+
+ private static class HasTag implements Predicate<Task<?>> {
+ private final Object tag;
+ public HasTag(Object tag) {
+ this.tag = checkNotNull(tag, "tag");
+ }
+ @Override
+ public boolean apply(Task<?> input) {
+ return (input != null) && input.getTags().contains(tag);
+ }
+ @Override
+ public String toString() {
+ return "hasTag("+tag+")";
+ }
+ }
+
+ /**
+ * @since 0.12.0
+ */
+ public static Predicate<Task<?>> isEffector() {
+ return new IsEffector();
+ }
+
+ private static class IsEffector implements Predicate<Task<?>> {
+ @Override
+ public boolean apply(Task<?> input) {
+ return (input != null) && BrooklynTaskTags.isEffectorTask(input);
+ }
+ @Override
+ public String toString() {
+ return "isEffector()";
+ }
+ }
+
+ /**
+ * @since 0.12.0
+ */
+ public static Predicate<Task<?>> isTransient() {
+ return new IsTransient();
+ }
+
+ private static class IsTransient implements Predicate<Task<?>> {
+ @Override
+ public boolean apply(Task<?> input) {
+ return (input != null) && BrooklynTaskTags.isTransient(input);
+ }
+ @Override
+ public String toString() {
+ return "isTransient()";
+ }
+ }
+
+ /**
+ * @since 0.12.0
+ */
+ public static Predicate<Task<?>> isInessential() {
+ return new IsInessential();
+ }
+
+ private static class IsInessential implements Predicate<Task<?>> {
+ @Override
+ public boolean apply(Task<?> input) {
+ return (input != null) && BrooklynTaskTags.isInessential(input);
+ }
+ @Override
+ public String toString() {
+ return "isTransient()";
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/36260656/core/src/test/java/org/apache/brooklyn/util/core/task/TaskPredicatesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/util/core/task/TaskPredicatesTest.java b/core/src/test/java/org/apache/brooklyn/util/core/task/TaskPredicatesTest.java
index 8a25361..90d6b06 100644
--- a/core/src/test/java/org/apache/brooklyn/util/core/task/TaskPredicatesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/util/core/task/TaskPredicatesTest.java
@@ -21,13 +21,21 @@ package org.apache.brooklyn.util.core.task;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+import java.util.concurrent.CountDownLatch;
+
+import org.apache.brooklyn.api.location.Location;
import org.apache.brooklyn.api.mgmt.ExecutionManager;
import org.apache.brooklyn.api.mgmt.Task;
+import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
+import org.apache.brooklyn.core.test.entity.TestApplication;
+import org.apache.brooklyn.util.exceptions.Exceptions;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import com.google.common.base.Predicates;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.Callables;
public class TaskPredicatesTest extends BrooklynAppUnitTestSupport {
@@ -70,4 +78,66 @@ public class TaskPredicatesTest extends BrooklynAppUnitTestSupport {
assertTrue(TaskPredicates.displayNameSatisfies(Predicates.equalTo("myname")).apply(task));
assertFalse(TaskPredicates.displayNameSatisfies(Predicates.equalTo("wrong")).apply(task));
}
+
+ @Test
+ public void testIsDone() throws Exception {
+ CountDownLatch latch = new CountDownLatch(1);
+ Task<?> task = app.getExecutionContext().submit(new Runnable() {
+ public void run() {
+ try {
+ latch.await();
+ } catch (InterruptedException e) {
+ throw Exceptions.propagate(e);
+ }
+ }});
+
+ assertFalse(TaskPredicates.isDone().apply(task));
+
+ latch.countDown();
+ task.get();
+ assertTrue(TaskPredicates.isDone().apply(task));
+ }
+
+ @Test
+ public void testHasTag() throws Exception {
+ Task<?> task = execManager.submit(TaskBuilder.<Object>builder()
+ .body(Callables.<Object>returning("val"))
+ .tag("mytag")
+ .build());
+ assertTrue(TaskPredicates.hasTag("mytag").apply(task));
+ assertFalse(TaskPredicates.hasTag("wrongtag").apply(task));
+ }
+
+ @Test
+ public void testIsEffector() throws Exception {
+ Task<?> task = app.invoke(TestApplication.START, ImmutableMap.of("locations", ImmutableList.<Location>of()));
+ Task<?> otherTask = execManager.submit(TaskBuilder.<Object>builder()
+ .body(Callables.<Object>returning("val"))
+ .build());
+ assertTrue(TaskPredicates.isEffector().apply(task));
+ assertFalse(TaskPredicates.isEffector().apply(otherTask));
+
+ }
+
+ @Test
+ public void testIsTransient() throws Exception {
+ Task<?> task = execManager.submit(TaskBuilder.<Object>builder()
+ .body(Callables.<Object>returning("val"))
+ .build());
+ assertFalse(TaskPredicates.isTransient().apply(task));
+
+ BrooklynTaskTags.setTransient(task);
+ assertTrue(TaskPredicates.isTransient().apply(task));
+ }
+
+ @Test
+ public void testIsInessential() throws Exception {
+ Task<?> task = execManager.submit(TaskBuilder.<Object>builder()
+ .body(Callables.<Object>returning("val"))
+ .build());
+ assertFalse(TaskPredicates.isInessential().apply(task));
+
+ BrooklynTaskTags.setInessential(task);
+ assertTrue(TaskPredicates.isInessential().apply(task));
+ }
}
[3/3] brooklyn-server git commit: This closes #776
Posted by dr...@apache.org.
This closes #776
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/29583d8c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/29583d8c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/29583d8c
Branch: refs/heads/master
Commit: 29583d8c5bb6763cdf67606412ddcf037b8c5b93
Parents: 04bdb75 3626065
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Mon Jul 24 13:00:29 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Mon Jul 24 13:00:29 2017 +0100
----------------------------------------------------------------------
.../brooklyn/util/core/task/TaskPredicates.java | 78 ++++++++++++-
.../core/internal/ssh/RecordingSshTool.java | 32 ++++++
.../core/internal/ssh/RecordingSshToolTest.java | 110 +++++++++++++++++++
.../util/core/task/TaskPredicatesTest.java | 70 ++++++++++++
4 files changed, 289 insertions(+), 1 deletion(-)
----------------------------------------------------------------------