Updated Branches: refs/heads/master 94452a97c -> 404870c70
JCLOUDS-269: Report ram as MB rather than GB for SoftLayer Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/404870c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/404870c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/404870c7 Branch: refs/heads/master Commit: 404870c705f2ed55956e3638f7ddeaad20a8a703 Parents: 94452a9 Author: Aled Sage <[email protected]> Authored: Tue Sep 10 11:16:15 2013 +0100 Committer: Andrew Phillips <[email protected]> Committed: Mon Sep 16 11:04:32 2013 +0100 ---------------------------------------------------------------------- .../compute/functions/ProductItemsToHardware.java | 7 +++---- .../compute/SoftLayerTemplateBuilderLiveTest.java | 12 ++++++------ .../compute/functions/ProductItemsToHardwareTest.java | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/404870c7/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java index 68aeea9..4adee6f 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardware.java @@ -85,11 +85,10 @@ public class ProductItemsToHardware implements Function<Iterable<ProductItem>, H double cores = ProductItems.capacity().apply(coresItem).doubleValue(); Matcher cpuMatcher = cpuDescriptionRegex.matcher(coresItem.getDescription()); double coreSpeed = (cpuMatcher.matches()) ? Double.parseDouble(cpuMatcher.group(cpuMatcher.groupCount())) : DEFAULT_CORE_SPEED; - int ram = ProductItems.capacity().apply(ramItem).intValue(); + int ram = ProductItems.capacity().apply(ramItem).intValue() * 1024; - return new HardwareBuilder().ids(hardwareId).processors(ImmutableList.of(new Processor(cores, coreSpeed))).ram( - ram) - .hypervisor("XenServer") + return new HardwareBuilder().ids(hardwareId).processors(ImmutableList.of(new Processor(cores, coreSpeed))) + .ram(ram).hypervisor("XenServer") .volumes( Iterables.transform(filter(items, categoryCodeMatches(diskCategoryRegex)), new Function<ProductItem, Volume>() { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/404870c7/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java index 03f2efb..31f593d 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java @@ -87,7 +87,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); - assertEquals(defaultTemplate.getHardware().getRam(), 1); + assertEquals(defaultTemplate.getHardware().getRam(), 1*1024); assertEquals(getSpace(defaultTemplate.getHardware()), 25.0d); assertEquals(defaultTemplate.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL); // test that we bound the correct templateoptions in guice @@ -141,7 +141,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes Template template = context.getComputeService().templateBuilder().biggest().build(); assertEquals(getCores(template.getHardware()), 16.0d); - assertEquals(template.getHardware().getRam(), 16); + assertEquals(template.getHardware().getRam(), 16*1024); assertEquals(getSpace(template.getHardware()), 100.0d); assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.SAN); } finally { @@ -161,7 +161,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes Template template = context.getComputeService().templateBuilder().build(); assertEquals(getCores(template.getHardware()), 1.0d); - assertEquals(template.getHardware().getRam(), 1); + assertEquals(template.getHardware().getRam(), 1*1024); assertEquals(getSpace(template.getHardware()), 25.0d); assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL); } finally { @@ -181,7 +181,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes Template template = context.getComputeService().templateBuilder().biggest().build(); assertEquals(getCores(template.getHardware()), 8.0d); - assertEquals(template.getHardware().getRam(), 16); + assertEquals(template.getHardware().getRam(), 16*1024); assertEquals(getSpace(template.getHardware()), 100.0d); assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL); } finally { @@ -194,7 +194,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes public void testFastestTemplateBuilder() throws IOException { Template template = view.getComputeService().templateBuilder().fastest().build(); assertEquals(getCores(template.getHardware()), 16.0d); - assertEquals(template.getHardware().getRam(), 1); + assertEquals(template.getHardware().getRam(), 1*1024); assertEquals(getSpace(template.getHardware()), 25.0d); assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL); } @@ -203,7 +203,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes public void testBiggestTemplateBuilder() throws IOException { Template template = view.getComputeService().templateBuilder().biggest().build(); assertEquals(getCores(template.getHardware()), 16.0d); - assertEquals(template.getHardware().getRam(), 16); + assertEquals(template.getHardware().getRam(), 16*1024); assertEquals(getSpace(template.getHardware()), 100.0d); assertEquals(template.getHardware().getVolumes().get(0).getType(), Volume.Type.LOCAL); } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/404870c7/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java ---------------------------------------------------------------------- diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java index f097c0d..cac6159 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/functions/ProductItemsToHardwareTest.java @@ -101,7 +101,7 @@ public class ProductItemsToHardwareTest { assertEquals(1, processors.size()); assertEquals(2.0, processors.get(0).getCores()); - assertEquals(2, hardware.getRam()); + assertEquals(2048, hardware.getRam()); List<? extends Volume> volumes = hardware.getVolumes(); assertEquals(1, volumes.size()); @@ -127,7 +127,7 @@ public class ProductItemsToHardwareTest { assertEquals(1, processors.size()); assertEquals(2.0, processors.get(0).getCores()); - assertEquals(2, hardware.getRam()); + assertEquals(2048, hardware.getRam()); List<? extends Volume> volumes = hardware.getVolumes(); assertEquals(1, volumes.size());
