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

updated templates for rackspace

This commit is contained in:
Adrian Cole 2011-11-11 12:42:39 +02:00
parent d809bc524e
commit d2f60e49a4
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java
View File

@ -51,17 +51,17 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi
@Override @Override
public boolean apply(OsFamilyVersion64Bit input) { public boolean apply(OsFamilyVersion64Bit input) {
switch (input.family) { switch (input.family) {
case UBUNTU: case UBUNTU:
return !(input.version.startsWith("12.04") || input.version.startsWith("11.10")) && input.is64Bit; return !(input.version.startsWith("12.04") || input.version.startsWith("11.10")) && input.is64Bit;
case DEBIAN: case DEBIAN:
return input.is64Bit; return input.is64Bit && !input.version.matches("[56].0");
case CENTOS: case CENTOS:
return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit; return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit;
case WINDOWS: case WINDOWS:
return input.version.equals("2008 SP2") || input.version.equals("") return input.version.equals("2008 SP2") || input.version.equals("")
|| (input.version.equals("2008 R2") && input.is64Bit); || (input.version.equals("2008 R2") && input.is64Bit);
default: default:
return false; return false;
} }
} }

24
providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java
View File

@ -51,19 +51,17 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi
@Override @Override
public boolean apply(OsFamilyVersion64Bit input) { public boolean apply(OsFamilyVersion64Bit input) {
switch (input.family) { switch (input.family) {
case UBUNTU: case UBUNTU:
return !(input.version.startsWith("12.04") || input.version.startsWith("11.10") || input.version return !(input.version.startsWith("12.04") || input.version.startsWith("11.10")) && input.is64Bit;
.equals("8.04")) case DEBIAN:
&& input.is64Bit; return input.is64Bit && !input.version.matches("[56].0");
case DEBIAN: case CENTOS:
return input.is64Bit; return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit;
case CENTOS: case WINDOWS:
return !(input.version.matches("5.[0237]") || input.version.equals("6.0")) && input.is64Bit; return input.version.equals("2008 SP2") || input.version.equals("")
case WINDOWS: || (input.version.equals("2008 R2") && input.is64Bit);
return input.version.equals("2008 SP2") || input.version.equals("") default:
|| (input.version.equals("2008 R2") && input.is64Bit); return false;
default:
return false;
} }
} }