From f50ef6ecfc9cd73b3616b60255922569bbce3b82 Mon Sep 17 00:00:00 2001 From: Matt Stephenson Date: Wed, 28 Dec 2011 10:46:10 -0600 Subject: [PATCH] Add tests for Virtual CPU attribute in Flavor json --- .../nova/compute/functions/FlavorToHardwareTest.java | 2 +- .../functions/ParseFlavorFromJsonResponseTest.java | 1 + .../ParseFlavorListFromJsonResponseTest.java | 12 +++++++----- .../src/test/resources/test_get_flavor_details.json | 1 + .../src/test/resources/test_list_flavors_detail.json | 2 ++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java index c42ad4eece..616487a072 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/compute/functions/FlavorToHardwareTest.java @@ -44,7 +44,7 @@ public class FlavorToHardwareTest { public void test() throws UnknownHostException, URISyntaxException { Hardware flavor = convertFlavor(); Hardware tempFlavor = new HardwareBuilder().ids("1").name("256 MB Server") - .processors(ImmutableList.of(new Processor(1.0, 1.0))) + .processors(ImmutableList.of(new Processor(2.0, 2.0))) .ram(256) .volumes(ImmutableList.of( new VolumeBuilder().type(Volume.Type.LOCAL).size(10.0f).durable(true).bootDevice(true).build())) diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java index a6b2c727a7..c1128e31cc 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorFromJsonResponseTest.java @@ -55,6 +55,7 @@ public class ParseFlavorFromJsonResponseTest { assertEquals(response.getName(), "256 MB Server"); assertEquals(response.getDisk().intValue(), 10); assertEquals(response.getRam().intValue(), 256); + assertEquals(response.getVcpus().intValue(), 2); } public static Flavor parseFlavor() { diff --git a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java index bc90d310b5..a3edb25bf2 100644 --- a/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java +++ b/apis/nova/src/test/java/org/jclouds/openstack/nova/functions/ParseFlavorListFromJsonResponseTest.java @@ -50,7 +50,7 @@ public class ParseFlavorListFromJsonResponseTest { public void testApplyInputStream() { InputStream is = getClass().getResourceAsStream("/test_list_flavors.json"); - List expects = ImmutableList.of(new Flavor(1, "256 MB Server"), new Flavor(2, "512 MB Server")); + List expects = ImmutableList.of(new Flavor(1, "256 MB Server", null, null, null), new Flavor(2, "512 MB Server", null, null, null)); UnwrapOnlyJsonValue> parser = i.getInstance(Key .get(new TypeLiteral>>() { @@ -69,13 +69,15 @@ public class ParseFlavorListFromJsonResponseTest { List response = parser.apply(new HttpResponse(200, "ok", Payloads.newInputStreamPayload(is))); assertEquals(response.get(0).getId(), 1); assertEquals(response.get(0).getName(), "256 MB Server"); - assertEquals(response.get(0).getDisk(), new Integer(10)); - assertEquals(response.get(0).getRam(), new Integer(256)); + assertEquals(response.get(0).getDisk(), Integer.valueOf(10)); + assertEquals(response.get(0).getRam(), Integer.valueOf(256)); + assertEquals(response.get(0).getVcpus(), Integer.valueOf(2)); assertEquals(response.get(1).getId(), 2); assertEquals(response.get(1).getName(), "512 MB Server"); - assertEquals(response.get(1).getDisk(), new Integer(20)); - assertEquals(response.get(1).getRam(), new Integer(512)); + assertEquals(response.get(1).getDisk(), Integer.valueOf(20)); + assertEquals(response.get(1).getRam(), Integer.valueOf(512)); + assertEquals(response.get(1).getVcpus(), Integer.valueOf(5)); } diff --git a/apis/nova/src/test/resources/test_get_flavor_details.json b/apis/nova/src/test/resources/test_get_flavor_details.json index bd3266c04e..ed1b29cf20 100644 --- a/apis/nova/src/test/resources/test_get_flavor_details.json +++ b/apis/nova/src/test/resources/test_get_flavor_details.json @@ -4,6 +4,7 @@ "name" : "256 MB Server", "ram" : 256, "disk" : 10, + "vcpus" : 2, "links": [ { "rel" : "self", diff --git a/apis/nova/src/test/resources/test_list_flavors_detail.json b/apis/nova/src/test/resources/test_list_flavors_detail.json index c8939ee520..867a5960f4 100644 --- a/apis/nova/src/test/resources/test_list_flavors_detail.json +++ b/apis/nova/src/test/resources/test_list_flavors_detail.json @@ -5,6 +5,7 @@ "name" : "256 MB Server", "ram" : 256, "disk" : 10, + "vcpus" : 2, "links": [ { "rel" : "self", @@ -27,6 +28,7 @@ "name" : "512 MB Server", "ram" : 512, "disk" : 20, + "vcpus" : 5, "links": [ { "rel" : "self",