Updated Branches: refs/heads/master 1043d851a -> 295c6e741
Fixes broken cloudservers live tests, updates versions for images Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/295c6e74 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/295c6e74 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/295c6e74 Branch: refs/heads/master Commit: 295c6e741e6a29662a626c7aa4264c91a756ea23 Parents: 1043d85 Author: Zack Shoylev <[email protected]> Authored: Tue Aug 6 21:57:12 2013 -0500 Committer: Zack Shoylev <[email protected]> Committed: Mon Dec 2 11:47:43 2013 -0600 ---------------------------------------------------------------------- .../compute/reference/ComputeServiceConstants.java | 2 +- .../cloudfiles/CloudFilesUSProviderMetadata.java | 2 +- .../CloudFilesUSServiceIntegrationLiveTest.java | 2 +- .../CloudServersUKTemplateBuilderLiveTest.java | 2 +- .../CloudServersUSProviderMetadata.java | 2 +- .../CloudServersUSTemplateBuilderLiveTest.java | 6 +++--- .../CloudServersUKTemplateBuilderLiveTest.java | 11 +++++------ .../CloudServersUSTemplateBuilderLiveTest.java | 17 ++++++++--------- 8 files changed, 21 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/295c6e74/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java b/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java index 4cf664e..8c9e175 100644 --- a/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java +++ b/compute/src/main/java/org/jclouds/compute/reference/ComputeServiceConstants.java @@ -91,7 +91,7 @@ public interface ComputeServiceConstants { @Named(OS_VERSION_MAP_JSON) // TODO: switch this to read from resource, failing back to string // constant on classpath problem - public String osVersionMapJson = "{\"suse\":{\"\":\"\",\"11\":\"11\",\"11 SP1\":\"11 SP1\"},\"debian\":{\"\":\"\",\"lenny\":\"5.0\",\"6\":\"6.0\",\"squeeze\":\"6.0\"},\"centos\":{\"\":\"\",\"5\":\"5.0\",\"5.2\":\"5.2\",\"5.3\":\"5.3\",\"5.4\":\"5.4\",\"5.5\":\"5.5\",\"5.6\":\"5.6\",\"5.7\":\"5.7\",\"6\":\"6.0\",\"6.0\":\"6.0\"},\"rhel\":{\"\":\"\",\"5\":\"5.0\",\"5.2\":\"5.2\",\"5.3\":\"5.3\",\"5.4\":\"5.4\",\"5.5\":\"5.5\",\"5.6\":\"5.6\",\"5.7\":\"5.7\",\"6\":\"6.0\",\"6.0\":\"6.0\"},\"solaris\":{\"\":\"\",\"10\":\"10\"},\"ubuntu\":{\"\":\"\",\"hardy\":\"8.04\",\"karmic\":\"9.10\",\"lucid\":\"10.04\",\"10.04.1\":\"10.04\",\"maverick\":\"10.10\",\"natty\":\"11.04\",\"oneiric\":\"11.10\",\"precise\":\"12.04\"},\"windows\":{\"\":\"\",\"7\":\"7\",\"2003\":\"2003\",\"2003 Standard\":\"2003\",\"2003 R2\":\"2003 R2\",\"2008\":\"2008\",\"2008 Web\":\"2008\",\"2008 Server\":\"2008\",\"Server 2008\":\"2008\",\"2008 R1\":\"2008 R1\",\"2008 R2\":\"2008 R2\",\"Server 2008 R2\":\"2008 R2\ ",\"2008 Server R2\":\"2008 R2\",\"2008 SP2\":\"2008 SP2\",\"Server 2008 SP2\":\"2008 SP2\"}}"; + public String osVersionMapJson = "{\"suse\":{\"\":\"\",\"11\":\"11\",\"11 SP1\":\"11 SP1\"},\"debian\":{\"\":\"\",\"lenny\":\"5.0\",\"6\":\"6.0\",\"squeeze\":\"6.0\"},\"centos\":{\"\":\"\",\"5\":\"5.0\",\"5.2\":\"5.2\",\"5.3\":\"5.3\",\"5.4\":\"5.4\",\"5.5\":\"5.5\",\"5.6\":\"5.6\",\"5.7\":\"5.7\",\"6\":\"6.0\",\"6.0\":\"6.0\",\"6.2\":\"6.2\",\"6.3\":\"6.3\",\"6.4\":\"6.4\"},\"rhel\":{\"\":\"\",\"5\":\"5.0\",\"5.2\":\"5.2\",\"5.3\":\"5.3\",\"5.4\":\"5.4\",\"5.5\":\"5.5\",\"5.6\":\"5.6\",\"5.7\":\"5.7\",\"6\":\"6.0\",\"6.0\":\"6.0\",\"6.1\":\"6.1\",\"6.3\":\"6.3\",\"6.4\":\"6.4\"},\"solaris\":{\"\":\"\",\"10\":\"10\"},\"ubuntu\":{\"\":\"\",\"hardy\":\"8.04\",\"karmic\":\"9.10\",\"lucid\":\"10.04\",\"10.04.1\":\"10.04\",\"maverick\":\"10.10\",\"natty\":\"11.04\",\"oneiric\":\"11.10\",\"precise\":\"12.04\",\"quantal\":\"12.10\",\"raring\":\"13.04\"},\"windows\":{\"\":\"\",\"7\":\"7\",\"2003\":\"2003\",\"2003 Standard\":\"2003\",\"2003 R2\":\"2003 R2\",\"2008\":\"2008\",\"2008 Web \":\"2008\",\"2008 Server\":\"2008\",\"Server 2008\":\"2008\",\"2008 R1\":\"2008 R1\",\"2008 R2\":\"2008 R2\",\"Server 2008 R2\":\"2008 R2\",\"2008 Server R2\":\"2008 R2\",\"2008 SP2\":\"2008 SP2\",\"Server 2008 SP2\":\"2008 SP2\"}}"; } @Singleton http://git-wip-us.apache.org/repos/asf/jclouds/blob/295c6e74/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java index e465d4b..12f36cd 100644 --- a/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java +++ b/providers/cloudfiles-us/src/main/java/org/jclouds/rackspace/cloudfiles/CloudFilesUSProviderMetadata.java @@ -65,7 +65,7 @@ public class CloudFilesUSProviderMetadata extends BaseProviderMetadata { .homepage(URI.create("http://www.rackspace.com/cloud/cloud_hosting_products/files";)) .console(URI.create("https://manage.rackspacecloud.com";)) .linkedServices("cloudfiles-us", "cloudservers-us", "cloudloadbalancers-us") - .iso3166Codes("US-IL","US-TX"); + .iso3166Codes("US-IL","US-TX", "AU-NSW"); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/295c6e74/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java b/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java index 8c52ebc..637c598 100644 --- a/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java +++ b/providers/cloudfiles-us/src/test/java/org/jclouds/rackspace/cloudfiles/blobstore/integration/CloudFilesUSServiceIntegrationLiveTest.java @@ -33,6 +33,6 @@ public class CloudFilesUSServiceIntegrationLiveTest extends CloudFilesServiceInt } @Override protected Set<String> getIso3166Codes() { - return ImmutableSet.<String> of("US-IL", "US-TX"); + return ImmutableSet.<String> of("US-IL", "US-TX", "AU-NSW"); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/295c6e74/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java index 54e4b8c..793f523 100644 --- a/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java +++ b/providers/cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUKTemplateBuilderLiveTest.java @@ -50,7 +50,7 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi public boolean apply(OsFamilyVersion64Bit input) { switch (input.family) { case UBUNTU: - return (input.version.equals("") || input.version.equals("10.04") || input.version.startsWith("11")) + return (input.version.equals("") || input.version.matches("(10.04)|(12.04)|(12.10)|(13.04)")) && input.is64Bit; case DEBIAN: return input.is64Bit && !input.version.equals("5.0"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/295c6e74/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java b/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java index ff2175d..2e4a3c4 100644 --- a/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java +++ b/providers/cloudservers-us/src/main/java/org/jclouds/rackspace/cloudservers/CloudServersUSProviderMetadata.java @@ -64,7 +64,7 @@ public class CloudServersUSProviderMetadata extends BaseProviderMetadata { .homepage(URI.create("http://www.rackspace.com/cloud/cloud_hosting_products/servers";)) .console(URI.create("https://manage.rackspacecloud.com";)) .linkedServices("cloudloadbalancers-us", "cloudservers-us", "cloudfiles-us") - .iso3166Codes("US-IL", "US-TX"); + .iso3166Codes("US-IL", "US-TX", "AU-NSW"); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/295c6e74/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java b/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java index cf2346c..940a8c7 100644 --- a/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java +++ b/providers/cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/compute/CloudServersUSTemplateBuilderLiveTest.java @@ -50,12 +50,12 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi public boolean apply(OsFamilyVersion64Bit input) { switch (input.family) { case UBUNTU: - return (input.version.equals("") || input.version.matches("1[012].04") || input.version.startsWith("11")) + return (input.version.equals("") || input.version.matches("(10.04)|(12.04)|(12.10)|(13.04)")) && input.is64Bit; case DEBIAN: return input.is64Bit && !input.version.equals("5.0"); case CENTOS: - return (input.version.equals("") || input.version.matches("5.[60]") || input.version.equals("6.0")) + return (input.version.equals("") || input.version.matches("(5.6)|(5.8)|(5.9)|(6.0)|(6.2)|(6.3)|(6.4)")) && input.is64Bit; case WINDOWS: return input.version.equals("2008 SP2") || input.version.equals("") @@ -80,6 +80,6 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi @Override protected Set<String> getIso3166Codes() { - return ImmutableSet.<String> of("US-IL", "US-TX"); + return ImmutableSet.<String> of("US-IL", "US-TX", "AU-NSW"); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/295c6e74/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/compute/CloudServersUKTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/compute/CloudServersUKTemplateBuilderLiveTest.java b/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/compute/CloudServersUKTemplateBuilderLiveTest.java index 1b974ca..78d1637 100644 --- a/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/compute/CloudServersUKTemplateBuilderLiveTest.java +++ b/providers/rackspace-cloudservers-uk/src/test/java/org/jclouds/rackspace/cloudservers/uk/compute/CloudServersUKTemplateBuilderLiveTest.java @@ -52,13 +52,12 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi public boolean apply(OsFamilyVersion64Bit input) { switch (input.family) { case UBUNTU: - return (input.version.equals("") || (input.version.matches("^1[012].*") && !input.version - .equals("10.10"))) + return (input.version.equals("") || input.version.matches("(10.04)|(12.04)|(12.10)|(13.04)")) && input.is64Bit; case DEBIAN: return input.is64Bit && !input.version.equals("5.0"); case CENTOS: - return (input.version.equals("") || input.version.equals("5.6") || input.version.equals("6.0")) + return (input.version.equals("") || input.version.matches("(5.0)|(5.6)|(5.8)|(5.9)|(6.0)|(6.2)|(6.3)|(6.4)")) && input.is64Bit; case WINDOWS: return input.is64Bit && input.version.equals(""); @@ -74,9 +73,9 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi public void testTemplateBuilder() { Template defaultTemplate = this.view.getComputeService().templateBuilder().build(); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "12.04"); + assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "12.10"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); - assertEquals(defaultTemplate.getImage().getName(), "Ubuntu 12.04 LTS (Precise Pangolin)"); + assertEquals(defaultTemplate.getImage().getName(), "Ubuntu 12.10 (Quantal Quetzal)"); assertEquals(defaultTemplate.getImage().getDefaultCredentials().getUser(), "root"); assertEquals(defaultTemplate.getLocation().getId(), "LON"); assertEquals(defaultTemplate.getImage().getLocation().getId(), "LON"); @@ -84,7 +83,7 @@ public class CloudServersUKTemplateBuilderLiveTest extends BaseTemplateBuilderLi assertEquals(defaultTemplate.getOptions().as(NovaTemplateOptions.class).shouldAutoAssignFloatingIp(), false); assertNull(defaultTemplate.getOptions().as(NovaTemplateOptions.class).getDiskConfig()); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); - } + } @Override protected Set<String> getIso3166Codes() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/295c6e74/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java index 566cebb..55bdebd 100644 --- a/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java +++ b/providers/rackspace-cloudservers-us/src/test/java/org/jclouds/rackspace/cloudservers/us/compute/CloudServersUSTemplateBuilderLiveTest.java @@ -52,13 +52,12 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi public boolean apply(OsFamilyVersion64Bit input) { switch (input.family) { case UBUNTU: - return (input.version.equals("") || (input.version.matches("^1[012].*") && !input.version - .equals("10.10"))) + return (input.version.equals("") || input.version.matches("(10.04)|(12.04)|(12.10)|(13.04)")) && input.is64Bit; case DEBIAN: return input.is64Bit && !input.version.equals("5.0"); case CENTOS: - return (input.version.equals("") || input.version.equals("5.6") || input.version.equals("6.0")) + return (input.version.equals("") || input.version.matches("(5.0)|(5.6)|(5.8)|(5.9)|(6.0)|(6.2)|(6.3)|(6.4)")) && input.is64Bit; case WINDOWS: return input.is64Bit && input.version.equals(""); @@ -74,13 +73,13 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi public void testTemplateBuilder() { Template defaultTemplate = this.view.getComputeService().templateBuilder().build(); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "12.04"); + assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "12.10"); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); - assertEquals(defaultTemplate.getImage().getName(), "Ubuntu 12.04 LTS (Precise Pangolin)"); + assertEquals(defaultTemplate.getImage().getName(), "Ubuntu 12.10 (Quantal Quetzal)"); assertEquals(defaultTemplate.getImage().getDefaultCredentials().getUser(), "root"); - assertEquals(defaultTemplate.getLocation().getId(), "ORD"); - assertEquals(defaultTemplate.getImage().getLocation().getId(), "ORD"); - assertEquals(defaultTemplate.getHardware().getLocation().getId(), "ORD"); + assertEquals(defaultTemplate.getLocation().getId(), "SYD"); + assertEquals(defaultTemplate.getImage().getLocation().getId(), "SYD"); + assertEquals(defaultTemplate.getHardware().getLocation().getId(), "SYD"); assertEquals(defaultTemplate.getOptions().as(NovaTemplateOptions.class).shouldAutoAssignFloatingIp(), false); assertNull(defaultTemplate.getOptions().as(NovaTemplateOptions.class).getDiskConfig()); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); @@ -88,6 +87,6 @@ public class CloudServersUSTemplateBuilderLiveTest extends BaseTemplateBuilderLi @Override protected Set<String> getIso3166Codes() { - return ImmutableSet.<String> of("US-IL", "US-TX"); + return ImmutableSet.<String> of("US-IL", "US-TX", "AU-NSW"); } }
