Fix JcloudsLocationRebindTest.testRebindVm Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/78ae0823 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/78ae0823 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/78ae0823
Branch: refs/heads/0.6.0 Commit: 78ae08230cfed1bf3ea8cb4fffaf0465c85f1eba Parents: 7029c37 Author: Aled Sage <[email protected]> Authored: Fri Nov 15 15:25:40 2013 +0000 Committer: Aled Sage <[email protected]> Committed: Fri Nov 15 15:25:40 2013 +0000 ---------------------------------------------------------------------- .../java/brooklyn/location/jclouds/JcloudsLocation.java | 4 ++-- .../location/jclouds/JcloudsLocationRebindTest.java | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/78ae0823/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java index 636f825..bff1df5 100644 --- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java @@ -1022,11 +1022,11 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im try { if (setup.getDescription()==null) setCreationString(setup); - String unqualifiedId = (String) checkNotNull(setup.getStringKey("id"), "id"); + String rawId = (String) checkNotNull(setup.getStringKey("id"), "id"); String hostname = (String) setup.getStringKey("hostname"); String user = checkNotNull(getUser(setup), "user"); String region = (String) setup.getStringKey("region"); - String id = ((region != null) ? region+"/" : "") + unqualifiedId; + String id = rawId.contains("/") ? rawId : (((region != null) ? region+"/" : "") + rawId); LOG.info("Rebinding to VM {} ({}@{}), in jclouds location for provider {}", new Object[] {id, user, (hostname != null ? hostname : "<unspecified>"), getProvider()}); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/78ae0823/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationRebindTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationRebindTest.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationRebindTest.java index cc5f53d..16d617c 100644 --- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationRebindTest.java +++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLocationRebindTest.java @@ -1,5 +1,7 @@ package brooklyn.location.jclouds; +import static com.google.common.base.Preconditions.checkNotNull; + import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -85,10 +87,10 @@ public class JcloudsLocationRebindTest { JcloudsSshMachineLocation machine = obtainMachine(ImmutableMap.of("imageId", EUWEST_IMAGE_ID, "imageOwner", IMAGE_OWNER)); assertTrue(machine.isSshable()); - String id = machine.getJcloudsId(); - InetAddress address = machine.getAddress(); - String hostname = address.getHostName(); - String user = machine.getUser(); + String id = checkNotNull(machine.getJcloudsId(), "id"); + InetAddress address = checkNotNull(machine.getAddress(), "address"); + String hostname = checkNotNull(address.getHostName(), "hostname"); + String user = checkNotNull(machine.getUser(), "user"); // Create a new jclouds location, and re-bind the existing VM to that JcloudsLocation loc2 = (JcloudsLocation) managementContext.getLocationRegistry().resolve(PROVIDER+":"+EUWEST_REGION_NAME);
