From 443ca4300c998225020d6040ec8f22c7a4191441 Mon Sep 17 00:00:00 2001
From: Andrea Turli <andrea.turli@gmail.com>
Date: Fri, 15 May 2015 16:03:25 +0200
Subject: [PATCH] [SoftLayer] use FQDN as hostname

---
 .../compute/functions/VirtualGuestToNodeMetadata.java          | 2 +-
 .../compute/functions/VirtualGuestToNodeMetadataTest.java      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
index 75d8bfb5cf..472d61d2f3 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java
@@ -70,7 +70,7 @@ public class VirtualGuestToNodeMetadata implements Function<VirtualGuest, NodeMe
       NodeMetadataBuilder builder = new NodeMetadataBuilder();
       builder.ids(from.getId() + "");
       builder.name(from.getHostname());
-      builder.hostname(from.getHostname() + from.getDomain());
+      builder.hostname(from.getFullyQualifiedDomainName());
       if (from.getDatacenter() != null) {
          builder.location(from(locations.get()).firstMatch(
                  LocationPredicates.idEquals(from.getDatacenter().getName())).orNull());
diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java
index 41eb90f028..868e788eb7 100644
--- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java
+++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadataTest.java
@@ -67,7 +67,7 @@ public class VirtualGuestToNodeMetadataTest {
       assertEquals(nodeMetadata.getName(), virtualGuest.getHostname());
       assertNotNull(nodeMetadata.getLocation());
       assertEquals(nodeMetadata.getLocation().getId(), location.getId());
-      assertEquals(nodeMetadata.getHostname(), virtualGuest.getHostname() + virtualGuest.getDomain());
+      assertEquals(nodeMetadata.getHostname(), virtualGuest.getFullyQualifiedDomainName());
       assertEquals(nodeMetadata.getHardware().getRam(), virtualGuest.getMaxMemory());
       assertTrue(nodeMetadata.getHardware().getProcessors().size() == 1);
       assertEquals(Iterables.get(nodeMetadata.getHardware().getProcessors(), 0).getCores(), (double) virtualGuest.getStartCpus());
@@ -80,6 +80,7 @@ public class VirtualGuestToNodeMetadataTest {
       return VirtualGuest.builder()
               .domain("example.com")
               .hostname("host1")
+              .fullyQualifiedDomainName("host1.example.com")
               .id(1301396)
               .maxMemory(1024)
               .startCpus(1)