From 2cad1dc7b6e91392812ab874f2352ca016d302f1 Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Mon, 13 Feb 2012 21:44:42 +0100 Subject: [PATCH] merged glesys changes --- {sandbox-providers => labs}/glesys/pom.xml | 17 +--- .../org/jclouds/glesys/GleSYSAsyncClient.java | 0 .../java/org/jclouds/glesys/GleSYSClient.java | 0 .../jclouds/glesys/GleSYSContextBuilder.java | 0 .../glesys/GleSYSPropertiesBuilder.java | 2 + .../glesys/GleSYSProviderMetadata.java | 0 .../compute/GleSYSComputeServiceAdapter.java | 77 ++++++++++++------- .../GleSYSComputeServiceContextModule.java | 14 +--- .../functions/DatacenterToLocation.java | 0 .../functions/FindLocationForServerSpec.java | 0 .../compute/functions/OSTemplateToImage.java | 0 ...arseOsFamilyVersion64BitFromImageName.java | 0 .../ServerDetailsToNodeMetadata.java | 27 +++---- .../functions/ServerSpecToHardware.java | 0 .../options/GleSYSTemplateOptions.java | 0 .../glesys/config/GleSYSParserModule.java | 0 .../glesys/config/GleSYSRestClientModule.java | 0 .../AllowedArgumentsForCreateServer.java | 0 .../org/jclouds/glesys/domain/Archive.java | 0 .../domain/ArchiveAllowedArguments.java | 0 .../jclouds/glesys/domain/ArchiveDetails.java | 0 .../org/jclouds/glesys/domain/Console.java | 0 .../java/org/jclouds/glesys/domain/Cost.java | 0 .../org/jclouds/glesys/domain/Domain.java | 0 .../jclouds/glesys/domain/DomainRecord.java | 0 .../jclouds/glesys/domain/EmailAccount.java | 0 .../jclouds/glesys/domain/EmailOverview.java | 0 .../glesys/domain/EmailOverviewDomain.java | 0 .../glesys/domain/EmailOverviewSummary.java | 0 .../java/org/jclouds/glesys/domain/Ip.java | 0 .../org/jclouds/glesys/domain/IpDetails.java | 0 .../org/jclouds/glesys/domain/OSTemplate.java | 0 .../jclouds/glesys/domain/ResourceUsage.java | 0 .../org/jclouds/glesys/domain/Server.java | 0 .../jclouds/glesys/domain/ServerDetails.java | 40 +++++++--- .../jclouds/glesys/domain/ServerLimit.java | 0 .../org/jclouds/glesys/domain/ServerSpec.java | 2 +- .../jclouds/glesys/domain/ServerStatus.java | 0 .../jclouds/glesys/domain/ServerUptime.java | 0 .../glesys/features/ArchiveAsyncClient.java | 0 .../glesys/features/ArchiveClient.java | 0 .../glesys/features/DomainAsyncClient.java | 0 .../jclouds/glesys/features/DomainClient.java | 0 .../glesys/features/EmailAsyncClient.java | 0 .../jclouds/glesys/features/EmailClient.java | 0 .../glesys/features/IpAsyncClient.java | 0 .../org/jclouds/glesys/features/IpClient.java | 0 .../glesys/features/ServerAsyncClient.java | 1 + .../jclouds/glesys/features/ServerClient.java | 2 + .../ParseTemplatesFromHttpResponse.java | 0 .../internal/GleSYSTypeAdapters.java | 0 .../functions/internal/GlesysDateAdapter.java | 0 .../glesys/handlers/GleSYSErrorHandler.java | 7 +- .../glesys/options/AddDomainOptions.java | 0 .../glesys/options/AddRecordOptions.java | 0 .../glesys/options/CloneServerOptions.java | 0 .../glesys/options/CreateAccountOptions.java | 0 .../glesys/options/CreateServerOptions.java | 28 ++++++- .../glesys/options/DestroyServerOptions.java | 0 .../jclouds/glesys/options/DomainOptions.java | 0 .../glesys/options/EditAccountOptions.java | 0 .../glesys/options/EditRecordOptions.java | 0 .../glesys/options/EditServerOptions.java | 0 .../glesys/options/ServerStatusOptions.java | 0 .../glesys/reference/GleSYSConstants.java | 0 .../org.jclouds.providers.ProviderMetadata | 0 .../jclouds/glesys/GleSYSAsyncClientTest.java | 0 .../glesys/GleSYSErrorHandlerTest.java | 5 +- .../jclouds/glesys/GleSYSProviderTest.java | 0 ...GleSYSComputeServiceAdapterExpectTest.java | 0 .../compute/GleSYSComputeServiceLiveTest.java | 8 +- .../compute/GleSYSExperimentExpectTest.java | 0 .../compute/GleSYSExperimentLiveTest.java | 0 .../GleSYSTemplateBuilderLiveTest.java | 0 ...OsFamilyVersion64BitFromImageNameTest.java | 0 .../ServerDetailsToNodeMetadataTest.java | 0 .../functions/ServerSpecToHardwareTest.java | 0 .../BaseGleSYSComputeServiceExpectTest.java | 0 .../options/GleSYSTemplateOptionsTest.java | 0 .../features/ArchiveClientExpectTest.java | 0 .../features/ArchiveClientLiveTest.java | 0 .../features/DomainClientExpectTest.java | 24 +++--- .../glesys/features/DomainClientLiveTest.java | 0 .../features/EmailClientExpectTest.java | 0 .../glesys/features/EmailClientLiveTest.java | 0 .../glesys/features/IpAsyncClientTest.java | 0 .../glesys/features/IpClientExpectTest.java | 0 .../glesys/features/IpClientLiveTest.java | 0 .../features/ServerClientExpectTest.java | 2 + .../glesys/features/ServerClientLiveTest.java | 0 .../internal/BaseGleSYSAsyncClientTest.java | 0 .../internal/BaseGleSYSClientLiveTest.java | 33 ++++---- .../glesys/parse/ParseFullIpDetailsTest.java | 0 .../parse/ParseIpAddressFromResponseTest.java | 0 .../resources/archive_allowed_arguments.json | 0 .../src/test/resources/archive_details.json | 0 .../src/test/resources/archive_list.json | 0 .../src/test/resources/domain_list.json | 0 .../test/resources/domain_list_records.json | 0 .../glesys/src/test/resources/email_list.json | 0 .../src/test/resources/email_overview.json | 0 .../src/test/resources/ip_get_details.json | 0 .../test/resources/ip_get_details_xen.json | 0 .../src/test/resources/ip_list_free.json | 0 .../glesys/src/test/resources/ip_release.json | 0 .../glesys/src/test/resources/ip_take.json | 0 .../glesys/src/test/resources/log4j.xml | 0 .../glesys/src/test/resources/osmatches.json | 0 .../resources/server_allowed_arguments.json | 0 .../src/test/resources/server_console.json | 0 .../src/test/resources/server_created.json | 0 .../src/test/resources/server_details.json | 0 .../src/test/resources/server_limits.json | 0 .../src/test/resources/server_list.json | 0 .../src/test/resources/server_noip.json | 0 .../src/test/resources/server_status.json | 0 .../src/test/resources/server_templates.json | 0 labs/pom.xml | 1 + 118 files changed, 167 insertions(+), 123 deletions(-) rename {sandbox-providers => labs}/glesys/pom.xml (92%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/GleSYSContextBuilder.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java (95%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java (73%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/config/GleSYSComputeServiceContextModule.java (93%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/functions/FindLocationForServerSpec.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java (81%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/config/GleSYSRestClientModule.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveDetails.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/Console.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/Server.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java (82%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java (99%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/EmailClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java (99%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java (98%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/functions/internal/GleSYSTypeAdapters.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java (89%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/AddDomainOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/AddRecordOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/CloneServerOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/CreateAccountOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java (83%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/DestroyServerOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/DomainOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/EditAccountOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/EditRecordOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/EditServerOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/options/ServerStatusOptions.java (100%) rename {sandbox-providers => labs}/glesys/src/main/java/org/jclouds/glesys/reference/GleSYSConstants.java (100%) rename {sandbox-providers => labs}/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/GleSYSAsyncClientTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/GleSYSErrorHandlerTest.java (95%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/GleSYSProviderTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapterExpectTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceLiveTest.java (91%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentExpectTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentLiveTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageNameTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerSpecToHardwareTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/internal/BaseGleSYSComputeServiceExpectTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptionsTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientLiveTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/DomainClientExpectTest.java (98%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/DomainClientLiveTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/EmailClientExpectTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/EmailClientLiveTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/IpAsyncClientTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/IpClientLiveTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java (99%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSAsyncClientTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSClientLiveTest.java (88%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/archive_allowed_arguments.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/archive_details.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/archive_list.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/domain_list.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/domain_list_records.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/email_list.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/email_overview.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/ip_get_details.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/ip_get_details_xen.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/ip_list_free.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/ip_release.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/ip_take.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/log4j.xml (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/osmatches.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_allowed_arguments.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_console.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_created.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_details.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_limits.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_list.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_noip.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_status.json (100%) rename {sandbox-providers => labs}/glesys/src/test/resources/server_templates.json (100%) diff --git a/sandbox-providers/glesys/pom.xml b/labs/glesys/pom.xml similarity index 92% rename from sandbox-providers/glesys/pom.xml rename to labs/glesys/pom.xml index ddb548a3c9..a804cb2dc6 100644 --- a/sandbox-providers/glesys/pom.xml +++ b/labs/glesys/pom.xml @@ -27,26 +27,12 @@ 1.4.0-SNAPSHOT ../../project/pom.xml - org.jclouds.provider + org.jclouds.labs glesys jclouds GleSYS core jclouds components to access GleSYS bundle - - - - jclouds-sona-snapshots-nexus - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - https://api.glesys.com 1 @@ -57,6 +43,7 @@ + org.jclouds diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/GleSYSAsyncClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/GleSYSClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSContextBuilder.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSContextBuilder.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSContextBuilder.java rename to labs/glesys/src/main/java/org/jclouds/glesys/GleSYSContextBuilder.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java similarity index 95% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java rename to labs/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java index dba345ad19..bae37e4008 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSPropertiesBuilder.java @@ -48,6 +48,8 @@ public class GleSYSPropertiesBuilder extends PropertiesBuilder { properties.setProperty(PROPERTY_ZONE + ".Falkenberg." + ISO3166_CODES, "SE-N"); properties.setProperty(PROPERTY_ZONE + ".New York City." + ISO3166_CODES, "US-NY"); properties.setProperty(PROPERTY_ZONE + ".Stockholm." + ISO3166_CODES, "SE-AB"); + properties.setProperty("jclouds.ssh.max-retries", "5"); + properties.setProperty("jclouds.ssh.retry-auth", "true"); properties.setProperty(PROPERTY_GLESYS_DEFAULT_DC, "Falkenberg"); return properties; } diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java b/labs/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java rename to labs/glesys/src/main/java/org/jclouds/glesys/GleSYSProviderMetadata.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java similarity index 73% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java index dec819f0c6..c5854f0b21 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapter.java @@ -20,9 +20,12 @@ package org.jclouds.glesys.compute; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; +import static org.jclouds.concurrent.FutureIterables.transformParallel; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; import javax.annotation.Resource; import javax.inject.Inject; @@ -30,6 +33,7 @@ import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; +import org.jclouds.Constants; import org.jclouds.collect.FindResourceInSet; import org.jclouds.collect.Memoized; import org.jclouds.compute.ComputeService; @@ -44,10 +48,12 @@ import org.jclouds.compute.predicates.ImagePredicates; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.domain.Location; import org.jclouds.domain.LoginCredentials; +import org.jclouds.glesys.GleSYSAsyncClient; import org.jclouds.glesys.GleSYSClient; import org.jclouds.glesys.compute.options.GleSYSTemplateOptions; import org.jclouds.glesys.domain.AllowedArgumentsForCreateServer; import org.jclouds.glesys.domain.OSTemplate; +import org.jclouds.glesys.domain.Server; import org.jclouds.glesys.domain.ServerDetails; import org.jclouds.glesys.domain.ServerSpec; import org.jclouds.glesys.options.CreateServerOptions; @@ -62,8 +68,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; /** - * defines the connection between the {@link GleSYSClient} implementation and the jclouds - * {@link ComputeService} + * defines the connection between the {@link GleSYSClient} implementation and + * the jclouds {@link ComputeService} * */ @Singleton @@ -74,32 +80,37 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter> locations; private final Provider passwordProvider; @Inject - public GleSYSComputeServiceAdapter(GleSYSClient client, @Memoized Supplier> locations, - @Named("PASSWORD") Provider passwordProvider) { + public GleSYSComputeServiceAdapter(GleSYSClient client, GleSYSAsyncClient aclient, + @Named(Constants.PROPERTY_USER_THREADS) ExecutorService userThreads, + @Memoized Supplier> locations, @Named("PASSWORD") Provider passwordProvider) { this.client = checkNotNull(client, "client"); + this.aclient = checkNotNull(aclient, "aclient"); + this.userThreads = checkNotNull(userThreads, "userThreads"); this.locations = checkNotNull(locations, "locations"); this.passwordProvider = checkNotNull(passwordProvider, "passwordProvider"); } @Override public NodeAndInitialCredentials createNodeWithGroupEncodedIntoName(String group, String name, - Template template) { + Template template) { checkNotNull(template, "template was null"); checkNotNull(template.getOptions(), "template options was null"); checkArgument(template.getOptions().getClass().isAssignableFrom(GleSYSTemplateOptions.class), - "options class %s should have been assignable from GleSYSTemplateOptions", template.getOptions() - .getClass()); + "options class %s should have been assignable from GleSYSTemplateOptions", template.getOptions().getClass()); GleSYSTemplateOptions templateOptions = template.getOptions().as(GleSYSTemplateOptions.class); CreateServerOptions createServerOptions = new CreateServerOptions(); createServerOptions.ip(templateOptions.getIp()); - createServerOptions.description(name); // TODO: add to templateOptions and set if present + createServerOptions.description(name); // TODO: add to templateOptions and + // set if present ServerSpec.Builder builder = ServerSpec.builder(); builder.datacenter(template.getLocation().getId()); @@ -111,15 +122,16 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter> creating new Server spec(%s) name(%s) options(%s)", spec, name, createServerOptions); ServerDetails result = client.getServerClient().createServerWithHostnameAndRootPassword(spec, name, password, - createServerOptions); + createServerOptions); logger.trace("<< ServerDetails(%s)", result.getId()); return new NodeAndInitialCredentials(result, result.getId() + "", LoginCredentials.builder() - .password(password).build()); + .password(password).build()); } @Singleton @@ -145,7 +157,7 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter images = listImages(); for (Entry platformToArgs : client.getServerClient() - .getAllowedArgumentsForCreateServerByPlatform().entrySet()) + .getAllowedArgumentsForCreateServerByPlatform().entrySet()) for (String datacenter : platformToArgs.getValue().getDataCenters()) for (int diskSizeGB : platformToArgs.getValue().getDiskSizesInGB()) for (int cpuCores : platformToArgs.getValue().getCpuCoreOptions()) @@ -157,14 +169,15 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter templatesSupported = templatesSupportedBuilder.build(); if (templatesSupported.size() > 0) - hardwareToReturn.add(new HardwareBuilder().ids( - String.format("datacenter(%s)platform(%s)cpuCores(%d)memorySizeMB(%d)diskSizeGB(%d)", - datacenter, platformToArgs.getKey(), cpuCores, memorySizeMB, diskSizeGB)).ram( - memorySizeMB).processors(ImmutableList.of(new Processor(cpuCores, 1.0))).volumes( - ImmutableList. of(new VolumeImpl((float) diskSizeGB, true, true))).hypervisor( - platformToArgs.getKey()).location( - Iterables.find(locationsSet, LocationPredicates.idEquals(datacenter))).supportsImage( - ImagePredicates.idIn(templatesSupported)).build()); + hardwareToReturn.add(new HardwareBuilder() + .ids(String.format( + "datacenter(%s)platform(%s)cpuCores(%d)memorySizeMB(%d)diskSizeGB(%d)", datacenter, + platformToArgs.getKey(), cpuCores, memorySizeMB, diskSizeGB)).ram(memorySizeMB) + .processors(ImmutableList.of(new Processor(cpuCores, 1.0))) + .volumes(ImmutableList. of(new VolumeImpl((float) diskSizeGB, true, true))) + .hypervisor(platformToArgs.getKey()) + .location(Iterables.find(locationsSet, LocationPredicates.idEquals(datacenter))) + .supportsImage(ImagePredicates.idIn(templatesSupported)).build()); } return hardwareToReturn.build(); @@ -177,21 +190,27 @@ public class GleSYSComputeServiceAdapter implements ComputeServiceAdapter listNodes() { - return ImmutableSet.of(); + return transformParallel(client.getServerClient().listServers(), new Function>() { + @Override + public Future apply(Server from) { + return aclient.getServerClient().getServerDetails(from.getId()); + } + + }, userThreads, null, logger, "server details"); } @Override public Set listLocations() { return ImmutableSet.copyOf(Iterables.concat(Iterables.transform(client.getServerClient() - .getAllowedArgumentsForCreateServerByPlatform().values(), - new Function>() { + .getAllowedArgumentsForCreateServerByPlatform().values(), + new Function>() { - @Override - public Set apply(AllowedArgumentsForCreateServer arg0) { - return arg0.getDataCenters(); - } + @Override + public Set apply(AllowedArgumentsForCreateServer arg0) { + return arg0.getDataCenters(); + } - }))); + }))); } @Override diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/config/GleSYSComputeServiceContextModule.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/config/GleSYSComputeServiceContextModule.java similarity index 93% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/config/GleSYSComputeServiceContextModule.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/config/GleSYSComputeServiceContextModule.java index 4059b4cf9d..7c6339eb9b 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/config/GleSYSComputeServiceContextModule.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/compute/config/GleSYSComputeServiceContextModule.java @@ -18,9 +18,8 @@ */ package org.jclouds.glesys.compute.config; -import java.security.SecureRandom; +import java.util.UUID; -import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; import javax.inject.Singleton; @@ -64,7 +63,7 @@ public class GleSYSComputeServiceContextModule super(GleSYSClient.class, GleSYSAsyncClient.class); } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override protected void configure() { super.configure(); @@ -95,16 +94,11 @@ public class GleSYSComputeServiceContextModule @Named("PASSWORD") @Singleton public static class PasswordProvider implements Provider { - private final SecureRandom random; - - @Inject - protected PasswordProvider() { - this.random = new SecureRandom(); - } @Override public String get() { - return random.nextLong() + ""; + return UUID.randomUUID().toString().replace("-",""); } + } } \ No newline at end of file diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/DatacenterToLocation.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/FindLocationForServerSpec.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/FindLocationForServerSpec.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/FindLocationForServerSpec.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/FindLocationForServerSpec.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/OSTemplateToImage.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageName.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java similarity index 81% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java index 77b6a1ef3f..3adfb28966 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadata.java @@ -43,10 +43,8 @@ import org.jclouds.compute.domain.Volume; import org.jclouds.compute.domain.internal.VolumeImpl; import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.domain.Location; -import org.jclouds.glesys.GleSYSClient; import org.jclouds.glesys.domain.Ip; import org.jclouds.glesys.domain.ServerDetails; -import org.jclouds.glesys.options.ServerStatusOptions; import org.jclouds.logging.Logger; import org.jclouds.util.InetAddresses2.IsPrivateIPAddress; @@ -68,12 +66,11 @@ public class ServerDetailsToNodeMetadata implements Function serverStateToNodeState = ImmutableMap - . builder().put(ServerDetails.State.STOPPED, NodeState.SUSPENDED).put( - ServerDetails.State.RUNNING, NodeState.RUNNING).put(ServerDetails.State.UNRECOGNIZED, - NodeState.UNRECOGNIZED).build(); + . builder().put(ServerDetails.State.STOPPED, NodeState.SUSPENDED) + .put(ServerDetails.State.RUNNING, NodeState.RUNNING) + .put(ServerDetails.State.UNRECOGNIZED, NodeState.UNRECOGNIZED).build(); protected final Supplier> images; - protected final GleSYSClient client; protected final FindLocationForServerDetails findLocationForServerDetails; private static class FindImageForServer implements Predicate { @@ -90,9 +87,8 @@ public class ServerDetailsToNodeMetadata implements Function> images) { - this.client = checkNotNull(client, "client"); + ServerDetailsToNodeMetadata(FindLocationForServerDetails findLocationForServerDetails, + @Memoized Supplier> images) { this.findLocationForServerDetails = checkNotNull(findLocationForServerDetails, "findLocationForServerDetails"); this.images = checkNotNull(images, "images"); } @@ -105,15 +101,14 @@ public class ServerDetailsToNodeMetadata implements Function of(new VolumeImpl((float) from.getDiskSizeGB(), true, true))).hypervisor( - from.getPlatform()).build()); - builder.state(serverStateToNodeState.get(client.getServerClient().getServerStatus(from.getId(), - ServerStatusOptions.Builder.state()).getState())); + builder.hardware(new HardwareBuilder().ids(from.getId() + "").ram(from.getMemorySizeMB()) + .processors(ImmutableList.of(new Processor(from.getCpuCores(), 1.0))) + .volumes(ImmutableList. of(new VolumeImpl((float) from.getDiskSizeGB(), true, true))) + .hypervisor(from.getPlatform()).build()); + builder.state(from.getState() != null ? serverStateToNodeState.get(from.getState()) : NodeState.UNRECOGNIZED); Iterable addresses = Iterables.filter(Iterables.transform(from.getIps(), new Function() { @Override diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/functions/ServerSpecToHardware.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java b/labs/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java rename to labs/glesys/src/main/java/org/jclouds/glesys/config/GleSYSParserModule.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSRestClientModule.java b/labs/glesys/src/main/java/org/jclouds/glesys/config/GleSYSRestClientModule.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/config/GleSYSRestClientModule.java rename to labs/glesys/src/main/java/org/jclouds/glesys/config/GleSYSRestClientModule.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveDetails.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveDetails.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveDetails.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveDetails.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Console.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/Console.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/Server.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/Server.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java similarity index 82% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java index 238e8c4b20..c18ce42ce6 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java @@ -28,7 +28,7 @@ import com.google.gson.annotations.SerializedName; /** * Detailed information about a server such as cpuCores, hardware configuration * (cpu, memory and disk), ip adresses, cost, transfer, os and more. - * + * * @author Adrian Cole * @see */ @@ -38,6 +38,7 @@ public class ServerDetails extends Server { } public static class Builder extends Server.Builder { + private Server.State state; private String description; private String templateName; private int cpuCores; @@ -47,6 +48,11 @@ public class ServerDetails extends Server { private Cost cost; private Set ips = ImmutableSet.of(); + public Builder state(Server.State state) { + this.state = state; + return this; + } + public Builder description(String description) { this.description = description; return this; @@ -56,7 +62,7 @@ public class ServerDetails extends Server { this.templateName = templateName; return this; } - + public Builder cpuCores(int cpuCores) { this.cpuCores = cpuCores; return this; @@ -92,11 +98,13 @@ public class ServerDetails extends Server { } public ServerDetails build() { - return new ServerDetails(id, hostname, datacenter, platform, templateName, description, cpuCores, memorySizeMB, diskSizeGB, transferGB, cost, ips); + return new ServerDetails(id, hostname, datacenter, platform, state, templateName, description, cpuCores, + memorySizeMB, diskSizeGB, transferGB, cost, ips); } public Builder fromServerDetails(ServerDetails in) { - return fromServer(in).templateName(in.getTemplateName()).memorySizeMB(in.getMemorySizeMB()).diskSizeGB(in.getDiskSizeGB()).cpuCores(in.getCpuCores()).cost(in.getCost()) + return fromServer(in).templateName(in.getTemplateName()).state(in.getState()).memorySizeMB(in.getMemorySizeMB()) + .diskSizeGB(in.getDiskSizeGB()).cpuCores(in.getCpuCores()).cost(in.getCost()) .transferGB(in.getTransferGB()).description(in.getDescription()).ips(in.getIps()); } @@ -126,6 +134,7 @@ public class ServerDetails extends Server { } } + private final Server.State state; private final String description; @SerializedName("templatename") private final String templateName; @@ -141,9 +150,11 @@ public class ServerDetails extends Server { @SerializedName("iplist") private final Set ips; - public ServerDetails(String id, String hostname, String datacenter, String platform, String templateName, - String description, int cpuCores, int memorySizeMB, int diskSizeGB, int transferGB, Cost cost, Set ips) { + public ServerDetails(String id, String hostname, String datacenter, String platform, Server.State state, + String templateName, String description, int cpuCores, int memorySizeMB, int diskSizeGB, int transferGB, + Cost cost, Set ips) { super(id, hostname, datacenter, platform); + this.state = state; this.templateName = checkNotNull(templateName, "template"); this.description = description; this.cpuCores = cpuCores; @@ -151,7 +162,14 @@ public class ServerDetails extends Server { this.diskSizeGB = diskSizeGB; this.transferGB = transferGB; this.cost = checkNotNull(cost, "cost"); - this.ips = ImmutableSet.copyOf(ips); + this.ips = ImmutableSet. copyOf(ips); + } + + /** + * @return the state of the server (e.g. "running") + */ + public Server.State getState() { + return state; } /** @@ -212,9 +230,11 @@ public class ServerDetails extends Server { @Override public String toString() { - return String.format( - "[id=%s, hostname=%s, datacenter=%s, platform=%s, templateName=%s, description=%s, cpuCores=%d, memorySizeMB=%d, diskSizeGB=%d, transferGB=%d, cost=%s, ips=%s]", id, - hostname, datacenter, platform, templateName, description, cpuCores, memorySizeMB, diskSizeGB, transferGB, cost, ips); + return String + .format( + "[id=%s, hostname=%s, datacenter=%s, platform=%s, templateName=%s, state=%s, description=%s, cpuCores=%d, memorySizeMB=%d, diskSizeGB=%d, transferGB=%d, cost=%s, ips=%s]", + id, hostname, datacenter, platform, templateName, state, description, cpuCores, memorySizeMB, + diskSizeGB, transferGB, cost, ips); } } diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java similarity index 99% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java index ef505efbdf..3ddb6031a1 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java @@ -186,7 +186,7 @@ public class ServerSpec { @Override public String toString() { return toStringHelper("").add("platform", platform).add("datacenter", datacenter) - .add("templateName", templateName).add("cpuCores", cpuCores).add("cpuCores", cpuCores) + .add("templateName", templateName).add("cpuCores", cpuCores).add("memorySizeMB", memorySizeMB) .add("diskSizeGB", diskSizeGB).add("transferGB", transferGB).toString(); } } diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java b/labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java rename to labs/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveAsyncClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/ArchiveClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/DomainAsyncClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/DomainClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/EmailAsyncClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/EmailClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/EmailClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/EmailClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/EmailClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/IpAsyncClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/IpClient.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java similarity index 99% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java index 7928b79a67..546277f57c 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerAsyncClient.java @@ -85,6 +85,7 @@ public interface ServerAsyncClient { @Path("/server/details/format/json") @SelectJson("server") @Consumes(MediaType.APPLICATION_JSON) + @FormParams(keys = "includestate", values = "true") @ExceptionParser(ReturnNullOnNotFoundOr404.class) ListenableFuture getServerDetails(@FormParam("serverid") String id); diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java b/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java similarity index 98% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java rename to labs/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java index 166ad9d8ee..fe7c523fb8 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/features/ServerClient.java @@ -166,6 +166,7 @@ public interface ServerClient { * @param options * optional settings ex. description */ + @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS) ServerDetails createServerWithHostnameAndRootPassword(ServerSpec serverSpec, String hostname, String rootPassword, CreateServerOptions... options); @@ -189,6 +190,7 @@ public interface ServerClient { * @param options * the settings to change */ + @Timeout(duration = 180, timeUnit = TimeUnit.SECONDS) ServerDetails cloneServer(String serverid, String hostname, CloneServerOptions... options); /** diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.java b/labs/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.java rename to labs/glesys/src/main/java/org/jclouds/glesys/functions/ParseTemplatesFromHttpResponse.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/functions/internal/GleSYSTypeAdapters.java b/labs/glesys/src/main/java/org/jclouds/glesys/functions/internal/GleSYSTypeAdapters.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/functions/internal/GleSYSTypeAdapters.java rename to labs/glesys/src/main/java/org/jclouds/glesys/functions/internal/GleSYSTypeAdapters.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java b/labs/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java rename to labs/glesys/src/main/java/org/jclouds/glesys/functions/internal/GlesysDateAdapter.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java b/labs/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java similarity index 89% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java rename to labs/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java index 2205123e5b..ccf7bad8b8 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/handlers/GleSYSErrorHandler.java @@ -56,15 +56,12 @@ public class GleSYSErrorHandler implements HttpErrorHandler { exception = new AuthorizationException(message, exception); break; case 400: - if (command.getCurrentRequest().getEndpoint().getPath().indexOf("delete") != -1 - && message.indexOf("Could not find") != -1) { + if (message.indexOf("Could not find") != -1) { exception = new ResourceNotFoundException(message, exception); } break; case 404: - if (command.getCurrentRequest().getEndpoint().getPath().indexOf("delete") == -1) { - exception = new ResourceNotFoundException(message, exception); - } + exception = new ResourceNotFoundException(message, exception); break; } } finally { diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/AddDomainOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/AddDomainOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/AddDomainOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/AddDomainOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/AddRecordOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/AddRecordOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/AddRecordOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/AddRecordOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/CloneServerOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/CloneServerOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/CloneServerOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/CloneServerOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/CreateAccountOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/CreateAccountOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/CreateAccountOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/CreateAccountOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java similarity index 83% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java index 437564a0d7..5764e62526 100644 --- a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java +++ b/labs/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java @@ -18,11 +18,14 @@ */ package org.jclouds.glesys.options; +import static com.google.common.base.Objects.equal; +import static com.google.common.base.Objects.toStringHelper; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; import static com.google.common.base.Predicates.instanceOf; import static com.google.common.collect.Iterables.find; +import static com.google.common.collect.Multimaps.forMap; import java.util.Map; @@ -32,8 +35,8 @@ import org.jclouds.io.payloads.UrlEncodedFormPayload; import org.jclouds.rest.MapBinder; import org.jclouds.rest.internal.GeneratedHttpRequest; +import com.google.common.base.Objects; import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.Multimaps; /** * @author Adam Lowe @@ -51,7 +54,7 @@ public class CreateServerOptions implements MapBinder { checkState(gRequest.getArgs() != null, "args should be initialized at this point"); ImmutableMultimap.Builder formParams = ImmutableMultimap. builder(); - formParams.putAll(Multimaps.forMap(postParams)); + formParams.putAll(forMap(postParams)); ServerSpec serverSpec = ServerSpec.class.cast(find(gRequest.getArgs(), instanceOf(ServerSpec.class))); formParams.put("datacenter", serverSpec.getDatacenter()); formParams.put("platform", serverSpec.getPlatform()); @@ -109,4 +112,25 @@ public class CreateServerOptions implements MapBinder { public R bindToRequest(R request, Object input) { throw new IllegalArgumentException(); } + + @Override + public int hashCode() { + return Objects.hashCode(ip, description); + } + + @Override + public boolean equals(Object obj) { + if (obj == null) + return false; + if (!(obj instanceof CreateServerOptions)) + return false; + CreateServerOptions that = CreateServerOptions.class.cast(obj); + return equal(this.ip, that.ip) && equal(this.description, that.description); + } + + @Override + public String toString() { + return toStringHelper("").add("ip", ip).add("description", description).toString(); + } + } diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/DestroyServerOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/DestroyServerOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/DestroyServerOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/DestroyServerOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/DomainOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/DomainOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/DomainOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/DomainOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/EditAccountOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/EditAccountOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/EditAccountOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/EditAccountOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/EditRecordOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/EditRecordOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/EditRecordOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/EditRecordOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/EditServerOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/EditServerOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/EditServerOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/EditServerOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/ServerStatusOptions.java b/labs/glesys/src/main/java/org/jclouds/glesys/options/ServerStatusOptions.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/options/ServerStatusOptions.java rename to labs/glesys/src/main/java/org/jclouds/glesys/options/ServerStatusOptions.java diff --git a/sandbox-providers/glesys/src/main/java/org/jclouds/glesys/reference/GleSYSConstants.java b/labs/glesys/src/main/java/org/jclouds/glesys/reference/GleSYSConstants.java similarity index 100% rename from sandbox-providers/glesys/src/main/java/org/jclouds/glesys/reference/GleSYSConstants.java rename to labs/glesys/src/main/java/org/jclouds/glesys/reference/GleSYSConstants.java diff --git a/sandbox-providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata b/labs/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata similarity index 100% rename from sandbox-providers/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata rename to labs/glesys/src/main/resources/META-INF/services/org.jclouds.providers.ProviderMetadata diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/GleSYSAsyncClientTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/GleSYSAsyncClientTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/GleSYSAsyncClientTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/GleSYSAsyncClientTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/GleSYSErrorHandlerTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/GleSYSErrorHandlerTest.java similarity index 95% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/GleSYSErrorHandlerTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/GleSYSErrorHandlerTest.java index e67832f236..56283a4c66 100644 --- a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/GleSYSErrorHandlerTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/GleSYSErrorHandlerTest.java @@ -50,7 +50,6 @@ public class GleSYSErrorHandlerTest { public void test401MakesAuthorizationException() { assertCodeMakes("GET", URI.create("https://api.glesys.com/foo"), 401, "", "Unauthorized", AuthorizationException.class); - } @Test @@ -60,10 +59,10 @@ public class GleSYSErrorHandlerTest { URI.create("https://api.glesys.com/domain/delete/format/json"), 400, "", - "{\"response\":{\"status\":{\"code\":400,\"timestamp\":\"2012-02-10T12:07:56+01:00\",\"text\":\"Could not find domain on this account.\n\"},\"debug\":{\"input\":{\"domainname\":\"email-test.jclouds.org\"}}}}", + "{\"response\":{\"status\":{\"code\":400,\"timestamp\":\"2012-02-10T12:07:56+01:00\",\"text\":\"Could not find server with this id on this account.\n\"},\"debug\":{\"input\":{\"domainname\":\"email-test.jclouds.org\"}}}}", ResourceNotFoundException.class); } - + @Test public void test404MakesResourceNotFoundException() { assertCodeMakes("GET", URI.create("https://api.glesys.com/foo"), 404, "", "Not Found", diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/GleSYSProviderTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/GleSYSProviderTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/GleSYSProviderTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/GleSYSProviderTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapterExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapterExpectTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapterExpectTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceAdapterExpectTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceLiveTest.java similarity index 91% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceLiveTest.java index 33cd8cc808..70bdfb25f3 100644 --- a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceLiveTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSComputeServiceLiveTest.java @@ -40,6 +40,8 @@ import com.google.inject.Module; public class GleSYSComputeServiceLiveTest extends BaseComputeServiceLiveTest { public GleSYSComputeServiceLiveTest() { provider = "glesys"; + // ensure hyphens work + group = "gle-sys"; } @Override @@ -49,10 +51,10 @@ public class GleSYSComputeServiceLiveTest extends BaseComputeServiceLiveTest { public void testAssignability() throws Exception { @SuppressWarnings("unused") - RestContext tmContext = new ComputeServiceContextFactory() - .createContext(provider, identity, credential).getProviderSpecificContext(); + RestContext tmContext = new ComputeServiceContextFactory().createContext( + provider, identity, credential).getProviderSpecificContext(); } - + // GleSYS does not support metadata @Override protected void checkUserMetadataInNodeEquals(NodeMetadata node, ImmutableMap userMetadata) { diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentExpectTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentExpectTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentExpectTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentLiveTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSExperimentLiveTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/GleSYSTemplateBuilderLiveTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageNameTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageNameTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageNameTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ParseOsFamilyVersion64BitFromImageNameTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerDetailsToNodeMetadataTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerSpecToHardwareTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerSpecToHardwareTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerSpecToHardwareTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/functions/ServerSpecToHardwareTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/internal/BaseGleSYSComputeServiceExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/internal/BaseGleSYSComputeServiceExpectTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/internal/BaseGleSYSComputeServiceExpectTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/internal/BaseGleSYSComputeServiceExpectTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptionsTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptionsTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptionsTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptionsTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientExpectTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientLiveTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/ArchiveClientLiveTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/DomainClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/DomainClientExpectTest.java similarity index 98% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/DomainClientExpectTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/DomainClientExpectTest.java index d5b90e14b0..60a9f448be 100644 --- a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/DomainClientExpectTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/features/DomainClientExpectTest.java @@ -18,12 +18,13 @@ */ package org.jclouds.glesys.features; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSortedSet; -import com.google.common.collect.Iterables; -import com.google.inject.Inject; -import org.apache.log4j.helpers.ISO8601DateFormat; +import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.net.URI; +import java.util.Set; + import org.jclouds.date.DateService; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.glesys.GleSYSClient; @@ -32,18 +33,13 @@ import org.jclouds.glesys.domain.DomainRecord; import org.jclouds.glesys.options.AddDomainOptions; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; -import org.jclouds.json.config.GsonModule; import org.jclouds.rest.BaseRestClientExpectTest; import org.jclouds.rest.ResourceNotFoundException; import org.testng.annotations.Test; -import java.net.URI; -import java.text.SimpleDateFormat; -import java.util.Set; - -import static org.jclouds.io.Payloads.newUrlEncodedFormPayload; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSortedSet; +import com.google.common.collect.Iterables; /** * Tests annotation parsing of {@code DomainAsyncClient} diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/DomainClientLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/DomainClientLiveTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/DomainClientLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/DomainClientLiveTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/EmailClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/EmailClientExpectTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/EmailClientExpectTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/EmailClientExpectTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/EmailClientLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/EmailClientLiveTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/EmailClientLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/EmailClientLiveTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/IpAsyncClientTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/IpAsyncClientTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/IpAsyncClientTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/IpAsyncClientTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/IpClientExpectTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/IpClientLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/IpClientLiveTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/IpClientLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/IpClientLiveTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java similarity index 99% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java index ce0c6acb91..b6e0360991 100644 --- a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientExpectTest.java @@ -146,6 +146,7 @@ public class ServerClientExpectTest extends BaseRestClientExpectTestbuilder() + .put("includestate", "true") .put("serverid", "xm3276891").build())).build(), HttpResponse.builder().statusCode(200).payload(payloadFromResource("/server_details.json")).build()).getServerClient(); @@ -169,6 +170,7 @@ public class ServerClientExpectTest extends BaseRestClientExpectTestbuilder() + .put("includestate", "true") .put("serverid", "xm3276891").build())).build(), HttpResponse.builder().statusCode(404).build()).getServerClient(); diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/features/ServerClientLiveTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSAsyncClientTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSAsyncClientTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSAsyncClientTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSAsyncClientTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSClientLiveTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSClientLiveTest.java similarity index 88% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSClientLiveTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSClientLiveTest.java index 11f6bb9dfb..52ca98a804 100644 --- a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSClientLiveTest.java +++ b/labs/glesys/src/test/java/org/jclouds/glesys/internal/BaseGleSYSClientLiveTest.java @@ -23,6 +23,7 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.util.UUID; import java.util.concurrent.TimeUnit; import org.jclouds.compute.BaseVersionedServiceLiveTest; @@ -62,14 +63,13 @@ public class BaseGleSYSClientLiveTest extends BaseVersionedServiceLiveTest { public BaseGleSYSClientLiveTest() { provider = "glesys"; } - + @BeforeGroups(groups = { "live" }) public void setupClient() { setupCredentials(); - computeContext = new ComputeServiceContextFactory(setupRestProperties()). - createContext(provider, ImmutableSet. of( - new Log4JLoggingModule(), new SshjSshClientModule()), setupProperties()); + computeContext = new ComputeServiceContextFactory(setupRestProperties()).createContext(provider, + ImmutableSet. of(new Log4JLoggingModule(), new SshjSshClientModule()), setupProperties()); context = computeContext.getProviderSpecificContext(); } @@ -85,29 +85,29 @@ public class BaseGleSYSClientLiveTest extends BaseVersionedServiceLiveTest { final DomainClient client = context.getApi().getDomainClient(); int before = client.listDomains().size(); client.addDomain(domain); - RetryablePredicate result = new RetryablePredicate( - new Predicate() { - public boolean apply(Integer value) { - return client.listDomains().size() == value; - } - }, 30, 1, TimeUnit.SECONDS); + RetryablePredicate result = new RetryablePredicate(new Predicate() { + public boolean apply(Integer value) { + return client.listDomains().size() == value; + } + }, 30, 1, TimeUnit.SECONDS); assertTrue(result.apply(before + 1)); } - protected ServerStatusChecker createServer(String hostName) { ServerClient client = context.getApi().getServerClient(); - + ServerDetails testServer = client.createServerWithHostnameAndRootPassword( ServerSpec.builder().datacenter("Falkenberg").platform("OpenVZ").templateName("Ubuntu 10.04 LTS 32-bit") - .diskSizeGB(5).memorySizeMB(512).cpuCores(1).transferGB(50).build(), hostName, "password"); + .diskSizeGB(5).memorySizeMB(512).cpuCores(1).transferGB(50).build(), hostName, UUID.randomUUID() + .toString().replace("-","")); assertNotNull(testServer.getId()); assertEquals(testServer.getHostname(), hostName); assertFalse(testServer.getIps().isEmpty()); - ServerStatusChecker runningServerCounter = new ServerStatusChecker(client, testServer.getId(), 180, 10, TimeUnit.SECONDS); + ServerStatusChecker runningServerCounter = new ServerStatusChecker(client, testServer.getId(), 180, 10, + TimeUnit.SECONDS); assertTrue(runningServerCounter.apply(Server.State.RUNNING)); return runningServerCounter; @@ -115,10 +115,13 @@ public class BaseGleSYSClientLiveTest extends BaseVersionedServiceLiveTest { public static class ServerStatusChecker extends RetryablePredicate { private final String serverId; + public String getServerId() { return serverId; } - public ServerStatusChecker(final ServerClient client, final String serverId, long maxWait, long period, TimeUnit unit) { + + public ServerStatusChecker(final ServerClient client, final String serverId, long maxWait, long period, + TimeUnit unit) { super(new Predicate() { public boolean apply(Server.State value) { diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseFullIpDetailsTest.java diff --git a/sandbox-providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java b/labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java similarity index 100% rename from sandbox-providers/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java rename to labs/glesys/src/test/java/org/jclouds/glesys/parse/ParseIpAddressFromResponseTest.java diff --git a/sandbox-providers/glesys/src/test/resources/archive_allowed_arguments.json b/labs/glesys/src/test/resources/archive_allowed_arguments.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/archive_allowed_arguments.json rename to labs/glesys/src/test/resources/archive_allowed_arguments.json diff --git a/sandbox-providers/glesys/src/test/resources/archive_details.json b/labs/glesys/src/test/resources/archive_details.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/archive_details.json rename to labs/glesys/src/test/resources/archive_details.json diff --git a/sandbox-providers/glesys/src/test/resources/archive_list.json b/labs/glesys/src/test/resources/archive_list.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/archive_list.json rename to labs/glesys/src/test/resources/archive_list.json diff --git a/sandbox-providers/glesys/src/test/resources/domain_list.json b/labs/glesys/src/test/resources/domain_list.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/domain_list.json rename to labs/glesys/src/test/resources/domain_list.json diff --git a/sandbox-providers/glesys/src/test/resources/domain_list_records.json b/labs/glesys/src/test/resources/domain_list_records.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/domain_list_records.json rename to labs/glesys/src/test/resources/domain_list_records.json diff --git a/sandbox-providers/glesys/src/test/resources/email_list.json b/labs/glesys/src/test/resources/email_list.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/email_list.json rename to labs/glesys/src/test/resources/email_list.json diff --git a/sandbox-providers/glesys/src/test/resources/email_overview.json b/labs/glesys/src/test/resources/email_overview.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/email_overview.json rename to labs/glesys/src/test/resources/email_overview.json diff --git a/sandbox-providers/glesys/src/test/resources/ip_get_details.json b/labs/glesys/src/test/resources/ip_get_details.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/ip_get_details.json rename to labs/glesys/src/test/resources/ip_get_details.json diff --git a/sandbox-providers/glesys/src/test/resources/ip_get_details_xen.json b/labs/glesys/src/test/resources/ip_get_details_xen.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/ip_get_details_xen.json rename to labs/glesys/src/test/resources/ip_get_details_xen.json diff --git a/sandbox-providers/glesys/src/test/resources/ip_list_free.json b/labs/glesys/src/test/resources/ip_list_free.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/ip_list_free.json rename to labs/glesys/src/test/resources/ip_list_free.json diff --git a/sandbox-providers/glesys/src/test/resources/ip_release.json b/labs/glesys/src/test/resources/ip_release.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/ip_release.json rename to labs/glesys/src/test/resources/ip_release.json diff --git a/sandbox-providers/glesys/src/test/resources/ip_take.json b/labs/glesys/src/test/resources/ip_take.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/ip_take.json rename to labs/glesys/src/test/resources/ip_take.json diff --git a/sandbox-providers/glesys/src/test/resources/log4j.xml b/labs/glesys/src/test/resources/log4j.xml similarity index 100% rename from sandbox-providers/glesys/src/test/resources/log4j.xml rename to labs/glesys/src/test/resources/log4j.xml diff --git a/sandbox-providers/glesys/src/test/resources/osmatches.json b/labs/glesys/src/test/resources/osmatches.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/osmatches.json rename to labs/glesys/src/test/resources/osmatches.json diff --git a/sandbox-providers/glesys/src/test/resources/server_allowed_arguments.json b/labs/glesys/src/test/resources/server_allowed_arguments.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_allowed_arguments.json rename to labs/glesys/src/test/resources/server_allowed_arguments.json diff --git a/sandbox-providers/glesys/src/test/resources/server_console.json b/labs/glesys/src/test/resources/server_console.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_console.json rename to labs/glesys/src/test/resources/server_console.json diff --git a/sandbox-providers/glesys/src/test/resources/server_created.json b/labs/glesys/src/test/resources/server_created.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_created.json rename to labs/glesys/src/test/resources/server_created.json diff --git a/sandbox-providers/glesys/src/test/resources/server_details.json b/labs/glesys/src/test/resources/server_details.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_details.json rename to labs/glesys/src/test/resources/server_details.json diff --git a/sandbox-providers/glesys/src/test/resources/server_limits.json b/labs/glesys/src/test/resources/server_limits.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_limits.json rename to labs/glesys/src/test/resources/server_limits.json diff --git a/sandbox-providers/glesys/src/test/resources/server_list.json b/labs/glesys/src/test/resources/server_list.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_list.json rename to labs/glesys/src/test/resources/server_list.json diff --git a/sandbox-providers/glesys/src/test/resources/server_noip.json b/labs/glesys/src/test/resources/server_noip.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_noip.json rename to labs/glesys/src/test/resources/server_noip.json diff --git a/sandbox-providers/glesys/src/test/resources/server_status.json b/labs/glesys/src/test/resources/server_status.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_status.json rename to labs/glesys/src/test/resources/server_status.json diff --git a/sandbox-providers/glesys/src/test/resources/server_templates.json b/labs/glesys/src/test/resources/server_templates.json similarity index 100% rename from sandbox-providers/glesys/src/test/resources/server_templates.json rename to labs/glesys/src/test/resources/server_templates.json diff --git a/labs/pom.xml b/labs/pom.xml index 71c2192da4..a42c06844d 100644 --- a/labs/pom.xml +++ b/labs/pom.xml @@ -34,5 +34,6 @@ openstack-nova virtualbox + glesys