mirror of https://github.com/apache/jclouds.git
fixed template expectations
This commit is contained in:
parent
4a22d1aaf1
commit
617d267360
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue