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/05/31 15:12:00 UTC
[2/6] brooklyn-server git commit:
JcloudsLocation.createTemporarySshMachineLocation: sshToolClass not special
JcloudsLocation.createTemporarySshMachineLocation: sshToolClass not special
Just rely on any `sshToolClass` config being passed in the ConfigBag
arg (rather than also looking up jcloudsLocation.config()). The passed
in ConfigBag should be a merger of the location’s config and any
additional config that has been passed in.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4105fd46
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4105fd46
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4105fd46
Branch: refs/heads/master
Commit: 4105fd462f0726c6b799731a1f220ca8be97d48d
Parents: 3f06cad
Author: Aled Sage <al...@gmail.com>
Authored: Tue May 30 11:16:09 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue May 30 16:32:48 2017 +0100
----------------------------------------------------------------------
.../brooklyn/location/jclouds/JcloudsLocation.java | 4 ----
.../jclouds/DefaultConnectivityResolverTest.java | 15 ++++++++-------
2 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4105fd46/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index 8652c50..05bac2a 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -1611,10 +1611,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
sshProps.put("port", hostAndPort.getPort());
sshProps.put(AbstractLocation.TEMPORARY_LOCATION.getName(), true);
sshProps.put(LocalLocationManager.CREATE_UNMANAGED.getName(), true);
- String sshClass = config().get(SshMachineLocation.SSH_TOOL_CLASS);
- if (Strings.isNonBlank(sshClass)) {
- sshProps.put(SshMachineLocation.SSH_TOOL_CLASS.getName(), sshClass);
- }
sshProps.remove("id");
sshProps.remove("password");
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4105fd46/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java
index 6e7d8b0..3e0b046 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/DefaultConnectivityResolverTest.java
@@ -55,7 +55,8 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
.portForwardSshOverride(HostAndPort.fromParts("10.1.1.4", 4361))
.build();
DefaultConnectivityResolver customizer = new DefaultConnectivityResolver();
- ManagementAddressResolveResult result = customizer.resolve(jcloudsLocation, newNodeMetadata(), ConfigBag.newInstance(), options);
+ ConfigBag configBag = jcloudsLocation.config().getBag();
+ ManagementAddressResolveResult result = customizer.resolve(jcloudsLocation, newNodeMetadata(), configBag, options);
assertEquals(result.hostAndPort().getHostText(), "10.1.1.4");
assertEquals(result.hostAndPort().getPort(), 4361);
}
@@ -72,7 +73,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
.userCredentials(credential)
.build();
DefaultConnectivityResolver customizer = new DefaultConnectivityResolver();
- ConfigBag configBag = ConfigBag.newInstance();
+ ConfigBag configBag = jcloudsLocation.config().getBag();
ManagementAddressResolveResult result = customizer.resolve(
jcloudsLocation, newNodeMetadata(), configBag, options);
assertEquals(result.hostAndPort().getHostText(), expectedHostname);
@@ -91,7 +92,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
});
initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of());
DefaultConnectivityResolver customizer = new DefaultConnectivityResolver();
- final ConfigBag config = ConfigBag.newInstance(ImmutableMap.of(
+ final ConfigBag config = ConfigBag.newInstanceExtending(jcloudsLocation.config().getBag(), ImmutableMap.of(
JcloudsLocationConfig.WAIT_FOR_SSHABLE, "1ms",
JcloudsLocationConfig.POLL_FOR_FIRST_REACHABLE_ADDRESS, "1ms"));
assertTrue(customizer.checkCredential(
@@ -114,7 +115,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
});
initNodeCreatorAndJcloudsLocation(newNodeCreator(), ImmutableMap.of());
DefaultConnectivityResolver customizer = new DefaultConnectivityResolver();
- final ConfigBag config = ConfigBag.newInstance(ImmutableMap.of(
+ final ConfigBag config = ConfigBag.newInstanceExtending(jcloudsLocation.config().getBag(), ImmutableMap.of(
JcloudsLocationConfig.WAIT_FOR_WINRM_AVAILABLE, "1ms",
JcloudsLocationConfig.POLL_FOR_FIRST_REACHABLE_ADDRESS, "1ms"));
assertTrue(customizer.checkCredential(
@@ -146,7 +147,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
return new RecordingSshTool.CustomResponse(exitCode, "", "");
}
});
- ConfigBag config = ConfigBag.newInstance(ImmutableMap.of(
+ ConfigBag config = ConfigBag.newInstanceExtending(jcloudsLocation.config().getBag(), ImmutableMap.of(
JcloudsLocationConfig.LOOKUP_AWS_HOSTNAME, false,
JcloudsLocationConfig.WAIT_FOR_SSHABLE, "1ms",
JcloudsLocationConfig.POLL_FOR_FIRST_REACHABLE_ADDRESS, "1ms",
@@ -194,7 +195,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
JcloudsLocationConfig.CONNECTIVITY_RESOLVER, customizer));
ConnectivityResolverOptions options = newResolveOptionsForIps(reachableIps, Duration.millis(100)).build();
- ConfigBag configBag = ConfigBag.newInstance();
+ ConfigBag configBag = jcloudsLocation.config().getBag();
ManagementAddressResolveResult result = customizer.resolve(jcloudsLocation, newNodeMetadata(), configBag, options);
assertEquals(result.hostAndPort().getHostText(), expectedIp);
@@ -223,7 +224,7 @@ public class DefaultConnectivityResolverTest extends AbstractJcloudsStubbedUnitT
JcloudsLocationConfig.CONNECTIVITY_RESOLVER, customizer));
ConnectivityResolverOptions options = newResolveOptionsForIps(reachableIps, Duration.ONE_MILLISECOND).build();
- ConfigBag configBag = ConfigBag.newInstance();
+ ConfigBag configBag = jcloudsLocation.config().getBag();
customizer.resolve(jcloudsLocation, newNodeMetadata(), configBag, options);
}