diff --git a/providers/skalicloud-sdg-my/src/main/resources/skalicloud-sdg-my/preinstalled_images.json b/providers/skalicloud-sdg-my/src/main/resources/skalicloud-sdg-my/preinstalled_images.json index 9e63077e83..c826fc32d3 100644 --- a/providers/skalicloud-sdg-my/src/main/resources/skalicloud-sdg-my/preinstalled_images.json +++ b/providers/skalicloud-sdg-my/src/main/resources/skalicloud-sdg-my/preinstalled_images.json @@ -14,6 +14,21 @@ "osVersion": "5.5", "size": "1" }, + { + "uuid": "0a4ef5e8-83d2-4b61-8fbe-0ff0232265f5", + "description": "CentOS 5.6 -32bit", + "osFamily": "CENTOS", + "osVersion": "5.6", + "is64bit": false, + "size": "1" + }, + { + "uuid": "66bc99a9-dfd4-4624-948a-57784e2cc411", + "description": "CentOS 5.6 -64bit", + "osFamily": "CENTOS", + "osVersion": "5.6", + "size": "1" + }, { "uuid": "c144d7a7-e24b-48ab-954b-6b6ec514ed6f", "description": "Debian 5 -64bit", @@ -21,6 +36,36 @@ "osVersion": "5.0", "size": "1" }, + { + "uuid": "0178c66a-fc5b-43c6-bec5-3315fef924d2", + "description": "Debian 5 -32bit", + "osFamily": "DEBIAN", + "osVersion": "5.0", + "is64bit": false, + "size": "1" + }, + { + "uuid": "88cd1475-b6a0-4121-b9c2-97ddd652b410", + "description": "Debian 6 -64bit -Experimental", + "osFamily": "DEBIAN", + "osVersion": "6.0", + "size": "1" + }, + { + "uuid": "53e4b089-d35d-4aca-a95e-ff72774d3750", + "description": "Ubuntu Server 10.04 -64bit", + "osFamily": "UBUNTU", + "osVersion": "10.04", + "size": "1" + }, + { + "uuid": "877ea99b-7d42-4be7-9cf6-88b8daad9a8c", + "description": "Ubuntu Server 10.04 -32bit", + "osFamily": "UBUNTU", + "osVersion": "10.04", + "is64bit": false, + "size": "1" + }, { "uuid": "3051699a-a536-4220-aeb5-67f2ec101a09", "description": "Ubuntu Server 10.10 -64bit", @@ -28,7 +73,7 @@ "osVersion": "10.10", "size": "1" }, - { + { "uuid": "4d5656b5-74d3-4aa0-9308-6b7377552204", "description": "Ubuntu Server 10.10 -32bit", "osFamily": "UBUNTU", diff --git a/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/SkaliCloudMalasyaProviderTest.java b/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderTest.java similarity index 90% rename from providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/SkaliCloudMalasyaProviderTest.java rename to providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderTest.java index fb703e4d03..2676b28809 100644 --- a/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/SkaliCloudMalasyaProviderTest.java +++ b/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/SkaliCloudMalaysiaProviderTest.java @@ -27,9 +27,9 @@ import org.testng.annotations.Test; * @author Adrian Cole */ @Test(groups = "unit", testName = "SkaliCloudMalaysiaProviderTest") -public class SkaliCloudMalasyaProviderTest extends BaseProviderMetadataTest { +public class SkaliCloudMalaysiaProviderTest extends BaseProviderMetadataTest { - public SkaliCloudMalasyaProviderTest() { + public SkaliCloudMalaysiaProviderTest() { super(new SkaliCloudMalaysiaProviderMetadata(), ProviderMetadata.COMPUTE_TYPE); } } diff --git a/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/compute/SkaliCloudMalaysiaTemplateBuilderLiveTest.java b/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/compute/SkaliCloudMalaysiaTemplateBuilderLiveTest.java index ebc3a9e155..260866c28c 100644 --- a/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/compute/SkaliCloudMalaysiaTemplateBuilderLiveTest.java +++ b/providers/skalicloud-sdg-my/src/test/java/org/jclouds/skalicloud/compute/SkaliCloudMalaysiaTemplateBuilderLiveTest.java @@ -53,11 +53,12 @@ public class SkaliCloudMalaysiaTemplateBuilderLiveTest extends BaseTemplateBuild public boolean apply(OsFamilyVersion64Bit input) { switch (input.family) { case UBUNTU: - return input.version.equals("") || input.version.equals("10.10"); + return input.version.equals("") || input.version.matches("10.[01][04]"); case DEBIAN: - return (input.version.equals("") || input.version.equals("5.0")) && input.is64Bit; + return (input.version.equals("") || input.version.equals("5.0")) + || (input.version.equals("6.0") && input.is64Bit); case CENTOS: - return input.version.equals("") || input.version.equals("5.5"); + return input.version.equals("") || input.version.matches("5.[56]"); case WINDOWS: return (input.version.equals("") || input.version.equals("2008 R2")) && input.is64Bit; default: