Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated elastichosts templatebuilderlivetest to match new json data

This commit is contained in:
Adrian Cole 2011-12-19 09:10:44 -08:00
parent b88c016337
commit 99f0c833d2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest.java
View File

@ -52,11 +52,11 @@ public class ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest extends BaseTemp
public boolean apply(OsFamilyVersion64Bit input) { public boolean apply(OsFamilyVersion64Bit input) {
switch (input.family) { switch (input.family) {
case UBUNTU: 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: 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: 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: case WINDOWS:
return (input.version.equals("") || input.version.equals("2008 R2") || input.version.equals("2008")) return (input.version.equals("") || input.version.equals("2008 R2") || input.version.equals("2008"))
&& input.is64Bit; && input.is64Bit;
@ -72,7 +72,7 @@ public class ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest extends BaseTemp
public void testTemplateBuilder() { public void testTemplateBuilder() {
Template defaultTemplate = this.context.getComputeService().templateBuilder().build(); Template defaultTemplate = this.context.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); 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.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-sat-p"); assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-sat-p");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);