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 2021/08/20 08:15:51 UTC
[brooklyn-server] branch master updated (a8c9045 -> 9e62cdc)
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 a8c9045 Merge pull request #1225 from jcabrerizo/feature/ldap-independent-groups
new d068bca test tags with locations
new 90f66ab Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-server
add 8975977 New lovViewer entitlement only for accessing the logs
new 9e62cdc This closes #1226
The 3 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:
.../apache/brooklyn/camp/brooklyn/LocationsYamlTest.java | 15 +++++++++++++++
.../brooklyn/core/mgmt/entitlement/Entitlements.java | 15 +++++++++++++++
.../brooklyn/core/mgmt/entitlement/EntitlementsTest.java | 14 ++++++++++++++
3 files changed, 44 insertions(+)
[brooklyn-server] 02/03: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/brooklyn-server
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 90f66ab88b066b8216f8ad78580f91017a9bd8c5
Merge: d068bca a8c9045
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Aug 20 09:15:28 2021 +0100
Merge branch 'master' of https://gitbox.apache.org/repos/asf/brooklyn-server
.../apache/brooklyn/core/mgmt/entitlement/WebEntitlementContext.java | 2 +-
.../java/org/apache/brooklyn/util/core/logbook/file/FileLogStore.java | 4 ++--
.../org/apache/brooklyn/rest/filter/EntitlementContextFilter.java | 4 +++-
.../apache/brooklyn/rest/security/provider/LdapSecurityProvider.java | 3 +++
4 files changed, 9 insertions(+), 4 deletions(-)
[brooklyn-server] 03/03: This closes #1226
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 9e62cdc48d8f0b9c586978eba12701ff04d0536c
Merge: 90f66ab 8975977
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Aug 20 09:15:46 2021 +0100
This closes #1226
.../brooklyn/core/mgmt/entitlement/Entitlements.java | 15 +++++++++++++++
.../brooklyn/core/mgmt/entitlement/EntitlementsTest.java | 14 ++++++++++++++
2 files changed, 29 insertions(+)
[brooklyn-server] 01/03: test tags with locations
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 d068bcaa0edfc13bd73887a4ff5bdc46c25bfc67
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Fri Aug 20 09:15:20 2021 +0100
test tags with locations
---
.../apache/brooklyn/camp/brooklyn/LocationsYamlTest.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java
index ee7ce5b..17f4027 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java
@@ -281,4 +281,19 @@ public class LocationsYamlTest extends AbstractYamlTest {
return log;
}
+ @Test
+ public void testLocationWithTags() throws Exception {
+ String yaml =
+ "location:\n"+
+ " localhost:\n"+
+ " tags: [ foo ]\n"+
+ "services:\n"+
+ "- type: org.apache.brooklyn.core.test.entity.TestEntity\n";
+
+ Entity app = createStartWaitAndLogApplication(yaml);
+ LocalhostMachineProvisioningLocation loc = (LocalhostMachineProvisioningLocation) Iterables.getOnlyElement(app.getLocations());
+ assertNotNull(loc);
+ Assert.assertTrue(loc.tags().containsTag("foo"), "location tags missing: "+loc.tags().getTags());
+ }
+
}