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

fixed template expectations

This commit is contained in:
Adrian Cole 2011-12-22 03:21:20 -08:00
parent 4a22d1aaf1
commit 617d267360
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
providers/cloudsigma-lvs/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaLasVegasTemplateBuilderLiveTest.java
View File

@ -59,10 +59,12 @@ public class CloudSigmaLasVegasTemplateBuilderLiveTest extends BaseTemplateBuild
case DEBIAN:
return false;
case CENTOS:
return (input.version.equals("") || input.version.equals("6.0") || input.version.equals("5.7"))
&& input.is64Bit;
return (input.version.equals("") || input.version.equals("6.0"))
|| (input.version.matches("5.[57]") && input.is64Bit);
case WINDOWS:
return ((input.version.equals("2008 R2") || input.version.equals("2003") || input.version.equals("")) && input.is64Bit);
return (input.version.equals("2008 R2") || (input.version.equals("2003") || input.version.equals(""))
&& input.is64Bit)
|| (input.version.equals("") && !input.is64Bit);
default:
return false;
}
@ -78,7 +80,7 @@ public class CloudSigmaLasVegasTemplateBuilderLiveTest extends BaseTemplateBuild
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getId(), "6aab1938-71b3-4252-ac1c-a3cb17c284ab");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getImage().getDefaultCredentials().identity, "cloudsigma");
assertEquals(defaultTemplate.getImage().getDefaultCredentials().identity, "root");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
}