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

corrected metadata for ninefold-compute

This commit is contained in:
Adrian Cole 2011-11-14 22:20:40 +02:00
parent 349f602931
commit e04ec8f51b
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
providers/ninefold-compute/src/main/java/org/jclouds/ninefold/compute/NinefoldComputeProviderMetadata.java
View File

@ -62,7 +62,7 @@ public class NinefoldComputeProviderMetadata extends BaseProviderMetadata {
*/ */
@Override @Override
public String getIdentityName() { public String getIdentityName() {
return "TODO"; return "API Key";
} }
/** /**
@ -70,7 +70,7 @@ public class NinefoldComputeProviderMetadata extends BaseProviderMetadata {
*/ */
@Override @Override
public String getCredentialName() { public String getCredentialName() {
return "TODO"; return "Secret Key";
} }
/** /**
@ -78,7 +78,7 @@ public class NinefoldComputeProviderMetadata extends BaseProviderMetadata {
*/ */
@Override @Override
public URI getHomepage() { public URI getHomepage() {
return URI.create("TODO"); return URI.create("http://ninefold.com/virtual-servers/");
} }
/** /**
@ -86,7 +86,7 @@ public class NinefoldComputeProviderMetadata extends BaseProviderMetadata {
*/ */
@Override @Override
public URI getConsole() { public URI getConsole() {
return URI.create("TODO"); return URI.create("https://ninefold.com/portal/portal/login");
} }
/** /**
@ -94,7 +94,7 @@ public class NinefoldComputeProviderMetadata extends BaseProviderMetadata {
*/ */
@Override @Override
public URI getApiDocumentation() { public URI getApiDocumentation() {
return URI.create("TODO"); return URI.create("https://ninefold.com/support/display/SPT/Cloud+Compute");
} }
/** /**

20
providers/ninefold-compute/src/test/java/org/jclouds/ninefold/compute/compute/NinefoldComputeTemplateBuilderLiveTest.java
View File

@ -52,14 +52,16 @@ public class NinefoldComputeTemplateBuilderLiveTest extends BaseTemplateBuilderL
@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.equals("") || input.version.equals("10.10")) && input.is64Bit; return input.version.equals("") || input.version.equals("10.04");
case DEBIAN: case SUSE:
return (input.version.equals("") || input.version.equals("6.0")) && input.is64Bit; return (input.version.equals("") || input.version.equals("11")) && input.is64Bit;
case WINDOWS: case CENTOS:
return (input.version.equals("") || input.version.equals("2008 R2")) && input.is64Bit; return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit;
default: case WINDOWS:
return false; return input.version.equals("") || (input.version.equals("2008") && !input.is64Bit);
default:
return false;
} }
} }
@ -72,7 +74,7 @@ public class NinefoldComputeTemplateBuilderLiveTest extends BaseTemplateBuilderL
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "ninefold-compute"); assertEquals(defaultTemplate.getLocation().getId(), "1");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
} }