You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2016/04/05 19:14:39 UTC
[1/2] brooklyn-server git commit: pass brooklynConfig when making
call to getLocationSpec - was failing for byon locations where the host
wasn't specified in the type, see associated tests
Repository: brooklyn-server
Updated Branches:
refs/heads/master 389682602 -> 423bb58a2
pass brooklynConfig when making call to getLocationSpec
- was failing for byon locations where the host wasn't specified in the type, see associated tests
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/85564d03
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/85564d03
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/85564d03
Branch: refs/heads/master
Commit: 85564d0383e992f1da062aebe59b0010f56384ea
Parents: 3896826
Author: John McCabe <jo...@johnmccabe.net>
Authored: Tue Apr 5 16:40:51 2016 +0100
Committer: John McCabe <jo...@johnmccabe.net>
Committed: Tue Apr 5 16:40:51 2016 +0100
----------------------------------------------------------------------
.../spi/creation/CampInternalUtils.java | 2 +-
.../catalog/CatalogYamlLocationTest.java | 46 ++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/85564d03/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
index 677c3eb..c2c6c40 100644
--- a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
+++ b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampInternalUtils.java
@@ -228,7 +228,7 @@ class CampInternalUtils {
}
return spec;
} else {
- Maybe<LocationSpec<? extends Location>> loc = loader.getManagementContext().getLocationRegistry().getLocationSpec(type);
+ Maybe<LocationSpec<? extends Location>> loc = loader.getManagementContext().getLocationRegistry().getLocationSpec(type, brooklynConfig);
if (loc.isPresent()) {
return loc.get().configure(brooklynConfig);
} else {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/85564d03/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
index dda13ea..9dd9118 100644
--- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java
@@ -314,4 +314,50 @@ public class CatalogYamlLocationTest extends AbstractYamlTest {
assertLocationManagerInstancesCount(0);
}
+ @Test
+ public void testByonLocationHostsInConfig() {
+ String symbolicName = "my.catalog.app.id.byon.config";
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " version: " + TEST_VERSION,
+ " items:",
+ " - id: " + symbolicName,
+ " itemType: location",
+ " item:",
+ " type: byon",
+ " brooklyn.config:",
+ " displayName: testingdisplayName",
+ " user: testinguser",
+ " password: testingpassword",
+ " hosts:",
+ " - 10.10.10.102"
+ );
+
+ assertLocationRegistryCount(1);
+ assertCatalogCount(1);
+ assertLocationManagerInstancesCount(0);
+ }
+
+ @Test
+ public void testByonLocationHostsInType() {
+ String symbolicName = "my.catalog.app.id.byon.config.inline";
+ addCatalogItems(
+ "brooklyn.catalog:",
+ " version: " + TEST_VERSION,
+ " items:",
+ " - id: " + symbolicName,
+ " itemType: location",
+ " item:",
+ " type: byon:(hosts=\"10.10.10.102\")",
+ " brooklyn.config:",
+ " displayName: testingdisplayName",
+ " user: testinguser",
+ " password: testingpassword"
+ );
+
+ assertLocationRegistryCount(1);
+ assertCatalogCount(1);
+ assertLocationManagerInstancesCount(0);
+ }
+
}
[2/2] brooklyn-server git commit: This closes #102
Posted by al...@apache.org.
This closes #102
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/423bb58a
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/423bb58a
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/423bb58a
Branch: refs/heads/master
Commit: 423bb58a27c2b074dfb5946d8587507c56319d0e
Parents: 3896826 85564d0
Author: Aled Sage <al...@gmail.com>
Authored: Tue Apr 5 18:14:22 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Apr 5 18:14:22 2016 +0100
----------------------------------------------------------------------
.../spi/creation/CampInternalUtils.java | 2 +-
.../catalog/CatalogYamlLocationTest.java | 46 ++++++++++++++++++++
2 files changed, 47 insertions(+), 1 deletion(-)
----------------------------------------------------------------------