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

updated to latest elastichost image ids

This commit is contained in:
Adrian Cole 2011-11-01 04:19:35 +00:00
parent c1b1061712
commit 700e191536
4 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,37 +1,30 @@
[ [
{ {
"uuid": "38df0986-4d85-4b76-b502-3878ffc80161", "uuid": "d7736ff4-c045-46e0-bd62-f8719758d20d",
"description": "CentOS Linux 5.5", "description": "CentOS Linux 6.0",
"osFamily": "CENTOS", "osFamily": "CENTOS",
"osVersion": "5.5", "osVersion": "6.0",
"size": "3" "size": "3"
}, },
{ {
"uuid": "980cf63c-f21e-4382-997b-6541d5809629", "uuid": "b9593943-e252-4895-8715-ad04e55f5dda",
"description": "Debian Linux 5.0", "description": "Debian Linux 6.0",
"osFamily": "DEBIAN",
"osVersion": "5.0",
"size": "1"
},
{
"uuid": "6aa953cc-3395-4e8d-938e-65c74fd20334",
"description": "Debian Linux 6.0.1",
"osFamily": "DEBIAN", "osFamily": "DEBIAN",
"osVersion": "6.0", "osVersion": "6.0",
"size": "1" "size": "1"
}, },
{ {
"uuid": "aee5589a-88c3-43ef-bb0a-9cab6e64192d", "uuid": "aee5589a-88c3-43ef-bb0a-9cab6e64192d",
"description": "Ubuntu Linux 10.04", "description": "Ubuntu Linux 10.04 LTS",
"osFamily": "UBUNTU", "osFamily": "UBUNTU",
"osVersion": "10.04", "osVersion": "10.04",
"size": "1" "size": "1"
}, },
{ {
"uuid": "325c7e71-77c9-4e88-9fd2-85b34a996cfb", "uuid": "7738b8be-0812-4bec-9b82-aa9df29db110",
"description": "Ubuntu Linux 10.10", "description": "Ubuntu Linux 11.10",
"osFamily": "UBUNTU", "osFamily": "UBUNTU",
"osVersion": "10.10", "osVersion": "11.10",
"size": "1" "size": "1"
}, },
{ {
@ -42,14 +35,14 @@
"size": "13" "size": "13"
}, },
{ {
"uuid": "b405b598-4ae4-4ba8-8a2b-a9487d693f34", "uuid": "30824e97-05a4-410c-946e-2ba5a92b07cb",
"description": "Windows Web Server 2008 R2", "description": "Windows Web Server 2008 R2",
"osFamily": "WINDOWS", "osFamily": "WINDOWS",
"osVersion": "2008 R2", "osVersion": "2008 R2",
"size": "13" "size": "13"
}, },
{ {
"uuid": "9397d327-3bf6-46a2-abf6-69553dbb6927", "uuid": "9ecf810e-6ad1-40ef-b360-d606f0444671",
"description": "Windows Web Server 2008 R2 + SQL Server", "description": "Windows Web Server 2008 R2 + SQL Server",
"osFamily": "WINDOWS", "osFamily": "WINDOWS",
"osVersion": "2008 R2", "osVersion": "2008 R2",
@ -63,7 +56,7 @@
"size": "13" "size": "13"
}, },
{ {
"uuid": "662c5b3f-9828-4aa2-a866-7cfa53798cdf", "uuid": "2567f25c-8fb8-45c7-95fc-bfe3c3d84c47",
"description": "Windows Server 2008 Standard R2 + SQL Server", "description": "Windows Server 2008 Standard R2 + SQL Server",
"osFamily": "WINDOWS", "osFamily": "WINDOWS",
"osVersion": "2008 R2", "osVersion": "2008 R2",

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

@ -52,11 +52,12 @@ public class ElasticHostsBlueSquareLondonTemplateBuilderLiveTest extends BaseTem
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.startsWith("10.")) && input.is64Bit; return (input.version.equals("") || input.version.equals("10.04") || input.version.equals("11.10"))
&& input.is64Bit;
case DEBIAN: case DEBIAN:
return (input.version.equals("") || input.version.matches("[56].0")) && input.is64Bit; return (input.version.equals("") || input.version.matches("6.0")) && input.is64Bit;
case CENTOS: case CENTOS:
return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit; return (input.version.equals("") || input.version.equals("6.0")) && input.is64Bit;
case WINDOWS: case WINDOWS:
return (input.version.equals("") || input.version.equals("2008 R2") || input.version.equals("2008")) return (input.version.equals("") || input.version.equals("2008 R2") || input.version.equals("2008"))
&& input.is64Bit; && input.is64Bit;
@ -72,7 +73,7 @@ public class ElasticHostsBlueSquareLondonTemplateBuilderLiveTest extends BaseTem
public void testTemplateBuilder() { public void testTemplateBuilder() {
Template defaultTemplate = this.context.getComputeService().templateBuilder().build(); Template defaultTemplate = this.context.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.10"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.10");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-lon-b"); assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-lon-b");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);

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

@ -1,37 +1,30 @@
[ [
{ {
"uuid": "38df0986-4d85-4b76-b502-3878ffc80161", "uuid": "5c2fd6f4-32db-44b7-872b-a27eed553f60",
"description": "CentOS Linux 5.5", "description": "CentOS Linux 6.0",
"osFamily": "CENTOS", "osFamily": "CENTOS",
"osVersion": "5.5", "osVersion": "6.0",
"size": "3" "size": "3"
}, },
{ {
"uuid": "980cf63c-f21e-4382-997b-6541d5809629", "uuid": "fb08fb96-3e96-4420-bb69-9dd348a8e1f7",
"description": "Debian Linux 5.0", "description": "Debian Linux 6.0",
"osFamily": "DEBIAN",
"osVersion": "5.0",
"size": "1"
},
{
"uuid": "6aa953cc-3395-4e8d-938e-65c74fd20334",
"description": "Debian Linux 6.0.1",
"osFamily": "DEBIAN", "osFamily": "DEBIAN",
"osVersion": "6.0", "osVersion": "6.0",
"size": "1" "size": "1"
}, },
{ {
"uuid": "aee5589a-88c3-43ef-bb0a-9cab6e64192d", "uuid": "aee5589a-88c3-43ef-bb0a-9cab6e64192d",
"description": "Ubuntu Linux 10.04", "description": "Ubuntu Linux 10.04 LTS",
"osFamily": "UBUNTU", "osFamily": "UBUNTU",
"osVersion": "10.04", "osVersion": "10.04",
"size": "1" "size": "1"
}, },
{ {
"uuid": "325c7e71-77c9-4e88-9fd2-85b34a996cfb", "uuid": "63576f20-5012-4742-92a8-67bc9717cbf8",
"description": "Ubuntu Linux 10.10", "description": "Ubuntu Linux 11.10",
"osFamily": "UBUNTU", "osFamily": "UBUNTU",
"osVersion": "10.10", "osVersion": "11.10",
"size": "1" "size": "1"
}, },
{ {
@ -56,7 +49,7 @@
"size": "13" "size": "13"
}, },
{ {
"uuid": "10a88d1c-6575-46e3-8d2c-7744065ea530", "uuid": "b17ebce6-61b4-4dcc-9654-41c9fc847e01",
"description": "Windows Server 2008 Standard R2", "description": "Windows Server 2008 Standard R2",
"osFamily": "WINDOWS", "osFamily": "WINDOWS",
"osVersion": "2008 R2", "osVersion": "2008 R2",

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

@ -52,11 +52,12 @@ public class ElasticHostsPeer1LondonTemplateBuilderLiveTest extends BaseTemplate
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.startsWith("10.")) && input.is64Bit; return (input.version.equals("") || input.version.equals("10.04") || input.version.equals("11.10"))
&& input.is64Bit;
case DEBIAN: case DEBIAN:
return (input.version.equals("") || input.version.matches("[56].0")) && input.is64Bit; return (input.version.equals("") || input.version.matches("6.0")) && input.is64Bit;
case CENTOS: case CENTOS:
return (input.version.equals("") || input.version.equals("5.5")) && input.is64Bit; return (input.version.equals("") || input.version.equals("6.0")) && input.is64Bit;
case WINDOWS: case WINDOWS:
return (input.version.equals("") || input.version.equals("2008 R2") || input.version.equals("2008")) return (input.version.equals("") || input.version.equals("2008 R2") || input.version.equals("2008"))
&& input.is64Bit; && input.is64Bit;
@ -72,7 +73,7 @@ public class ElasticHostsPeer1LondonTemplateBuilderLiveTest extends BaseTemplate
public void testTemplateBuilder() { public void testTemplateBuilder() {
Template defaultTemplate = this.context.getComputeService().templateBuilder().build(); Template defaultTemplate = this.context.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.10"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "11.10");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-lon-p"); assertEquals(defaultTemplate.getLocation().getId(), "elastichosts-lon-p");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);