From 98b28d78731003f91caf81411a14d8fdaa006903 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 3 Oct 2011 16:36:49 -0700 Subject: [PATCH] added better logging to softlayer tests --- .../softlayer/binders/ProductOrderToJson.java | 54 +++--- .../functions/VirtualGuestToNodeMetadata.java | 38 +++-- .../softlayer/domain/ProductOrder.java | 7 +- .../SoftLayerComputeServiceLiveTest.java | 7 +- .../softlayer/src/test/resources/log4j.xml | 161 ++++++++++++------ 5 files changed, 163 insertions(+), 104 deletions(-) diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java index c43c2e326e..19fa5b3b33 100644 --- a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java +++ b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/binders/ProductOrderToJson.java @@ -36,10 +36,9 @@ import java.util.Set; import static com.google.common.base.Preconditions.checkNotNull; /** - * Converts a ProductOrder into a json string - * valid for placing an order via the softlayer api - * The String is set into the payload of the HttpRequest - * + * Converts a ProductOrder into a json string valid for placing an order via the softlayer api The + * String is set into the payload of the HttpRequest + * * @author Jason King */ public class ProductOrderToJson implements Binder { @@ -53,7 +52,7 @@ public class ProductOrderToJson implements Binder { @Override public R bindToRequest(R request, Object input) { - checkNotNull(input,"order"); + checkNotNull(input, "order"); ProductOrder order = ProductOrder.class.cast(input); request.setPayload(buildJson(order)); return request; @@ -61,34 +60,34 @@ public class ProductOrderToJson implements Binder { /** * Builds a Json string suitable for sending to the softlayer api + * * @param order * @return */ String buildJson(ProductOrder order) { - Iterable prices = Iterables.transform(order.getPrices(), - new Function() { - @Override - public Price apply(ProductItemPrice productItemPrice) { - return new Price(productItemPrice.getId()); - } - }); + Iterable prices = Iterables.transform(order.getPrices(), new Function() { + @Override + public Price apply(ProductItemPrice productItemPrice) { + return new Price(productItemPrice.getId()); + } + }); Iterable hosts = Iterables.transform(order.getVirtualGuests(), - new Function() { - @Override - public HostnameAndDomain apply(VirtualGuest virtualGuest) { - return new HostnameAndDomain(virtualGuest.getHostname(),virtualGuest.getDomain()); - } - }); + new Function() { + @Override + public HostnameAndDomain apply(VirtualGuest virtualGuest) { + return new HostnameAndDomain(virtualGuest.getHostname(), virtualGuest.getDomain()); + } + }); - OrderData data = new OrderData(order.getPackageId(),order.getLocation(), - Sets.newLinkedHashSet(prices),Sets.newLinkedHashSet(hosts), - order.getQuantity(),order.getUseHourlyPricing()); + OrderData data = new OrderData(order.getPackageId(), order.getLocation(), Sets.newLinkedHashSet(prices), Sets + .newLinkedHashSet(hosts), order.getQuantity(), order.getUseHourlyPricing()); - return json.toJson(ImmutableMap.of("parameters", ImmutableList.of(data))); + return json.toJson(ImmutableMap.of("parameters", ImmutableList. of(data))); } + @SuppressWarnings("unused") private static class OrderData { private String complexType = "SoftLayer_Container_Product_Order_Virtual_Guest"; private long packageId = -1; @@ -98,30 +97,31 @@ public class ProductOrderToJson implements Binder { private long quantity; private boolean useHourlyPricing; - public OrderData( long packageId, String location, - Set prices,Set virtualGuests, - long quantity, boolean useHourlyPricing ) { + public OrderData(long packageId, String location, Set prices, Set virtualGuests, + long quantity, boolean useHourlyPricing) { this.packageId = packageId; this.location = location; this.prices = prices; this.virtualGuests = virtualGuests; this.quantity = quantity; this.useHourlyPricing = useHourlyPricing; - } + } + @SuppressWarnings("unused") private static class HostnameAndDomain { private String hostname; private String domain; - public HostnameAndDomain(String hostname,String domain) { + public HostnameAndDomain(String hostname, String domain) { this.hostname = hostname; this.domain = domain; } } + @SuppressWarnings("unused") private static class Price { private long id; diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java index 1c73929bb3..10d3ce9ad6 100644 --- a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java +++ b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/VirtualGuestToNodeMetadata.java @@ -20,7 +20,6 @@ package org.jclouds.softlayer.compute.functions; import static com.google.common.base.Preconditions.checkNotNull; import static org.jclouds.compute.util.ComputeServiceUtils.parseGroupFromName; -import static org.jclouds.softlayer.compute.functions.ProductItemsToHardware.CORE_SPEED; import java.util.Map; import java.util.Set; @@ -28,11 +27,13 @@ import java.util.Set; import javax.inject.Inject; import javax.inject.Singleton; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import org.jclouds.collect.FindResourceInSet; import org.jclouds.collect.Memoized; -import org.jclouds.compute.domain.*; +import org.jclouds.compute.domain.Hardware; +import org.jclouds.compute.domain.Image; +import org.jclouds.compute.domain.NodeMetadata; +import org.jclouds.compute.domain.NodeMetadataBuilder; +import org.jclouds.compute.domain.NodeState; import org.jclouds.domain.Credentials; import org.jclouds.domain.Location; import org.jclouds.http.HttpResponseException; @@ -41,12 +42,14 @@ import org.jclouds.softlayer.domain.Datacenter; import org.jclouds.softlayer.domain.ProductItem; import org.jclouds.softlayer.domain.ProductOrder; import org.jclouds.softlayer.domain.VirtualGuest; +import org.jclouds.softlayer.predicates.ProductItemPredicates; import com.google.common.base.Function; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import org.jclouds.softlayer.predicates.ProductItemPredicates; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; /** * @author Adrian Cole @@ -56,7 +59,7 @@ public class VirtualGuestToNodeMetadata implements Function serverStateToNodeState = ImmutableMap . builder().put(VirtualGuest.State.HALTED, NodeState.PENDING).put( - VirtualGuest.State.PAUSED, NodeState.SUSPENDED).put(VirtualGuest.State.RUNNING, NodeState.RUNNING) + VirtualGuest.State.PAUSED, NodeState.SUSPENDED).put(VirtualGuest.State.RUNNING, NodeState.RUNNING) .put(VirtualGuest.State.UNRECOGNIZED, NodeState.UNRECOGNIZED).build(); private final Map credentialStore; @@ -67,9 +70,7 @@ public class VirtualGuestToNodeMetadata implements Function credentialStore, FindLocationForVirtualGuest findLocationForVirtualGuest, - GetHardwareForVirtualGuest getHardwareForVirtualGuest, - GetImageForVirtualGuest getImageForVirtualGuest - ) { + GetHardwareForVirtualGuest getHardwareForVirtualGuest, GetImageForVirtualGuest getImageForVirtualGuest) { this.credentialStore = checkNotNull(credentialStore, "credentialStore"); this.findLocationForVirtualGuest = checkNotNull(findLocationForVirtualGuest, "findLocationForVirtualGuest"); this.getHardwareForVirtualGuest = checkNotNull(getHardwareForVirtualGuest, "getHardwareForVirtualGuest"); @@ -87,13 +88,14 @@ public class VirtualGuestToNodeMetadata implements Function items = Iterables.transform(order.getPrices(),ProductItems.item()); + Iterable items = Iterables.transform(order.getPrices(), ProductItems.item()); return new ProductItemsToHardware().apply(Sets.newLinkedHashSet(items)); } catch (HttpResponseException e) { - //Shouldn't happen any more - was blowing up in Singapore + // Shouldn't happen any more - was blowing up in Singapore return null; } } @@ -160,14 +163,15 @@ public class VirtualGuestToNodeMetadata implements Function items = Iterables.transform(order.getPrices(),ProductItems.item()); + Iterable items = Iterables.transform(order.getPrices(), ProductItems.item()); ProductItem os = Iterables.find(items, ProductItemPredicates.categoryCode("os")); return new ProductItemToImage().apply(os); } catch (HttpResponseException e) { - //Shouldn't happen any more - was blowing up in Singapore + // Shouldn't happen any more - was blowing up in Singapore return null; } } diff --git a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java index 0565ac5571..f11cd9b41e 100644 --- a/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java +++ b/sandbox-providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductOrder.java @@ -18,13 +18,12 @@ */ package org.jclouds.softlayer.domain; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; +import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.base.Strings.emptyToNull; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; /** * diff --git a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java b/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java index f2f7d60f5d..7380843fa1 100644 --- a/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java +++ b/sandbox-providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerComputeServiceLiveTest.java @@ -18,20 +18,15 @@ */ package org.jclouds.softlayer.compute; -import com.google.inject.Module; import org.jclouds.compute.BaseComputeServiceLiveTest; import org.jclouds.compute.ComputeServiceContextFactory; -import org.jclouds.compute.domain.NodeMetadata; -import org.jclouds.domain.LocationScope; import org.jclouds.rest.RestContext; import org.jclouds.softlayer.SoftLayerAsyncClient; import org.jclouds.softlayer.SoftLayerClient; import org.jclouds.sshj.config.SshjSshClientModule; import org.testng.annotations.Test; -import java.io.IOException; - -import static org.testng.Assert.assertEquals; +import com.google.inject.Module; /** * diff --git a/sandbox-providers/softlayer/src/test/resources/log4j.xml b/sandbox-providers/softlayer/src/test/resources/log4j.xml index de1c96aec4..63810d3ca0 100644 --- a/sandbox-providers/softlayer/src/test/resources/log4j.xml +++ b/sandbox-providers/softlayer/src/test/resources/log4j.xml @@ -1,12 +1,12 @@ - + + debug="false"> @@ -19,72 +19,133 @@ - + - - - - + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - + + - + + + + + + - - - - - - - + + + + + + + + + + +