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 2015/07/24 06:45:10 UTC
[1/3] incubator-brooklyn git commit: Fix SshMachineLocation unable to
connect without explicit port setting
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 8b0bacd2b -> a1efa470d
Fix SshMachineLocation unable to connect without explicit port setting
The settings map obtained from location ssh settings leaves the port
value mapped to null. ShellAbstractTool.getOptionalVal is unable to
coerce this null to integer type, which manifests as SshMachineLocation
being mysteriously unable to connect.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ac77a31d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ac77a31d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ac77a31d
Branch: refs/heads/master
Commit: ac77a31ddd5596bd01cb6033c595518b909eb2f8
Parents: d7ac3ac
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Fri Jul 17 18:41:32 2015 +0300
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Jul 23 15:42:50 2015 +0300
----------------------------------------------------------------------
.../main/java/brooklyn/util/internal/ssh/ShellAbstractTool.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ac77a31d/core/src/main/java/brooklyn/util/internal/ssh/ShellAbstractTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/util/internal/ssh/ShellAbstractTool.java b/core/src/main/java/brooklyn/util/internal/ssh/ShellAbstractTool.java
index 10e9699..5c839a9 100644
--- a/core/src/main/java/brooklyn/util/internal/ssh/ShellAbstractTool.java
+++ b/core/src/main/java/brooklyn/util/internal/ssh/ShellAbstractTool.java
@@ -105,7 +105,7 @@ public abstract class ShellAbstractTool implements ShellTool {
public static <T> T getOptionalVal(Map<String,?> map, ConfigKey<T> keyC) {
if (keyC==null) return null;
String key = keyC.getName();
- if (map!=null && map.containsKey(key)) {
+ if (map!=null && map.containsKey(key) && map.get(key) != null) {
return TypeCoercions.coerce(map.get(key), keyC.getTypeToken());
} else {
return keyC.getDefaultValue();
@@ -115,7 +115,7 @@ public abstract class ShellAbstractTool implements ShellTool {
/** returns the value of the key if specified, otherwise defaultValue */
protected static <T> T getOptionalVal(Map<String,?> map, ConfigKey<T> keyC, T defaultValue) {
String key = keyC.getName();
- if (map.containsKey(key)) {
+ if (map!=null && map.containsKey(key) && map.get(key) != null) {
return TypeCoercions.coerce(map.get(key), keyC.getTypeToken());
} else {
return defaultValue;
[3/3] incubator-brooklyn git commit: This closes #757
Posted by al...@apache.org.
This closes #757
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a1efa470
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a1efa470
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a1efa470
Branch: refs/heads/master
Commit: a1efa470d10c159b08de54edc8f6e089f22f6f3f
Parents: 8b0bacd 84e495b
Author: Aled Sage <al...@gmail.com>
Authored: Thu Jul 23 21:44:51 2015 -0700
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Jul 23 21:44:51 2015 -0700
----------------------------------------------------------------------
.../brooklyn/location/basic/ByonLocationResolver.java | 10 +++++++---
.../brooklyn/util/internal/ssh/ShellAbstractTool.java | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-brooklyn git commit: Avoid adding null port key in
byon location config
Posted by al...@apache.org.
Avoid adding null port key in byon location config
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/84e495b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/84e495b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/84e495b1
Branch: refs/heads/master
Commit: 84e495b1c2c05631917fcdc6a2b52794cdac6dfb
Parents: ac77a31
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Thu Jul 23 15:42:15 2015 +0300
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Thu Jul 23 15:52:25 2015 +0300
----------------------------------------------------------------------
.../brooklyn/location/basic/ByonLocationResolver.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/84e495b1/core/src/main/java/brooklyn/location/basic/ByonLocationResolver.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/ByonLocationResolver.java b/core/src/main/java/brooklyn/location/basic/ByonLocationResolver.java
index 067af47..3695e3e 100644
--- a/core/src/main/java/brooklyn/location/basic/ByonLocationResolver.java
+++ b/core/src/main/java/brooklyn/location/basic/ByonLocationResolver.java
@@ -96,7 +96,11 @@ public class ByonLocationResolver extends AbstractLocationResolver {
String user = (String) config.getStringKey("user");
Integer port = (Integer) TypeCoercions.coerce(config.getStringKey("port"), Integer.class);
Class<? extends MachineLocation> locationClass = OS_TO_MACHINE_LOCATION_TYPE.get(config.get(OS_FAMILY));
-
+
+ MutableMap<String, Object> defaultProps = MutableMap.of();
+ defaultProps.addIfNotNull("user", user);
+ defaultProps.addIfNotNull("port", port);
+
List<String> hostAddresses;
if (hosts instanceof String) {
@@ -119,9 +123,9 @@ public class ByonLocationResolver extends AbstractLocationResolver {
for (Object host : hostAddresses) {
LocationSpec<? extends MachineLocation> machineSpec;
if (host instanceof String) {
- machineSpec = parseMachine((String)host, locationClass, MutableMap.of("user", user, "port", port), spec);
+ machineSpec = parseMachine((String)host, locationClass, defaultProps, spec);
} else if (host instanceof Map) {
- machineSpec = parseMachine((Map<String, ?>)host, locationClass, MutableMap.of("user", user, "port", port), spec);
+ machineSpec = parseMachine((Map<String, ?>)host, locationClass, defaultProps, spec);
} else {
throw new IllegalArgumentException("Expected machine to be String or Map, but was "+host.getClass().getName()+" ("+host+")");
}