From 5af7235132a1f3fa9efa05f7aebd745bb227b9ac Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Sun, 12 Sep 2010 09:31:08 -0700 Subject: [PATCH] corrected disk size --- .../aws/ec2/compute/EC2TemplateBuilderLiveTest.java | 6 ++++-- .../BlueLockVCloudDirectorComputeServiceLiveTest.java | 2 +- .../jclouds/vcloud/compute/functions/HardwareForVApp.java | 7 +++---- .../vcloud/compute/functions/HardwareForVAppTemplate.java | 7 +++---- .../compute/functions/HardwareForVCloudExpressVApp.java | 7 +++---- .../compute/functions/ResourceAllocationsToVolumes.java | 4 ++-- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java index 0790b85bea..3d60cfd7b1 100644 --- a/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java +++ b/aws/core/src/test/java/org/jclouds/aws/ec2/compute/EC2TemplateBuilderLiveTest.java @@ -66,7 +66,7 @@ public class EC2TemplateBuilderLiveTest { Template template = newContext.getComputeService().templateBuilder().imageId("us-east-1/ami-ccb35ea5") .hardwareId(InstanceType.M2_2XLARGE).build(); - System.out.println(template.getImage()); + System.out.println(template.getHardware()); assert (template.getImage().getProviderId().startsWith("ami-")) : template; assertEquals(template.getImage().getOperatingSystem().getVersion(), "5.4"); assertEquals(template.getImage().getOperatingSystem().is64Bit(), true); @@ -118,6 +118,8 @@ public class EC2TemplateBuilderLiveTest { Template microTemplate = newContext.getComputeService().templateBuilder().hardwareId(InstanceType.T1_MICRO) .build(); + System.out.println(microTemplate.getHardware()); + assert (microTemplate.getImage().getProviderId().startsWith("ami-")) : microTemplate; assertEquals(microTemplate.getImage().getOperatingSystem().getVersion(), "9.10"); assertEquals(microTemplate.getImage().getOperatingSystem().is64Bit(), false); @@ -145,7 +147,7 @@ public class EC2TemplateBuilderLiveTest { assertEquals(newContext.getComputeService().listImages().size(), 0); Template template = newContext.getComputeService().templateBuilder().imageId("us-east-1/ami-ccb35ea5").build(); - System.out.println(template.getImage()); + System.out.println(template.getHardware()); assert (template.getImage().getProviderId().startsWith("ami-")) : template; assertEquals(template.getImage().getOperatingSystem().getVersion(), "5.4"); assertEquals(template.getImage().getOperatingSystem().is64Bit(), true); diff --git a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java index af5b7f1be9..c295d24109 100644 --- a/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java +++ b/vcloud/bluelock/src/test/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeServiceLiveTest.java @@ -61,13 +61,13 @@ public class BlueLockVCloudDirectorComputeServiceLiveTest extends VCloudComputeS assertEquals(defaultTemplate.getImage().getOperatingSystem().getDescription(), "Ubuntu Linux (64-bit)"); assert defaultTemplate.getLocation().getId() != null : defaultTemplate.getLocation(); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); + System.out.println(defaultTemplate.getHardware()); } @Override protected Template buildTemplate(TemplateBuilder templateBuilder) { Template template = super.buildTemplate(templateBuilder); Image image = template.getImage(); - assert image.getDefaultCredentials().identity != null : image; assert image.getDefaultCredentials().credential != null : image; return template; } diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java index 4a51738310..b283372273 100644 --- a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java +++ b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVApp.java @@ -89,9 +89,8 @@ public class HardwareForVApp implements Function { })); Iterable volumes = resourceAllocationsToVolumes.apply(hardware.getResourceAllocations()); - return new HardwareImpl(from.getHref().toASCIIString(), from.getName() - + String.format(": vpus(%s), ram(%d), volumes(%s)", processors, ram, volumes), from.getHref() - .toASCIIString(), location, null, ImmutableMap. of(), processors, ram, volumes, - ImagePredicates.idEquals(from.getHref().toASCIIString())); + return new HardwareImpl(from.getHref().toASCIIString(), from.getName(), from.getHref().toASCIIString(), location, + null, ImmutableMap. of(), processors, ram, volumes, ImagePredicates.idEquals(from + .getHref().toASCIIString())); } } \ No newline at end of file diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java index ace67ad5ae..86142b570e 100644 --- a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java +++ b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVAppTemplate.java @@ -114,10 +114,9 @@ public class HardwareForVAppTemplate implements Function })); Iterable volumes = resourceAllocationsToVolumes.apply(hardware.getResourceAllocations()); - return new HardwareImpl(from.getHref().toASCIIString(), from.getName() - + String.format(": vpus(%s), ram(%d), volumes(%s)", processors, ram, volumes), from.getHref() - .toASCIIString(), location, null, ImmutableMap. of(), processors, ram, volumes, - ImagePredicates.idEquals(from.getHref().toASCIIString())); + return new HardwareImpl(from.getHref().toASCIIString(), from.getName(), from.getHref().toASCIIString(), location, + null, ImmutableMap. of(), processors, ram, volumes, ImagePredicates.idEquals(from + .getHref().toASCIIString())); } diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java index 7ee3396a61..3d4e38d56f 100644 --- a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java +++ b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/HardwareForVCloudExpressVApp.java @@ -80,9 +80,8 @@ public class HardwareForVCloudExpressVApp implements Function volumes = resourceAllocationsToVolumes.apply(from.getResourceAllocations()); - return new HardwareImpl(from.getHref().toASCIIString(), from.getName() - + String.format(": vpus(%s), ram(%d), volumes(%s)", processors, ram, volumes), from.getHref() - .toASCIIString(), location, null, ImmutableMap. of(), processors, ram, volumes, - ImagePredicates.idEquals(from.getHref().toASCIIString())); + return new HardwareImpl(from.getHref().toASCIIString(), from.getName(), from.getHref().toASCIIString(), location, + null, ImmutableMap. of(), processors, ram, volumes, ImagePredicates.idEquals(from + .getHref().toASCIIString())); } } \ No newline at end of file diff --git a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java index cff0c50ab6..c05de3689c 100644 --- a/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java +++ b/vcloud/core/src/main/java/org/jclouds/vcloud/compute/functions/ResourceAllocationsToVolumes.java @@ -49,10 +49,10 @@ public class ResourceAllocationsToVolumes implements if (from instanceof VCloudHardDisk) { VCloudHardDisk vDisk = VCloudHardDisk.class.cast(from); return new VolumeImpl(from.getAddressOnParent() + "", Volume.Type.LOCAL, - vDisk.getCapacity() * 1024f, null, from.getAddressOnParent() == 0, true); + vDisk.getCapacity() / 1024f, null, from.getAddressOnParent() == 0, true); } else { return new VolumeImpl(from.getAddressOnParent() + "", Volume.Type.LOCAL, from - .getVirtualQuantity() * 1024 * 1024f, null, from.getAddressOnParent() == 0, true); + .getVirtualQuantity() / 1024 / 1024f, null, from.getAddressOnParent() == 0, true); } }