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

Issue 644:update standard image list for elastichosts

This commit is contained in:
Adrian Cole 2011-07-28 00:37:14 -07:00
parent 06b31e5043
commit 85a6e2f90f
7 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackClient.java
View File

@ -94,6 +94,7 @@ public interface ElasticStackClient {
* @param uuid
* what to start
*/
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
void startServer(String uuid);
/**
@ -156,6 +157,7 @@ public interface ElasticStackClient {
* required parameters: name, size
* @return newly created drive
*/
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
DriveInfo createDrive(Drive createDrive);
/**
@ -183,6 +185,7 @@ public interface ElasticStackClient {
* @param server
* @return newly created server
*/
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
ServerInfo createAndStartServer(Server server);
/**

15
providers/elastichosts-lon-b/src/main/resources/elastichosts-lon-b/preinstalled_images.json
View File

@ -28,18 +28,11 @@
"size": "1"
},
{
"uuid": "bf1d943e-2a55-46bb-a8c7-6099e44a3dde",
"description": "Ubuntu Linux 8.10: Base system with X",
"uuid": "325c7e71-77c9-4e88-9fd2-85b34a996cfb",
"description": "Ubuntu Linux 10.10",
"osFamily": "UBUNTU",
"osVersion": "8.10",
"size": "3"
},
{
"uuid": "757586d5-f1e9-4d9c-b215-5a391c9a24bf",
"description": "Ubuntu Linux 9.04: Base system with X",
"osFamily": "UBUNTU",
"osVersion": "9.04",
"size": "3"
"osVersion": "10.10",
"size": "1"
},
{
"uuid": "b9d0eb72-d273-43f1-98e3-0d4b87d372c0",

4
providers/elastichosts-lon-b/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsBlueSquareLondonTemplateBuilderLiveTest.java
View File

@ -52,7 +52,7 @@ public class ElasticHostsBlueSquareLondonTemplateBuilderLiveTest extends BaseTem
public boolean apply(OsFamilyVersion64Bit input) {
switch (input.family) {
case UBUNTU:
return (input.version.equals("") || input.version.equals("10.04")) && input.is64Bit;
return (input.version.equals("") || input.version.startsWith("10.")) && input.is64Bit;
case DEBIAN:
return (input.version.equals("") || input.version.matches("[56].0")) && input.is64Bit;
case CENTOS:
@ -72,7 +72,7 @@ public class ElasticHostsBlueSquareLondonTemplateBuilderLiveTest extends BaseTem
public void testTemplateBuilder() {
Template defaultTemplate = this.context.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.10");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-lon-b");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);

22
providers/elastichosts-lon-p/src/main/resources/elastichosts-lon-p/preinstalled_images.json
View File

@ -13,6 +13,13 @@
"osVersion": "5.0",
"size": "1"
},
{
"uuid": "6aa953cc-3395-4e8d-938e-65c74fd20334",
"description": "Debian Linux 6.0.1",
"osFamily": "DEBIAN",
"osVersion": "6.0",
"size": "1"
},
{
"uuid": "aee5589a-88c3-43ef-bb0a-9cab6e64192d",
"description": "Ubuntu Linux 10.04",
@ -21,18 +28,11 @@
"size": "1"
},
{
"uuid": "bf1d943e-2a55-46bb-a8c7-6099e44a3dde",
"description": "Ubuntu Linux 8.10: Base system with X",
"uuid": "325c7e71-77c9-4e88-9fd2-85b34a996cfb",
"description": "Ubuntu Linux 10.10",
"osFamily": "UBUNTU",
"osVersion": "8.10",
"size": "3"
},
{
"uuid": "757586d5-f1e9-4d9c-b215-5a391c9a24bf",
"description": "Ubuntu Linux 9.04: Base system with X",
"osFamily": "UBUNTU",
"osVersion": "9.04",
"size": "3"
"osVersion": "10.10",
"size": "1"
},
{
"uuid": "b9d0eb72-d273-43f1-98e3-0d4b87d372c0",

6
providers/elastichosts-lon-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1LondonTemplateBuilderLiveTest.java
View File

@ -52,9 +52,9 @@ public class ElasticHostsPeer1LondonTemplateBuilderLiveTest extends BaseTemplate
public boolean apply(OsFamilyVersion64Bit input) {
switch (input.family) {
case UBUNTU:
return (input.version.equals("") || input.version.equals("10.04")) && input.is64Bit;
return (input.version.equals("") || input.version.startsWith("10.")) && input.is64Bit;
case DEBIAN:
return (input.version.equals("") || input.version.equals("5.0")) && input.is64Bit;
return (input.version.equals("") || input.version.matches("[56].0")) && input.is64Bit;
case CENTOS:
return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit;
case WINDOWS:
@ -72,7 +72,7 @@ public class ElasticHostsPeer1LondonTemplateBuilderLiveTest extends BaseTemplate
public void testTemplateBuilder() {
Template defaultTemplate = this.context.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.10");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-lon-p");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);

22
providers/elastichosts-sat-p/src/main/resources/elastichosts-sat-p/preinstalled_images.json
View File

@ -13,6 +13,13 @@
"osVersion": "5.0",
"size": "1"
},
{
"uuid": "6aa953cc-3395-4e8d-938e-65c74fd20334",
"description": "Debian Linux 6.0.1",
"osFamily": "DEBIAN",
"osVersion": "6.0",
"size": "1"
},
{
"uuid": "aee5589a-88c3-43ef-bb0a-9cab6e64192d",
"description": "Ubuntu Linux 10.04",
@ -21,18 +28,11 @@
"size": "1"
},
{
"uuid": "bf1d943e-2a55-46bb-a8c7-6099e44a3dde",
"description": "Ubuntu Linux 8.10: Base system with X",
"uuid": "2bae7a5a-7a56-4d02-a711-ed90f25b74a3",
"description": "Ubuntu Linux 10.10",
"osFamily": "UBUNTU",
"osVersion": "8.10",
"size": "3"
},
{
"uuid": "757586d5-f1e9-4d9c-b215-5a391c9a24bf",
"description": "Ubuntu Linux 9.04: Base system with X",
"osFamily": "UBUNTU",
"osVersion": "9.04",
"size": "3"
"osVersion": "10.10",
"size": "1"
},
{
"uuid": "b9d0eb72-d273-43f1-98e3-0d4b87d372c0",

6
providers/elastichosts-sat-p/src/test/java/org/jclouds/elastichosts/compute/ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest.java
View File

@ -52,9 +52,9 @@ public class ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest extends BaseTemp
public boolean apply(OsFamilyVersion64Bit input) {
switch (input.family) {
case UBUNTU:
return (input.version.equals("") || input.version.equals("10.04")) && input.is64Bit;
return (input.version.equals("") || input.version.startsWith("10.")) && input.is64Bit;
case DEBIAN:
return (input.version.equals("") || input.version.equals("5.0")) && input.is64Bit;
return (input.version.equals("") || input.version.matches("[56].0")) && input.is64Bit;
case CENTOS:
return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit;
case WINDOWS:
@ -72,7 +72,7 @@ public class ElasticHostsPeer1SanAntonioTemplateBuilderLiveTest extends BaseTemp
public void testTemplateBuilder() {
Template defaultTemplate = this.context.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.10");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-sat-p");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);