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

Issue 727:enable ubuntu Natty on cloudsigma-zrh

This commit is contained in:
Adrian Cole 2011-10-17 19:55:47 -07:00
parent 552242e863
commit e94f237514
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
providers/cloudsigma-zrh/src/main/java/org/jclouds/cloudsigma/compute/config/CloudSigmaZurichComputeServiceContextModule.java
View File

@ -18,10 +18,6 @@
*/ */
package org.jclouds.cloudsigma.compute.config; package org.jclouds.cloudsigma.compute.config;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.TemplateBuilder;
import com.google.inject.Injector;
/** /**
* *
@ -29,9 +25,4 @@ import com.google.inject.Injector;
*/ */
public class CloudSigmaZurichComputeServiceContextModule extends CloudSigmaComputeServiceContextModule { public class CloudSigmaZurichComputeServiceContextModule extends CloudSigmaComputeServiceContextModule {
// 11.04 image doesn't work.
@Override
protected TemplateBuilder provideTemplate(Injector injector, TemplateBuilder template) {
return template.osFamily(OsFamily.UBUNTU).osVersionMatches("10.04").imageNameMatches(".*automated SSH Access.*");
}
} }

2
providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/CloudSigmaZurichClientLiveTest.java
View File

@ -29,6 +29,6 @@ import org.testng.annotations.Test;
public class CloudSigmaZurichClientLiveTest extends CloudSigmaClientLiveTest { public class CloudSigmaZurichClientLiveTest extends CloudSigmaClientLiveTest {
public CloudSigmaZurichClientLiveTest() { public CloudSigmaZurichClientLiveTest() {
provider = "cloudsigma-zrh"; provider = "cloudsigma-zrh";
bootDrive = "f3c7c665-cd54-4a78-8fd2-7ec2f028cf29"; bootDrive = "7fad4fe1-daf3-4cb8-a847-082aae4d8506";
} }
} }

6
providers/cloudsigma-zrh/src/test/java/org/jclouds/cloudsigma/compute/CloudSigmaZurichTemplateBuilderLiveTest.java
View File

@ -76,9 +76,9 @@ public class CloudSigmaZurichTemplateBuilderLiveTest extends BaseTemplateBuilder
@Override @Override
public void testDefaultTemplateBuilder() throws IOException { public void testDefaultTemplateBuilder() throws IOException {
Template defaultTemplate = context.getComputeService().templateBuilder().build(); Template defaultTemplate = context.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), false); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getId(), "f3c7c665-cd54-4a78-8fd2-7ec2f028cf29"); assertEquals(defaultTemplate.getImage().getId(), "7fad4fe1-daf3-4cb8-a847-082aae4d8506");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
} }