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 2022/06/27 14:37:03 UTC
[brooklyn-server] branch master updated (3c5b56832a -> ead3e69868)
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
from 3c5b56832a Merge branch 'fix-effector-test'
add 11e5827faf include effector params in the tag on tasks, as returned by REST API
add 2675c38a3b add ui-effector-hints example to one of our test yamls
add b8e1740001 Merge branch 'master' into include-effector-params-in-rest-api-of-tag
add 998f09c1bf add separate blueprint to test composite effector and effector ui inclusion/exclusion
new d2fd0dcc86 fix failing test -- relied on tag in overly restrictive way
new ead3e69868 Merge branch 'include-effector-params-in-rest-api-of-tag'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camp/brooklyn/AbstractJcloudsStubYamlTest.java | 7 ++++--
...illa-bash-netcat-w-client-and-effector-ui.yaml} | 28 +++++++++++++++++++++-
.../resources/vanilla-bash-netcat-w-client.yaml | 2 +-
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 13 ++++++++--
.../brooklyn/rest/resources/ActivityRestTest.java | 8 ++++++-
5 files changed, 51 insertions(+), 7 deletions(-)
copy camp/camp-brooklyn/src/test/resources/{vanilla-bash-netcat-w-client.yaml => vanilla-bash-netcat-w-client-and-effector-ui.yaml} (82%)
[brooklyn-server] 01/02: fix failing test -- relied on tag in overly restrictive way
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit d2fd0dcc86a08d7fe42f4e633085db29aaa34c89
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jun 27 15:30:22 2022 +0100
fix failing test -- relied on tag in overly restrictive way
---
.../apache/brooklyn/camp/brooklyn/AbstractJcloudsStubYamlTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsStubYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsStubYamlTest.java
index 6f9277a1f7..0b02f4c6b5 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsStubYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/AbstractJcloudsStubYamlTest.java
@@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.io.Reader;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.mgmt.Task;
@@ -163,8 +164,10 @@ public abstract class AbstractJcloudsStubYamlTest extends AbstractJcloudsStubbed
// wait for app to have started
Set<Task<?>> tasks = mgmt().getExecutionManager().getTasksWithAllTags(ImmutableList.of(
BrooklynTaskTags.EFFECTOR_TAG,
- BrooklynTaskTags.tagForContextEntity(app),
- BrooklynTaskTags.tagForEffectorCall(app, "start", ConfigBag.newInstance(ImmutableMap.of("locations", ImmutableMap.of())))));
+ BrooklynTaskTags.tagForContextEntity(app))).stream().filter(task ->
+ task.getTags().stream().filter(tag ->
+ tag instanceof BrooklynTaskTags.EffectorCallTag && ((BrooklynTaskTags.EffectorCallTag)tag).getEffectorName().equals("start")
+ ).findAny().isPresent()).collect(Collectors.toSet());
Iterables.getOnlyElement(tasks).get();
return app;
[brooklyn-server] 02/02: Merge branch 'include-effector-params-in-rest-api-of-tag'
Posted by he...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit ead3e69868e4ca23f08279933f1d9532a9a9a1ab
Merge: 3c5b56832a d2fd0dcc86
Author: Alex Heneveld <al...@cloudsoft.io>
AuthorDate: Mon Jun 27 15:36:58 2022 +0100
Merge branch 'include-effector-params-in-rest-api-of-tag'
.../camp/brooklyn/AbstractJcloudsStubYamlTest.java | 7 ++++--
...illa-bash-netcat-w-client-and-effector-ui.yaml} | 28 +++++++++++++++++++++-
.../resources/vanilla-bash-netcat-w-client.yaml | 2 +-
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 13 ++++++++--
.../brooklyn/rest/resources/ActivityRestTest.java | 8 ++++++-
5 files changed, 51 insertions(+), 7 deletions(-)