From 95935f861c9b892b4f604b42d1cfce8b79c3662f Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Wed, 15 Feb 2012 00:40:51 +0100
Subject: [PATCH] glesys now returns server state in create response

---
 .../functions/ServerDetailsToNodeMetadata.java    |  2 +-
 .../ServerDetailsToNodeMetadataTest.java          | 15 +--------------
 .../glesys/features/ServerClientExpectTest.java   |  2 +-
 .../glesys/src/test/resources/server_details.json |  2 +-
 4 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java
index 1077796769..a52e052e9d 100644
--- a/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java
+++ b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java
@@ -109,7 +109,7 @@ public class ServerDetailsToNodeMetadata implements Function<ServerDetails, Node
             .processors(ImmutableList.of(new Processor(from.getCpuCores(), 1.0)))
             .volumes(ImmutableList.<Volume> of(new VolumeImpl((float) from.getDiskSizeGB(), true, true)))
             .hypervisor(from.getPlatform()).build());
-      builder.state(from.getState() != null ? serverStateToNodeState.get(from.getState()) : NodeState.PENDING);
+      builder.state(serverStateToNodeState.get(from.getState()));
       Iterable<String> addresses = Iterables.filter(Iterables.transform(from.getIps(), new Function<Ip, String>() {
 
          @Override
diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java
index d51519ed06..c48ed8c28f 100644
--- a/labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java
+++ b/labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java
@@ -68,20 +68,7 @@ public class ServerDetailsToNodeMetadataTest extends BaseGleSYSComputeServiceExp
                         HttpResponse
                               .builder()
                               .statusCode(200)
-                              .payload(
-                                    payloadFromString("{\"response\":{\"status\":{\"code\":200,\"timestamp\":\"2012-02-10T11:28:50+01:00\",\"text\":\"OK\"},\"server\":{\"state\":\"running\"},\"debug\":{\"input\":{\"serverid\":\"xm3276891\",\"statustype\":\"state\"}}}}"))
-                              .build())
-                  .put(HttpRequest
-                        .builder()
-                        .method("POST")
-                        .endpoint(URI.create("https://api.glesys.com/server/status/format/json"))
-                        .headers(
-                              ImmutableMultimap.<String, String> builder().put("Accept", "application/json")
-                                    .put("Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==").build())
-                        .payload(
-                              newUrlEncodedFormPayload(ImmutableMultimap.<String, String> builder()
-                                    .put("serverid", "xm3276891").put("statustype", "state").build())).build(),
-                        HttpResponse.builder().statusCode(206).payload(payloadFromResource("/server_status.json"))
+                              .payload(payloadFromResource("/server_details.json"))
                               .build()).build()
 
       ).getInstance(ServerDetailsToNodeMetadata.class);
diff --git a/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java
index b6e0360991..d381f08314 100644
--- a/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java
+++ b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java
@@ -159,7 +159,7 @@ public class ServerClientExpectTest extends BaseRestClientExpectTest<GleSYSClien
       Cost cost = Cost.builder().amount(13.22).currency("EUR").timePeriod("month").build();
       return ServerDetails.builder().id("xm3276891").transferGB(50).hostname("glesys-s-6dd").cpuCores(1).memorySizeMB(512)
             .diskSizeGB(5).description("glesys-s-6dd").datacenter("Falkenberg").platform("Xen")
-            .templateName("Ubuntu 11.04 x64").cost(cost).ips(ip).build();
+            .templateName("Ubuntu 11.04 x64").state(Server.State.LOCKED).cost(cost).ips(ip).build();
    }
 
    @Test
diff --git a/labs/glesys/src/test/resources/server_details.json b/labs/glesys/src/test/resources/server_details.json
index bf7f594928..2083d23c54 100644
--- a/labs/glesys/src/test/resources/server_details.json
+++ b/labs/glesys/src/test/resources/server_details.json
@@ -1 +1 @@
-{"response":{"status":{"code":200,"timestamp":"2012-02-10T11:11:05+01:00","text":"OK"},"server":{"serverid":"xm3276891","hostname":"glesys-s-6dd","description":"glesys-s-6dd","cpucores":1,"memorysize":512,"disksize":5,"transfer":50,"templatename":"Ubuntu 11.04 x64","datacenter":"Falkenberg","managedhosting":"no","platform":"Xen","cost":{"amount":13.22,"currency":"EUR","timeperiod":"month"},"iplist":[{"ipaddress":"109.74.10.45","version":4,"cost":2,"currency":"EUR"}]},"debug":{"input":{"serverid":"xm3276891"}}}}
\ No newline at end of file
+{"response":{"status":{"code":200,"timestamp":"2012-02-10T11:11:05+01:00","text":"OK"},"server":{"serverid":"xm3276891","hostname":"glesys-s-6dd","description":"glesys-s-6dd","cpucores":1,"memorysize":512,"disksize":5,"transfer":50,"templatename":"Ubuntu 11.04 x64","datacenter":"Falkenberg","managedhosting":"no","platform":"Xen","cost":{"amount":13.22,"currency":"EUR","timeperiod":"month"},"iplist":[{"ipaddress":"109.74.10.45","version":4,"cost":2,"currency":"EUR"}], "state":"locked"},"debug":{"input":{"serverid":"xm3276891"}}}}
\ No newline at end of file