From 2506b8c581659efe1a291707572b6bd2a03586d0 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Tue, 12 Jul 2011 20:53:06 -0700
Subject: [PATCH] Issue 624:update terremark config to use ubuntu 10.04
 templates

---
 ...markVCloudComputeServiceContextModule.java | 10 -------
 ...kVCloudExpressTemplateBuilderLiveTest.java | 28 +++++++++----------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/common/trmk/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkVCloudComputeServiceContextModule.java b/common/trmk/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkVCloudComputeServiceContextModule.java
index d88dd9801e..cdc4755768 100644
--- a/common/trmk/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkVCloudComputeServiceContextModule.java
+++ b/common/trmk/src/main/java/org/jclouds/vcloud/terremark/compute/config/TerremarkVCloudComputeServiceContextModule.java
@@ -18,8 +18,6 @@
  */
 package org.jclouds.vcloud.terremark.compute.config;
 
-import static org.jclouds.compute.domain.OsFamily.UBUNTU;
-
 import java.security.SecureRandom;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -31,7 +29,6 @@ import org.jclouds.compute.ComputeService;
 import org.jclouds.compute.config.BindComputeStrategiesByClass;
 import org.jclouds.compute.config.BindComputeSuppliersByClass;
 import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.compute.options.TemplateOptions;
 import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy;
 import org.jclouds.vcloud.compute.VCloudExpressComputeClient;
@@ -48,7 +45,6 @@ import org.jclouds.vcloud.terremark.compute.strategy.ParseVAppTemplateDescriptio
 
 import com.google.common.base.Function;
 import com.google.common.base.Supplier;
-import com.google.inject.Injector;
 import com.google.inject.Provides;
 import com.google.inject.TypeLiteral;
 
@@ -72,12 +68,6 @@ public class TerremarkVCloudComputeServiceContextModule extends VCloudExpressCom
 
    }
 
-   // prefer jeos as the copy time is much shorter
-   @Override
-   protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
-      return template.osFamily(UBUNTU).osDescriptionMatches(".*JeOS.*").os64Bit(true);
-   }
-
    @Override
    protected void configure() {
       super.configure();
diff --git a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java
index ad655f429b..5cc47405e7 100644
--- a/providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java
+++ b/providers/trmk-vcloudexpress/src/test/java/org/jclouds/vcloud/terremark/compute/TerremarkVCloudExpressTemplateBuilderLiveTest.java
@@ -31,6 +31,7 @@ import org.jclouds.compute.domain.Template;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Predicate;
+import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableSet;
 
 /**
@@ -46,30 +47,29 @@ public class TerremarkVCloudExpressTemplateBuilderLiveTest extends BaseTemplateB
 
    @Override
    protected Predicate<OsFamilyVersion64Bit> defineUnsupportedOperatingSystems() {
-      return new Predicate<OsFamilyVersion64Bit>() {
+      return Predicates.not(new Predicate<OsFamilyVersion64Bit>() {
          @Override
          public boolean apply(OsFamilyVersion64Bit input) {
             switch (input.family) {
-               case RHEL:
-                  return !input.version.equals("") && !input.version.equals("5.0");
-               case CENTOS:
-                  return !input.version.equals("") && !input.version.matches("5.0");
-               case UBUNTU:
-                  return !input.version.equals("") && !(input.version.equals("9.04") || input.version.equals("9.10"));
-               case WINDOWS:
-                  return !input.version.equals("") && !input.version.equals("2003") //
-                           && !input.version.equals("2008");
-               default:
-                  return true;
+            case RHEL:
+               return input.version.equals("") || input.version.equals("5.0");
+            case CENTOS:
+               return input.version.equals("") || input.version.equals("5.0");
+            case UBUNTU:
+               return input.version.equals("") || input.version.matches("9.[10][04]") || input.version.equals("10.04");
+            case WINDOWS:
+               return input.version.equals("") || input.version.equals("2003") || input.version.equals("2008");
+            default:
+               return false;
             }
          }
-      };
+      });
    }
 
    @Test
    public void testDefaultTemplateBuilder() throws IOException {
       Template defaultTemplate = context.getComputeService().templateBuilder().build();
-      assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "9.10");
+      assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
       assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
       assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
       assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);