From 99f0c833d2696e4f7d63b79d6c05c30d6fca9f7d Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 19 Dec 2011 09:10:44 -0800 Subject: [PATCH] updated elastichosts templatebuilderlivetest to match new json data --- ...lasticHostsPeer1SanAntonioTemplateBuilderLiveTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest.java b/providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest.java index cec755a50c..5a0030fca4 100644 --- a/providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest.java +++ b/providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest.java @@ -52,11 +52,11 @@ public class ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest extends BaseTemp public boolean apply(OsFamilyVersion64Bit input) { switch (input.family) { case UBUNTU: - return (input.version.equals("") || input.version.startsWith("10.")) && input.is64Bit; + return (input.version.equals("") || ImmutableSet.of("11.10", "10.04").contains(input.version)) && input.is64Bit; case DEBIAN: - return (input.version.equals("") || input.version.matches("[56].0")) && input.is64Bit; + return (input.version.equals("") || input.version.equals("6.0")) && input.is64Bit; case CENTOS: - return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit; + return (input.version.equals("") || input.version.equals("6.0")) && input.is64Bit; case WINDOWS: return (input.version.equals("") || input.version.equals("2008 R2") || input.version.equals("2008")) && input.is64Bit; @@ -72,7 +72,7 @@ public class ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest extends BaseTemp public void testTemplateBuilder() { Template defaultTemplate = this.context.getComputeService().templateBuilder().build(); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.10"); + assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.10"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-sat-p"); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);