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

Merge pull request #1117 from jclouds/no-timeout-annotation 

replaced @Timeout w/explicit properties
This commit is contained in:
Adrian Cole 2012-12-30 13:18:43 -08:00
parent 57fdd34287 13d8b9c402
commit 755094c599
330 changed files with 297 additions and 1804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apis/atmos/src/main/java/org/jclouds/atmos/AtmosApiMetadata.java
View File

@ -18,6 +18,8 @@
*/ */
package org.jclouds.atmos; package org.jclouds.atmos;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX; import static org.jclouds.blobstore.reference.BlobStoreConstants.PROPERTY_USER_METADATA_PREFIX;
import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS; import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
@ -67,6 +69,10 @@ public class AtmosApiMetadata extends BaseRestApiMetadata {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_REGIONS, "DEFAULT"); properties.setProperty(PROPERTY_REGIONS, "DEFAULT");
properties.setProperty(PROPERTY_USER_METADATA_PREFIX, "X-Object-Meta-"); properties.setProperty(PROPERTY_USER_METADATA_PREFIX, "X-Object-Meta-");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", MINUTES.toMillis(5) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "AtmosClient.createFile", MINUTES.toMillis(10) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "AtmosClient.updateFile", MINUTES.toMillis(10) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "AtmosClient.readFile", MINUTES.toMillis(10) + "");
return properties; return properties;
} }

7
apis/atmos/src/main/java/org/jclouds/atmos/AtmosClient.java
View File

@ -19,8 +19,6 @@
package org.jclouds.atmos; package org.jclouds.atmos;
import java.net.URI; import java.net.URI;
import java.util.concurrent.TimeUnit;
import org.jclouds.atmos.domain.AtmosObject; import org.jclouds.atmos.domain.AtmosObject;
import org.jclouds.atmos.domain.BoundedSet; import org.jclouds.atmos.domain.BoundedSet;
import org.jclouds.atmos.domain.DirectoryEntry; import org.jclouds.atmos.domain.DirectoryEntry;
@ -28,7 +26,6 @@ import org.jclouds.atmos.domain.SystemMetadata;
import org.jclouds.atmos.domain.UserMetadata; import org.jclouds.atmos.domain.UserMetadata;
import org.jclouds.atmos.options.ListOptions; import org.jclouds.atmos.options.ListOptions;
import org.jclouds.atmos.options.PutOptions; import org.jclouds.atmos.options.PutOptions;
import org.jclouds.concurrent.Timeout;
import org.jclouds.http.options.GetOptions; import org.jclouds.http.options.GetOptions;
import com.google.inject.Provides; import com.google.inject.Provides;
@ -41,7 +38,6 @@ import com.google.inject.Provides;
* @see <a href="https://community.emc.com/community/labs/atmos_online" /> * @see <a href="https://community.emc.com/community/labs/atmos_online" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
public interface AtmosClient { public interface AtmosClient {
/** /**
* Creates a default implementation of AtmosObject * Creates a default implementation of AtmosObject
@ -55,13 +51,10 @@ public interface AtmosClient {
URI createDirectory(String directoryName, PutOptions... options); URI createDirectory(String directoryName, PutOptions... options);
@Timeout(duration = 10, timeUnit = TimeUnit.MINUTES)
URI createFile(String parent, AtmosObject object, PutOptions... options); URI createFile(String parent, AtmosObject object, PutOptions... options);
@Timeout(duration = 10, timeUnit = TimeUnit.MINUTES)
void updateFile(String parent, AtmosObject object, PutOptions... options); void updateFile(String parent, AtmosObject object, PutOptions... options);
@Timeout(duration = 10, timeUnit = TimeUnit.MINUTES)
AtmosObject readFile(String path, GetOptions... options); AtmosObject readFile(String path, GetOptions... options);
AtmosObject headFile(String path); AtmosObject headFile(String path);

4
apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesApiMetadata.java
View File

@ -18,6 +18,9 @@
*/ */
package org.jclouds.cloudfiles; package org.jclouds.cloudfiles;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import java.net.URI; import java.net.URI;
import java.util.Properties; import java.util.Properties;
@ -65,6 +68,7 @@ public class CloudFilesApiMetadata extends SwiftApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = SwiftApiMetadata.defaultProperties(); Properties properties = SwiftApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "OpenStackAuthClient.authenticate", SECONDS.toMillis(30) + "");
return properties; return properties;
} }

6
apis/cloudfiles/src/main/java/org/jclouds/cloudfiles/CloudFilesClient.java
View File

@ -20,11 +20,8 @@ package org.jclouds.cloudfiles;
import java.net.URI; import java.net.URI;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudfiles.domain.ContainerCDNMetadata; import org.jclouds.cloudfiles.domain.ContainerCDNMetadata;
import org.jclouds.cloudfiles.options.ListCdnContainerOptions; import org.jclouds.cloudfiles.options.ListCdnContainerOptions;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.swift.CommonSwiftClient; import org.jclouds.openstack.swift.CommonSwiftClient;
/** /**
@ -36,7 +33,6 @@ import org.jclouds.openstack.swift.CommonSwiftClient;
* @author Adrian Cole * @author Adrian Cole
* @see <a href="http://www.rackspacecloud.com/cf-devguide-20090812.pdf" /> * @see <a href="http://www.rackspacecloud.com/cf-devguide-20090812.pdf" />
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
public interface CloudFilesClient extends CommonSwiftClient { public interface CloudFilesClient extends CommonSwiftClient {
/** /**
@ -99,7 +95,7 @@ public interface CloudFilesClient extends CommonSwiftClient {
*/ */
boolean setCDNStaticWebsiteIndex(String container, String index); boolean setCDNStaticWebsiteIndex(String container, String index);
/* /**
* http://docs.rackspace.com/files/api/v1/cf-devguide/content/Set_Error_Pages_for_Static_Website-dle4005.html * http://docs.rackspace.com/files/api/v1/cf-devguide/content/Set_Error_Pages_for_Static_Website-dle4005.html
*/ */
boolean setCDNStaticWebsiteError(String container, String error); boolean setCDNStaticWebsiteError(String container, String error);

6
apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersApiMetadata.java
View File

@ -18,6 +18,10 @@
*/ */
package org.jclouds.cloudservers; package org.jclouds.cloudservers;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import java.net.URI; import java.net.URI;
import java.util.Properties; import java.util.Properties;
@ -57,6 +61,8 @@ public class CloudServersApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", MINUTES.toMillis(1) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "OpenStackAuthClient.authenticate", SECONDS.toMillis(30) + "");
return properties; return properties;
} }

4
apis/cloudservers/src/main/java/org/jclouds/cloudservers/CloudServersClient.java
View File

@ -19,8 +19,6 @@
package org.jclouds.cloudservers; package org.jclouds.cloudservers;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import org.jclouds.cloudservers.domain.Addresses; import org.jclouds.cloudservers.domain.Addresses;
@ -35,7 +33,6 @@ import org.jclouds.cloudservers.options.CreateServerOptions;
import org.jclouds.cloudservers.options.CreateSharedIpGroupOptions; import org.jclouds.cloudservers.options.CreateSharedIpGroupOptions;
import org.jclouds.cloudservers.options.ListOptions; import org.jclouds.cloudservers.options.ListOptions;
import org.jclouds.cloudservers.options.RebuildServerOptions; import org.jclouds.cloudservers.options.RebuildServerOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides access to Cloud Servers via their REST API. * Provides access to Cloud Servers via their REST API.
@ -47,7 +44,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://docs.rackspacecloud.com/servers/api/cs-devguide-latest.pdf" /> * @see <a href="http://docs.rackspacecloud.com/servers/api/cs-devguide-latest.pdf" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface CloudServersClient { public interface CloudServersClient {
/** /**
* All accounts, by default, have a preconfigured set of thresholds (or limits) to manage * All accounts, by default, have a preconfigured set of thresholds (or limits) to manage

4
apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaApiMetadata.java
View File

@ -18,6 +18,8 @@
*/ */
package org.jclouds.cloudsigma; package org.jclouds.cloudsigma;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import static org.jclouds.cloudsigma.reference.CloudSigmaConstants.PROPERTY_VNC_PASSWORD; import static org.jclouds.cloudsigma.reference.CloudSigmaConstants.PROPERTY_VNC_PASSWORD;
import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE; import static org.jclouds.compute.config.ComputeServiceProperties.TEMPLATE;
@ -60,6 +62,8 @@ public class CloudSigmaApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", MINUTES.toMillis(1) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "CloudSigmaClient.cloneDrive", MINUTES.toMillis(5) + "");
properties.setProperty(PROPERTY_VNC_PASSWORD, "IL9vs34d"); properties.setProperty(PROPERTY_VNC_PASSWORD, "IL9vs34d");
// passwords are set post-boot, so auth failures are possible // passwords are set post-boot, so auth failures are possible
// from a race condition applying the password set script // from a race condition applying the password set script

5
apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaClient.java
View File

@ -19,8 +19,6 @@
package org.jclouds.cloudsigma; package org.jclouds.cloudsigma;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudsigma.domain.Drive; import org.jclouds.cloudsigma.domain.Drive;
import org.jclouds.cloudsigma.domain.DriveData; import org.jclouds.cloudsigma.domain.DriveData;
import org.jclouds.cloudsigma.domain.DriveInfo; import org.jclouds.cloudsigma.domain.DriveInfo;
@ -30,7 +28,6 @@ import org.jclouds.cloudsigma.domain.ServerInfo;
import org.jclouds.cloudsigma.domain.StaticIPInfo; import org.jclouds.cloudsigma.domain.StaticIPInfo;
import org.jclouds.cloudsigma.domain.VLANInfo; import org.jclouds.cloudsigma.domain.VLANInfo;
import org.jclouds.cloudsigma.options.CloneDriveOptions; import org.jclouds.cloudsigma.options.CloneDriveOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudSigma. * Provides synchronous access to CloudSigma.
@ -40,7 +37,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="TODO: insert URL of cloudsigma documentation" /> * @see <a href="TODO: insert URL of cloudsigma documentation" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface CloudSigmaClient { public interface CloudSigmaClient {
/** /**
@ -219,7 +215,6 @@ public interface CloudSigmaClient {
* options to control size * options to control size
* @return new drive * @return new drive
*/ */
@Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
DriveInfo cloneDrive(String sourceUuid, String newName, CloneDriveOptions... options); DriveInfo cloneDrive(String sourceUuid, String newName, CloneDriveOptions... options);
/** /**

6
apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackApiMetadata.java
View File

@ -18,6 +18,9 @@
*/ */
package org.jclouds.cloudstack; package org.jclouds.cloudstack;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import java.net.URI; import java.net.URI;
import java.util.Properties; import java.util.Properties;
@ -69,6 +72,9 @@ public class CloudStackApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", MINUTES.toMillis(1) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "AddressClient.disassociateIPAddress", MINUTES.toMillis(2) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "NATClient.enableStaticNATForVirtualMachine", MINUTES.toMillis(2) + "");
properties.setProperty("jclouds.ssh.max-retries", "7"); properties.setProperty("jclouds.ssh.max-retries", "7");
properties.setProperty("jclouds.ssh.retry-auth", "true"); properties.setProperty("jclouds.ssh.retry-auth", "true");
return properties; return properties;

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackClient.java
View File

@ -18,8 +18,6 @@
*/ */
package org.jclouds.cloudstack; package org.jclouds.cloudstack;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.features.AccountClient; import org.jclouds.cloudstack.features.AccountClient;
import org.jclouds.cloudstack.features.AddressClient; import org.jclouds.cloudstack.features.AddressClient;
import org.jclouds.cloudstack.features.AsyncJobClient; import org.jclouds.cloudstack.features.AsyncJobClient;
@ -43,7 +41,6 @@ import org.jclouds.cloudstack.features.VMGroupClient;
import org.jclouds.cloudstack.features.VirtualMachineClient; import org.jclouds.cloudstack.features.VirtualMachineClient;
import org.jclouds.cloudstack.features.VolumeClient; import org.jclouds.cloudstack.features.VolumeClient;
import org.jclouds.cloudstack.features.ZoneClient; import org.jclouds.cloudstack.features.ZoneClient;
import org.jclouds.concurrent.Timeout;
import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.Delegate;
/** /**
@ -54,7 +51,6 @@ import org.jclouds.rest.annotations.Delegate;
* @see CloudStackAsyncClient * @see CloudStackAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface CloudStackClient { public interface CloudStackClient {
/** /**
* Provides synchronous access to Zone features. * Provides synchronous access to Zone features.

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackDomainClient.java
View File

@ -18,13 +18,10 @@
*/ */
package org.jclouds.cloudstack; package org.jclouds.cloudstack;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.features.DomainAccountClient; import org.jclouds.cloudstack.features.DomainAccountClient;
import org.jclouds.cloudstack.features.DomainDomainClient; import org.jclouds.cloudstack.features.DomainDomainClient;
import org.jclouds.cloudstack.features.DomainLimitClient; import org.jclouds.cloudstack.features.DomainLimitClient;
import org.jclouds.cloudstack.features.DomainUserClient; import org.jclouds.cloudstack.features.DomainUserClient;
import org.jclouds.concurrent.Timeout;
import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.Delegate;
/** /**
@ -37,7 +34,6 @@ import org.jclouds.rest.annotations.Delegate;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface CloudStackDomainClient extends CloudStackClient { public interface CloudStackDomainClient extends CloudStackClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/CloudStackGlobalClient.java
View File

@ -18,8 +18,6 @@
*/ */
package org.jclouds.cloudstack; package org.jclouds.cloudstack;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.features.GlobalAccountClient; import org.jclouds.cloudstack.features.GlobalAccountClient;
import org.jclouds.cloudstack.features.GlobalAlertClient; import org.jclouds.cloudstack.features.GlobalAlertClient;
import org.jclouds.cloudstack.features.GlobalCapacityClient; import org.jclouds.cloudstack.features.GlobalCapacityClient;
@ -33,7 +31,6 @@ import org.jclouds.cloudstack.features.GlobalUsageClient;
import org.jclouds.cloudstack.features.GlobalUserClient; import org.jclouds.cloudstack.features.GlobalUserClient;
import org.jclouds.cloudstack.features.GlobalVlanClient; import org.jclouds.cloudstack.features.GlobalVlanClient;
import org.jclouds.cloudstack.features.GlobalZoneClient; import org.jclouds.cloudstack.features.GlobalZoneClient;
import org.jclouds.concurrent.Timeout;
import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.Delegate;
/** /**
@ -46,7 +43,6 @@ import org.jclouds.rest.annotations.Delegate;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface CloudStackGlobalClient extends CloudStackDomainClient { public interface CloudStackGlobalClient extends CloudStackDomainClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AccountClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Account; import org.jclouds.cloudstack.domain.Account;
import org.jclouds.cloudstack.options.ListAccountsOptions; import org.jclouds.cloudstack.options.ListAccountsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Account features. * Provides synchronous access to CloudStack Account features.
@ -32,7 +29,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
public interface AccountClient { public interface AccountClient {
/** /**
* Lists Accounts * Lists Accounts

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AddressClient.java
View File

@ -19,13 +19,10 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.PublicIPAddress; import org.jclouds.cloudstack.domain.PublicIPAddress;
import org.jclouds.cloudstack.options.AssociateIPAddressOptions; import org.jclouds.cloudstack.options.AssociateIPAddressOptions;
import org.jclouds.cloudstack.options.ListPublicIPAddressesOptions; import org.jclouds.cloudstack.options.ListPublicIPAddressesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack IPAddress features. * Provides synchronous access to CloudStack IPAddress features.
@ -35,7 +32,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface AddressClient { public interface AddressClient {
/** /**
* Lists IPAddresses * Lists IPAddresses
@ -72,6 +68,5 @@ public interface AddressClient {
* @param id * @param id
* the id of the public ip address to disassociate * the id of the public ip address to disassociate
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
void disassociateIPAddress(String id); void disassociateIPAddress(String id);
} }

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/AsyncJobClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncJob; import org.jclouds.cloudstack.domain.AsyncJob;
import org.jclouds.cloudstack.options.ListAsyncJobsOptions; import org.jclouds.cloudstack.options.ListAsyncJobsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack asyncJob features. * Provides synchronous access to CloudStack asyncJob features.
@ -33,7 +30,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface AsyncJobClient { public interface AsyncJobClient {
/** /**
* Lists asyncJobs * Lists asyncJobs

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ConfigurationClient.java
View File

@ -18,10 +18,7 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Capabilities; import org.jclouds.cloudstack.domain.Capabilities;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Configuration features. * Provides synchronous access to CloudStack Configuration features.
@ -31,7 +28,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface ConfigurationClient { public interface ConfigurationClient {
/** /**
* Lists capabilities * Lists capabilities

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainAccountClient.java
View File

@ -18,11 +18,8 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Account; import org.jclouds.cloudstack.domain.Account;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Account features available to Domain * Provides synchronous access to CloudStack Account features available to Domain
@ -33,7 +30,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface DomainAccountClient extends AccountClient { public interface DomainAccountClient extends AccountClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainDomainClient.java
View File

@ -19,12 +19,9 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Domain; import org.jclouds.cloudstack.domain.Domain;
import org.jclouds.cloudstack.options.ListDomainChildrenOptions; import org.jclouds.cloudstack.options.ListDomainChildrenOptions;
import org.jclouds.cloudstack.options.ListDomainsOptions; import org.jclouds.cloudstack.options.ListDomainsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Domain features available to Domain * Provides synchronous access to CloudStack Domain features available to Domain
@ -35,7 +32,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface DomainDomainClient { public interface DomainDomainClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainLimitClient.java
View File

@ -18,10 +18,7 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.ResourceLimit; import org.jclouds.cloudstack.domain.ResourceLimit;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Limit features available to Domain * Provides synchronous access to CloudStack Limit features available to Domain
@ -32,7 +29,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface DomainLimitClient extends LimitClient { public interface DomainLimitClient extends LimitClient {
/** /**
* Updates resource limits for an account in a domain. * Updates resource limits for an account in a domain.

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/DomainUserClient.java
View File

@ -19,12 +19,9 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.User; import org.jclouds.cloudstack.domain.User;
import org.jclouds.cloudstack.options.ListUsersOptions; import org.jclouds.cloudstack.options.ListUsersOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack User features available to Domain * Provides synchronous access to CloudStack User features available to Domain
@ -35,7 +32,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Domain_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface DomainUserClient { public interface DomainUserClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/EventClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Event; import org.jclouds.cloudstack.domain.Event;
import org.jclouds.cloudstack.options.ListEventsOptions; import org.jclouds.cloudstack.options.ListEventsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Event features. * Provides synchronous access to CloudStack Event features.
@ -32,7 +29,6 @@ import org.jclouds.concurrent.Timeout;
* @author Vijay Kiran * @author Vijay Kiran
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface EventClient { public interface EventClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/FirewallClient.java
View File

@ -19,15 +19,12 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.FirewallRule; import org.jclouds.cloudstack.domain.FirewallRule;
import org.jclouds.cloudstack.domain.PortForwardingRule; import org.jclouds.cloudstack.domain.PortForwardingRule;
import org.jclouds.cloudstack.options.CreateFirewallRuleOptions; import org.jclouds.cloudstack.options.CreateFirewallRuleOptions;
import org.jclouds.cloudstack.options.ListFirewallRulesOptions; import org.jclouds.cloudstack.options.ListFirewallRulesOptions;
import org.jclouds.cloudstack.options.ListPortForwardingRulesOptions; import org.jclouds.cloudstack.options.ListPortForwardingRulesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack PortForwardingRule features. * Provides synchronous access to CloudStack PortForwardingRule features.
@ -37,7 +34,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface FirewallClient { public interface FirewallClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAccountClient.java
View File

@ -18,12 +18,9 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Account; import org.jclouds.cloudstack.domain.Account;
import org.jclouds.cloudstack.options.CreateAccountOptions; import org.jclouds.cloudstack.options.CreateAccountOptions;
import org.jclouds.cloudstack.options.UpdateAccountOptions; import org.jclouds.cloudstack.options.UpdateAccountOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Account features available to Global * Provides synchronous access to CloudStack Account features available to Global
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalAccountClient extends DomainAccountClient { public interface GlobalAccountClient extends DomainAccountClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalAlertClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Alert; import org.jclouds.cloudstack.domain.Alert;
import org.jclouds.cloudstack.options.ListAlertsOptions; import org.jclouds.cloudstack.options.ListAlertsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Alerts features available to Global * Provides synchronous access to CloudStack Alerts features available to Global
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalAlertClient { public interface GlobalAlertClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalCapacityClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Capacity; import org.jclouds.cloudstack.domain.Capacity;
import org.jclouds.cloudstack.options.ListCapacityOptions; import org.jclouds.cloudstack.options.ListCapacityOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Capacities features available to Global * Provides synchronous access to CloudStack Capacities features available to Global
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalCapacityClient { public interface GlobalCapacityClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalConfigurationClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.ConfigurationEntry; import org.jclouds.cloudstack.domain.ConfigurationEntry;
import org.jclouds.cloudstack.options.ListConfigurationEntriesOptions; import org.jclouds.cloudstack.options.ListConfigurationEntriesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Configuration features available to Global * Provides synchronous access to CloudStack Configuration features available to Global
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalConfigurationClient extends ConfigurationClient { public interface GlobalConfigurationClient extends ConfigurationClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalDomainClient.java
View File

@ -18,12 +18,9 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Domain; import org.jclouds.cloudstack.domain.Domain;
import org.jclouds.cloudstack.options.CreateDomainOptions; import org.jclouds.cloudstack.options.CreateDomainOptions;
import org.jclouds.cloudstack.options.UpdateDomainOptions; import org.jclouds.cloudstack.options.UpdateDomainOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Domain features available to Global * Provides synchronous access to CloudStack Domain features available to Global
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalDomainClient extends DomainDomainClient { public interface GlobalDomainClient extends DomainDomainClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalHostClient.java
View File

@ -19,8 +19,6 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Cluster; import org.jclouds.cloudstack.domain.Cluster;
import org.jclouds.cloudstack.domain.Host; import org.jclouds.cloudstack.domain.Host;
import org.jclouds.cloudstack.options.AddClusterOptions; import org.jclouds.cloudstack.options.AddClusterOptions;
@ -31,7 +29,6 @@ import org.jclouds.cloudstack.options.ListClustersOptions;
import org.jclouds.cloudstack.options.ListHostsOptions; import org.jclouds.cloudstack.options.ListHostsOptions;
import org.jclouds.cloudstack.options.UpdateClusterOptions; import org.jclouds.cloudstack.options.UpdateClusterOptions;
import org.jclouds.cloudstack.options.UpdateHostOptions; import org.jclouds.cloudstack.options.UpdateHostOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack host features. * Provides synchronous access to CloudStack host features.
@ -41,7 +38,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Andrei Savu * @author Andrei Savu
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalHostClient { public interface GlobalHostClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalOfferingClient.java
View File

@ -18,8 +18,6 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.DiskOffering; import org.jclouds.cloudstack.domain.DiskOffering;
import org.jclouds.cloudstack.domain.NetworkOffering; import org.jclouds.cloudstack.domain.NetworkOffering;
import org.jclouds.cloudstack.domain.ServiceOffering; import org.jclouds.cloudstack.domain.ServiceOffering;
@ -28,7 +26,6 @@ import org.jclouds.cloudstack.options.CreateServiceOfferingOptions;
import org.jclouds.cloudstack.options.UpdateDiskOfferingOptions; import org.jclouds.cloudstack.options.UpdateDiskOfferingOptions;
import org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions; import org.jclouds.cloudstack.options.UpdateNetworkOfferingOptions;
import org.jclouds.cloudstack.options.UpdateServiceOfferingOptions; import org.jclouds.cloudstack.options.UpdateServiceOfferingOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack zone features. * Provides synchronous access to CloudStack zone features.
@ -38,7 +35,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Andrei Savu * @author Andrei Savu
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalOfferingClient extends OfferingClient { public interface GlobalOfferingClient extends OfferingClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalPodClient.java
View File

@ -19,13 +19,10 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Pod; import org.jclouds.cloudstack.domain.Pod;
import org.jclouds.cloudstack.options.CreatePodOptions; import org.jclouds.cloudstack.options.CreatePodOptions;
import org.jclouds.cloudstack.options.ListPodsOptions; import org.jclouds.cloudstack.options.ListPodsOptions;
import org.jclouds.cloudstack.options.UpdatePodOptions; import org.jclouds.cloudstack.options.UpdatePodOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Pod features available to Global * Provides synchronous access to CloudStack Pod features available to Global
@ -36,7 +33,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalPodClient { public interface GlobalPodClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalStoragePoolClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.StoragePool; import org.jclouds.cloudstack.domain.StoragePool;
import org.jclouds.cloudstack.options.ListStoragePoolsOptions; import org.jclouds.cloudstack.options.ListStoragePoolsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack storage pool features. * Provides synchronous access to CloudStack storage pool features.
@ -33,7 +30,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer * @author Richard Downer
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalStoragePoolClient { public interface GlobalStoragePoolClient {
Set<StoragePool> listStoragePools(ListStoragePoolsOptions... options); Set<StoragePool> listStoragePools(ListStoragePoolsOptions... options);

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUsageClient.java
View File

@ -20,13 +20,10 @@ package org.jclouds.cloudstack.features;
import java.util.Date; import java.util.Date;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.JobResult; import org.jclouds.cloudstack.domain.JobResult;
import org.jclouds.cloudstack.domain.UsageRecord; import org.jclouds.cloudstack.domain.UsageRecord;
import org.jclouds.cloudstack.options.GenerateUsageRecordsOptions; import org.jclouds.cloudstack.options.GenerateUsageRecordsOptions;
import org.jclouds.cloudstack.options.ListUsageRecordsOptions; import org.jclouds.cloudstack.options.ListUsageRecordsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack usage features. * Provides synchronous access to CloudStack usage features.
@ -36,7 +33,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer * @author Richard Downer
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalUsageClient { public interface GlobalUsageClient {
JobResult generateUsageRecords(Date start, Date end, GenerateUsageRecordsOptions... options); JobResult generateUsageRecords(Date start, Date end, GenerateUsageRecordsOptions... options);

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalUserClient.java
View File

@ -18,13 +18,10 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.ApiKeyPair; import org.jclouds.cloudstack.domain.ApiKeyPair;
import org.jclouds.cloudstack.domain.User; import org.jclouds.cloudstack.domain.User;
import org.jclouds.cloudstack.options.CreateUserOptions; import org.jclouds.cloudstack.options.CreateUserOptions;
import org.jclouds.cloudstack.options.UpdateUserOptions; import org.jclouds.cloudstack.options.UpdateUserOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack User features available to Global * Provides synchronous access to CloudStack User features available to Global
@ -35,7 +32,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalUserClient extends DomainUserClient { public interface GlobalUserClient extends DomainUserClient {

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalVlanClient.java
View File

@ -19,12 +19,9 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.VlanIPRange; import org.jclouds.cloudstack.domain.VlanIPRange;
import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions; import org.jclouds.cloudstack.options.CreateVlanIPRangeOptions;
import org.jclouds.cloudstack.options.ListVlanIPRangesOptions; import org.jclouds.cloudstack.options.ListVlanIPRangesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack VLAN features. * Provides synchronous access to CloudStack VLAN features.
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" />
* @author Richard Downer * @author Richard Downer
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalVlanClient { public interface GlobalVlanClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GlobalZoneClient.java
View File

@ -18,13 +18,10 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.NetworkType; import org.jclouds.cloudstack.domain.NetworkType;
import org.jclouds.cloudstack.domain.Zone; import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.options.CreateZoneOptions; import org.jclouds.cloudstack.options.CreateZoneOptions;
import org.jclouds.cloudstack.options.UpdateZoneOptions; import org.jclouds.cloudstack.options.UpdateZoneOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Zone features available to Global * Provides synchronous access to CloudStack Zone features available to Global
@ -35,7 +32,6 @@ import org.jclouds.concurrent.Timeout;
* "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html" * "http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_Global_Admin.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GlobalZoneClient extends ZoneClient { public interface GlobalZoneClient extends ZoneClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/GuestOSClient.java
View File

@ -20,11 +20,8 @@ package org.jclouds.cloudstack.features;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.OSType; import org.jclouds.cloudstack.domain.OSType;
import org.jclouds.cloudstack.options.ListOSTypesOptions; import org.jclouds.cloudstack.options.ListOSTypesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Operating System features. * Provides synchronous access to CloudStack Operating System features.
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface GuestOSClient { public interface GuestOSClient {
/** /**
* Lists all supported OS types for this cloud. * Lists all supported OS types for this cloud.

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/HypervisorClient.java
View File

@ -19,10 +19,6 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Operating System features. * Provides synchronous access to CloudStack Operating System features.
* <p/> * <p/>
@ -31,7 +27,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface HypervisorClient { public interface HypervisorClient {
/** /**
* Lists all supported hypervisors for this cloud. * Lists all supported hypervisors for this cloud.

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ISOClient.java
View File

@ -19,8 +19,6 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.ExtractMode; import org.jclouds.cloudstack.domain.ExtractMode;
import org.jclouds.cloudstack.domain.ISO; import org.jclouds.cloudstack.domain.ISO;
@ -32,7 +30,6 @@ import org.jclouds.cloudstack.options.ListISOsOptions;
import org.jclouds.cloudstack.options.RegisterISOOptions; import org.jclouds.cloudstack.options.RegisterISOOptions;
import org.jclouds.cloudstack.options.UpdateISOOptions; import org.jclouds.cloudstack.options.UpdateISOOptions;
import org.jclouds.cloudstack.options.UpdateISOPermissionsOptions; import org.jclouds.cloudstack.options.UpdateISOPermissionsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* *
@ -42,7 +39,6 @@ import org.jclouds.concurrent.Timeout;
* @see http://download.cloud.com/releases/2.2.12/api/TOC_User.html * @see http://download.cloud.com/releases/2.2.12/api/TOC_User.html
* @author Richard Downer * @author Richard Downer
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface ISOClient { public interface ISOClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LimitClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.ResourceLimit; import org.jclouds.cloudstack.domain.ResourceLimit;
import org.jclouds.cloudstack.options.ListResourceLimitsOptions; import org.jclouds.cloudstack.options.ListResourceLimitsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack resource limit API. * Provides synchronous access to CloudStack resource limit API.
@ -33,7 +30,6 @@ import org.jclouds.concurrent.Timeout;
* href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" * href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface LimitClient { public interface LimitClient {
/** /**
* List the resource limits. * List the resource limits.

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/LoadBalancerClient.java
View File

@ -19,15 +19,12 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.LoadBalancerRule; import org.jclouds.cloudstack.domain.LoadBalancerRule;
import org.jclouds.cloudstack.domain.VirtualMachine; import org.jclouds.cloudstack.domain.VirtualMachine;
import org.jclouds.cloudstack.domain.LoadBalancerRule.Algorithm; import org.jclouds.cloudstack.domain.LoadBalancerRule.Algorithm;
import org.jclouds.cloudstack.options.CreateLoadBalancerRuleOptions; import org.jclouds.cloudstack.options.CreateLoadBalancerRuleOptions;
import org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions; import org.jclouds.cloudstack.options.ListLoadBalancerRulesOptions;
import org.jclouds.cloudstack.options.UpdateLoadBalancerRuleOptions; import org.jclouds.cloudstack.options.UpdateLoadBalancerRuleOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack LoadBalancer features. * Provides synchronous access to CloudStack LoadBalancer features.
@ -37,7 +34,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface LoadBalancerClient { public interface LoadBalancerClient {
/** /**
* List the load balancer rules * List the load balancer rules

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NATClient.java
View File

@ -19,13 +19,10 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.IPForwardingRule; import org.jclouds.cloudstack.domain.IPForwardingRule;
import org.jclouds.cloudstack.options.CreateIPForwardingRuleOptions; import org.jclouds.cloudstack.options.CreateIPForwardingRuleOptions;
import org.jclouds.cloudstack.options.ListIPForwardingRulesOptions; import org.jclouds.cloudstack.options.ListIPForwardingRulesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack IPForwardingRule features. * Provides synchronous access to CloudStack IPForwardingRule features.
@ -37,7 +34,6 @@ import org.jclouds.concurrent.Timeout;
* /> * />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface NATClient { public interface NATClient {
/** /**
* List the ip forwarding rules * List the ip forwarding rules
@ -99,7 +95,6 @@ public interface NATClient {
*/ */
String deleteIPForwardingRule(String id); String deleteIPForwardingRule(String id);
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
void enableStaticNATForVirtualMachine(String virtualMachineId, String IPAddressId); void enableStaticNATForVirtualMachine(String virtualMachineId, String IPAddressId);
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/NetworkClient.java
View File

@ -19,12 +19,9 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.Network;
import org.jclouds.cloudstack.options.CreateNetworkOptions; import org.jclouds.cloudstack.options.CreateNetworkOptions;
import org.jclouds.cloudstack.options.ListNetworksOptions; import org.jclouds.cloudstack.options.ListNetworksOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack network features. * Provides synchronous access to CloudStack network features.
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface NetworkClient { public interface NetworkClient {
/** /**
* Lists networks * Lists networks

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/OfferingClient.java
View File

@ -19,15 +19,12 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.DiskOffering; import org.jclouds.cloudstack.domain.DiskOffering;
import org.jclouds.cloudstack.domain.NetworkOffering; import org.jclouds.cloudstack.domain.NetworkOffering;
import org.jclouds.cloudstack.domain.ServiceOffering; import org.jclouds.cloudstack.domain.ServiceOffering;
import org.jclouds.cloudstack.options.ListDiskOfferingsOptions; import org.jclouds.cloudstack.options.ListDiskOfferingsOptions;
import org.jclouds.cloudstack.options.ListNetworkOfferingsOptions; import org.jclouds.cloudstack.options.ListNetworkOfferingsOptions;
import org.jclouds.cloudstack.options.ListServiceOfferingsOptions; import org.jclouds.cloudstack.options.ListServiceOfferingsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack zone features. * Provides synchronous access to CloudStack zone features.
@ -37,7 +34,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface OfferingClient { public interface OfferingClient {
/** /**
* Lists service offerings * Lists service offerings

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SSHKeyPairClient.java
View File

@ -20,11 +20,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.SshKeyPair; import org.jclouds.cloudstack.domain.SshKeyPair;
import org.jclouds.cloudstack.options.ListSSHKeyPairsOptions; import org.jclouds.cloudstack.options.ListSSHKeyPairsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack SSHKeyPair features. * Provides synchronous access to CloudStack SSHKeyPair features.
@ -34,7 +31,6 @@ import org.jclouds.concurrent.Timeout;
* href="http://download.cloud.com/releases/2.2.0/api_2.2.8/TOC_User.html" * href="http://download.cloud.com/releases/2.2.0/api_2.2.8/TOC_User.html"
* /> * />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface SSHKeyPairClient { public interface SSHKeyPairClient {
/** /**
* Returns a list of {@link SshKeyPair}s registered by current user. * Returns a list of {@link SshKeyPair}s registered by current user.

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SecurityGroupClient.java
View File

@ -19,12 +19,9 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.SecurityGroup; import org.jclouds.cloudstack.domain.SecurityGroup;
import org.jclouds.cloudstack.options.AccountInDomainOptions; import org.jclouds.cloudstack.options.AccountInDomainOptions;
import org.jclouds.cloudstack.options.ListSecurityGroupsOptions; import org.jclouds.cloudstack.options.ListSecurityGroupsOptions;
import org.jclouds.concurrent.Timeout;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
@ -36,7 +33,6 @@ import com.google.common.collect.Multimap;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface SecurityGroupClient { public interface SecurityGroupClient {
/** /**
* Lists security groups * Lists security groups

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SessionClient.java
View File

@ -18,10 +18,7 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.LoginResponse; import org.jclouds.cloudstack.domain.LoginResponse;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Sessions * Provides synchronous access to CloudStack Sessions
@ -30,7 +27,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Andrei Savu * @author Andrei Savu
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
public interface SessionClient { public interface SessionClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/SnapshotClient.java
View File

@ -19,8 +19,6 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.Snapshot; import org.jclouds.cloudstack.domain.Snapshot;
import org.jclouds.cloudstack.domain.SnapshotPolicy; import org.jclouds.cloudstack.domain.SnapshotPolicy;
@ -28,7 +26,6 @@ import org.jclouds.cloudstack.domain.SnapshotPolicySchedule;
import org.jclouds.cloudstack.options.CreateSnapshotOptions; import org.jclouds.cloudstack.options.CreateSnapshotOptions;
import org.jclouds.cloudstack.options.ListSnapshotPoliciesOptions; import org.jclouds.cloudstack.options.ListSnapshotPoliciesOptions;
import org.jclouds.cloudstack.options.ListSnapshotsOptions; import org.jclouds.cloudstack.options.ListSnapshotsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Snapshot features. * Provides synchronous access to CloudStack Snapshot features.
@ -38,7 +35,6 @@ import org.jclouds.concurrent.Timeout;
* @see http://download.cloud.com/releases/2.2.0/api/TOC_User.html * @see http://download.cloud.com/releases/2.2.0/api/TOC_User.html
* @author Richard Downer * @author Richard Downer
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface SnapshotClient { public interface SnapshotClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/TemplateClient.java
View File

@ -19,8 +19,6 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.ExtractMode; import org.jclouds.cloudstack.domain.ExtractMode;
import org.jclouds.cloudstack.domain.Template; import org.jclouds.cloudstack.domain.Template;
@ -34,7 +32,6 @@ import org.jclouds.cloudstack.options.ListTemplatesOptions;
import org.jclouds.cloudstack.options.RegisterTemplateOptions; import org.jclouds.cloudstack.options.RegisterTemplateOptions;
import org.jclouds.cloudstack.options.UpdateTemplateOptions; import org.jclouds.cloudstack.options.UpdateTemplateOptions;
import org.jclouds.cloudstack.options.UpdateTemplatePermissionsOptions; import org.jclouds.cloudstack.options.UpdateTemplatePermissionsOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack template features. * Provides synchronous access to CloudStack template features.
@ -46,7 +43,6 @@ import org.jclouds.concurrent.Timeout;
* /> * />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface TemplateClient { public interface TemplateClient {
/** /**
* Creates a template of a virtual machine. The virtual machine must be in a * Creates a template of a virtual machine. The virtual machine must be in a

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VMGroupClient.java
View File

@ -19,13 +19,10 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.VMGroup; import org.jclouds.cloudstack.domain.VMGroup;
import org.jclouds.cloudstack.options.CreateVMGroupOptions; import org.jclouds.cloudstack.options.CreateVMGroupOptions;
import org.jclouds.cloudstack.options.ListVMGroupsOptions; import org.jclouds.cloudstack.options.ListVMGroupsOptions;
import org.jclouds.cloudstack.options.UpdateVMGroupOptions; import org.jclouds.cloudstack.options.UpdateVMGroupOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack VM group features. * Provides synchronous access to CloudStack VM group features.
@ -35,7 +32,6 @@ import org.jclouds.concurrent.Timeout;
* @see VMGroupAsyncClient * @see VMGroupAsyncClient
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface VMGroupClient { public interface VMGroupClient {
/** /**
* Lists VM groups * Lists VM groups

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VirtualMachineClient.java
View File

@ -19,14 +19,11 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.VirtualMachine; import org.jclouds.cloudstack.domain.VirtualMachine;
import org.jclouds.cloudstack.options.AssignVirtualMachineOptions; import org.jclouds.cloudstack.options.AssignVirtualMachineOptions;
import org.jclouds.cloudstack.options.DeployVirtualMachineOptions; import org.jclouds.cloudstack.options.DeployVirtualMachineOptions;
import org.jclouds.cloudstack.options.ListVirtualMachinesOptions; import org.jclouds.cloudstack.options.ListVirtualMachinesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack VirtualMachine features. * Provides synchronous access to CloudStack VirtualMachine features.
@ -36,7 +33,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface VirtualMachineClient { public interface VirtualMachineClient {
/** /**
* Lists VirtualMachines * Lists VirtualMachines

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/VolumeClient.java
View File

@ -19,12 +19,9 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.Volume; import org.jclouds.cloudstack.domain.Volume;
import org.jclouds.cloudstack.options.ListVolumesOptions; import org.jclouds.cloudstack.options.ListVolumesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack Event features. * Provides synchronous access to CloudStack Event features.
@ -33,7 +30,6 @@ import org.jclouds.concurrent.Timeout;
* @author Vijay Kiran * @author Vijay Kiran
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface VolumeClient { public interface VolumeClient {
/** /**

4
apis/cloudstack/src/main/java/org/jclouds/cloudstack/features/ZoneClient.java
View File

@ -19,11 +19,8 @@
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudstack.domain.Zone; import org.jclouds.cloudstack.domain.Zone;
import org.jclouds.cloudstack.options.ListZonesOptions; import org.jclouds.cloudstack.options.ListZonesOptions;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides synchronous access to CloudStack zone features. * Provides synchronous access to CloudStack zone features.
@ -33,7 +30,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" /> * @see <a href="http://download.cloud.com/releases/2.2.0/api_2.2.12/TOC_User.html" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface ZoneClient { public interface ZoneClient {
/** /**
* Lists zones * Lists zones

4
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApi.java
View File

@ -23,7 +23,6 @@ import org.jclouds.cloudwatch.domain.Datapoint;
import org.jclouds.cloudwatch.domain.Statistics; import org.jclouds.cloudwatch.domain.Statistics;
import org.jclouds.cloudwatch.features.MetricApi; import org.jclouds.cloudwatch.features.MetricApi;
import org.jclouds.cloudwatch.options.GetMetricStatisticsOptions; import org.jclouds.cloudwatch.options.GetMetricStatisticsOptions;
import org.jclouds.concurrent.Timeout;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.Region; import org.jclouds.location.Region;
import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull;
@ -32,8 +31,6 @@ import org.jclouds.rest.annotations.EndpointParam;
import java.util.Date; import java.util.Date;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
/** /**
* Provides access to Amazon CloudWatch via the Query API * Provides access to Amazon CloudWatch via the Query API
* <p/> * <p/>
@ -43,7 +40,6 @@ import java.util.concurrent.TimeUnit;
* /> * />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
public interface CloudWatchApi { public interface CloudWatchApi {
/** /**
* *

3
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/CloudWatchApiMetadata.java
View File

@ -18,6 +18,8 @@
*/ */
package org.jclouds.cloudwatch; package org.jclouds.cloudwatch;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AUTH_TAG; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AUTH_TAG;
import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
@ -56,6 +58,7 @@ public class CloudWatchApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", SECONDS.toMillis(30) + "");
properties.setProperty(PROPERTY_AUTH_TAG, "AWS"); properties.setProperty(PROPERTY_AUTH_TAG, "AWS");
properties.setProperty(PROPERTY_HEADER_TAG, "amz"); properties.setProperty(PROPERTY_HEADER_TAG, "amz");
return properties; return properties;

4
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/features/MetricApi.java
View File

@ -18,8 +18,6 @@
*/ */
package org.jclouds.cloudwatch.features; package org.jclouds.cloudwatch.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.cloudwatch.domain.GetMetricStatistics; import org.jclouds.cloudwatch.domain.GetMetricStatistics;
import org.jclouds.cloudwatch.domain.GetMetricStatisticsResponse; import org.jclouds.cloudwatch.domain.GetMetricStatisticsResponse;
import org.jclouds.cloudwatch.domain.Metric; import org.jclouds.cloudwatch.domain.Metric;
@ -28,7 +26,6 @@ import org.jclouds.cloudwatch.options.GetMetricStatisticsOptions;
import org.jclouds.cloudwatch.options.ListMetricsOptions; import org.jclouds.cloudwatch.options.ListMetricsOptions;
import org.jclouds.collect.IterableWithMarker; import org.jclouds.collect.IterableWithMarker;
import org.jclouds.collect.PagedIterable; import org.jclouds.collect.PagedIterable;
import org.jclouds.concurrent.Timeout;
/** /**
* Provides access to Amazon CloudWatch via the Query API * Provides access to Amazon CloudWatch via the Query API
@ -38,7 +35,6 @@ import org.jclouds.concurrent.Timeout;
* @see <a href="http://docs.amazonwebservices.com/AmazonCloudWatch/latest/APIReference" /> * @see <a href="http://docs.amazonwebservices.com/AmazonCloudWatch/latest/APIReference" />
* @author Jeremy Whitlock * @author Jeremy Whitlock
*/ */
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
public interface MetricApi { public interface MetricApi {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/EC2Api.java
View File

@ -19,9 +19,6 @@
package org.jclouds.ec2; package org.jclouds.ec2;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.features.TagApi; import org.jclouds.ec2.features.TagApi;
import org.jclouds.ec2.features.WindowsApi; import org.jclouds.ec2.features.WindowsApi;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
@ -52,7 +49,6 @@ import com.google.inject.Provides;
* @author Adrian Cole * @author Adrian Cole
* @see EC2AsyncApi * @see EC2AsyncApi
*/ */
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface EC2Api { public interface EC2Api {
/** /**
* *

4
apis/ec2/src/main/java/org/jclouds/ec2/EC2ApiMetadata.java
View File

@ -18,6 +18,8 @@
*/ */
package org.jclouds.ec2; package org.jclouds.ec2;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AUTH_TAG; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_AUTH_TAG;
import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG; import static org.jclouds.aws.reference.AWSConstants.PROPERTY_HEADER_TAG;
import static org.jclouds.compute.config.ComputeServiceProperties.RESOURCENAME_DELIMITER; import static org.jclouds.compute.config.ComputeServiceProperties.RESOURCENAME_DELIMITER;
@ -77,6 +79,8 @@ public class EC2ApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", MINUTES.toMillis(3) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "AMIClient.describeImagesInRegion", MINUTES.toMillis(5) + "");
properties.setProperty(PROPERTY_AUTH_TAG, "AWS"); properties.setProperty(PROPERTY_AUTH_TAG, "AWS");
properties.setProperty(PROPERTY_HEADER_TAG, "amz"); properties.setProperty(PROPERTY_HEADER_TAG, "amz");
properties.setProperty(PROPERTY_EC2_AMI_OWNERS, "*"); properties.setProperty(PROPERTY_EC2_AMI_OWNERS, "*");

4
apis/ec2/src/main/java/org/jclouds/ec2/EC2Client.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.ec2; package org.jclouds.ec2;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.services.AMIClient; import org.jclouds.ec2.services.AMIClient;
import org.jclouds.ec2.services.AvailabilityZoneAndRegionClient; import org.jclouds.ec2.services.AvailabilityZoneAndRegionClient;
import org.jclouds.ec2.services.ElasticBlockStoreClient; import org.jclouds.ec2.services.ElasticBlockStoreClient;
@ -36,7 +33,6 @@ import org.jclouds.rest.annotations.Delegate;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface EC2Client extends EC2Api { public interface EC2Client extends EC2Api {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/features/TagApi.java
View File

@ -19,9 +19,6 @@
package org.jclouds.ec2.features; package org.jclouds.ec2.features;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.Tag; import org.jclouds.ec2.domain.Tag;
import org.jclouds.ec2.util.TagFilterBuilder; import org.jclouds.ec2.util.TagFilterBuilder;
import org.jclouds.rest.annotations.SinceApiVersion; import org.jclouds.rest.annotations.SinceApiVersion;
@ -41,7 +38,6 @@ import com.google.common.collect.Multimap;
* @author Adrian Cole * @author Adrian Cole
*/ */
@SinceApiVersion("2010-08-31") @SinceApiVersion("2010-08-31")
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
public interface TagApi { public interface TagApi {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/features/WindowsApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.ec2.features; package org.jclouds.ec2.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.PasswordData; import org.jclouds.ec2.domain.PasswordData;
import org.jclouds.rest.annotations.SinceApiVersion; import org.jclouds.rest.annotations.SinceApiVersion;
@ -34,7 +31,6 @@ import com.google.common.annotations.Beta;
* @see WindowsAsyncApi * @see WindowsAsyncApi
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 45, timeUnit = TimeUnit.SECONDS)
@Beta @Beta
@SinceApiVersion("2008-08-08") @SinceApiVersion("2008-08-08")
public interface WindowsApi { public interface WindowsApi {

5
apis/ec2/src/main/java/org/jclouds/ec2/services/AMIClient.java
View File

@ -20,9 +20,6 @@ package org.jclouds.ec2.services;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.Image; import org.jclouds.ec2.domain.Image;
import org.jclouds.ec2.domain.Image.EbsBlockDevice; import org.jclouds.ec2.domain.Image.EbsBlockDevice;
import org.jclouds.ec2.domain.Permission; import org.jclouds.ec2.domain.Permission;
@ -38,7 +35,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 45, timeUnit = TimeUnit.SECONDS)
public interface AMIClient { public interface AMIClient {
/** /**
@ -55,7 +51,6 @@ public interface AMIClient {
* /> * />
* @see DescribeImagesOptions * @see DescribeImagesOptions
*/ */
@Timeout(duration = 300, timeUnit = TimeUnit.SECONDS)
Set<? extends Image> describeImagesInRegion(@Nullable String region, DescribeImagesOptions... options); Set<? extends Image> describeImagesInRegion(@Nullable String region, DescribeImagesOptions... options);
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/services/AvailabilityZoneAndRegionClient.java
View File

@ -21,9 +21,6 @@ package org.jclouds.ec2.services;
import java.net.URI; import java.net.URI;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.AvailabilityZoneInfo; import org.jclouds.ec2.domain.AvailabilityZoneInfo;
import org.jclouds.ec2.options.DescribeAvailabilityZonesOptions; import org.jclouds.ec2.options.DescribeAvailabilityZonesOptions;
import org.jclouds.ec2.options.DescribeRegionsOptions; import org.jclouds.ec2.options.DescribeRegionsOptions;
@ -35,7 +32,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface AvailabilityZoneAndRegionClient { public interface AvailabilityZoneAndRegionClient {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticBlockStoreClient.java
View File

@ -19,9 +19,6 @@
package org.jclouds.ec2.services; package org.jclouds.ec2.services;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.Attachment; import org.jclouds.ec2.domain.Attachment;
import org.jclouds.ec2.domain.Permission; import org.jclouds.ec2.domain.Permission;
import org.jclouds.ec2.domain.Snapshot; import org.jclouds.ec2.domain.Snapshot;
@ -37,7 +34,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 45, timeUnit = TimeUnit.SECONDS)
public interface ElasticBlockStoreClient { public interface ElasticBlockStoreClient {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/services/ElasticIPAddressClient.java
View File

@ -19,9 +19,6 @@
package org.jclouds.ec2.services; package org.jclouds.ec2.services;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.PublicIpInstanceIdPair; import org.jclouds.ec2.domain.PublicIpInstanceIdPair;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
@ -31,7 +28,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 45, timeUnit = TimeUnit.SECONDS)
public interface ElasticIPAddressClient { public interface ElasticIPAddressClient {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/services/InstanceClient.java
View File

@ -20,9 +20,6 @@ package org.jclouds.ec2.services;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.BlockDevice; import org.jclouds.ec2.domain.BlockDevice;
import org.jclouds.ec2.domain.InstanceStateChange; import org.jclouds.ec2.domain.InstanceStateChange;
import org.jclouds.ec2.domain.Reservation; import org.jclouds.ec2.domain.Reservation;
@ -37,7 +34,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 90, timeUnit = TimeUnit.SECONDS)
public interface InstanceClient { public interface InstanceClient {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/services/KeyPairClient.java
View File

@ -19,9 +19,6 @@
package org.jclouds.ec2.services; package org.jclouds.ec2.services;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.domain.KeyPair;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
@ -31,7 +28,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 45, timeUnit = TimeUnit.SECONDS)
public interface KeyPairClient { public interface KeyPairClient {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java
View File

@ -19,9 +19,6 @@
package org.jclouds.ec2.services; package org.jclouds.ec2.services;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.IpProtocol;
import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.domain.SecurityGroup;
import org.jclouds.ec2.domain.UserIdGroupPair; import org.jclouds.ec2.domain.UserIdGroupPair;
@ -33,7 +30,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 45, timeUnit = TimeUnit.SECONDS)
public interface SecurityGroupClient { public interface SecurityGroupClient {
/** /**

4
apis/ec2/src/main/java/org/jclouds/ec2/services/WindowsClient.java
View File

@ -19,9 +19,6 @@
package org.jclouds.ec2.services; package org.jclouds.ec2.services;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.BundleTask; import org.jclouds.ec2.domain.BundleTask;
import org.jclouds.ec2.domain.PasswordData; import org.jclouds.ec2.domain.PasswordData;
import org.jclouds.ec2.options.BundleInstanceS3StorageOptions; import org.jclouds.ec2.options.BundleInstanceS3StorageOptions;
@ -34,7 +31,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 45, timeUnit = TimeUnit.SECONDS)
public interface WindowsClient { public interface WindowsClient {
/** /**
* Bundles the Windows instance. This procedure is not applicable for Linux * Bundles the Windows instance. This procedure is not applicable for Linux

6
apis/elasticstack/src/main/java/org/jclouds/elasticstack/ElasticStackApiMetadata.java
View File

@ -18,6 +18,8 @@
*/ */
package org.jclouds.elasticstack; package org.jclouds.elasticstack;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import static org.jclouds.elasticstack.reference.ElasticStackConstants.PROPERTY_VNC_PASSWORD; import static org.jclouds.elasticstack.reference.ElasticStackConstants.PROPERTY_VNC_PASSWORD;
import java.net.URI; import java.net.URI;
@ -59,6 +61,10 @@ public class ElasticStackApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", MINUTES.toMillis(1) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "ElasticStackClient.startServer", MINUTES.toMillis(2) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "ElasticStackClient.createDrive", MINUTES.toMillis(2) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "ElasticStackClient.createAndStartServer", MINUTES.toMillis(2) + "");
properties.setProperty(PROPERTY_VNC_PASSWORD, "IL9vs34d"); properties.setProperty(PROPERTY_VNC_PASSWORD, "IL9vs34d");
// passwords are set post-boot, so auth failures are possible // passwords are set post-boot, so auth failures are possible
// from a race condition applying the password set script // from a race condition applying the password set script

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

@ -19,9 +19,6 @@
package org.jclouds.elasticstack; package org.jclouds.elasticstack;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.elasticstack.domain.Drive; import org.jclouds.elasticstack.domain.Drive;
import org.jclouds.elasticstack.domain.DriveData; import org.jclouds.elasticstack.domain.DriveData;
import org.jclouds.elasticstack.domain.DriveInfo; import org.jclouds.elasticstack.domain.DriveInfo;
@ -38,7 +35,6 @@ import org.jclouds.io.Payload;
* @see <a href="TODO: insert URL of elasticstack documentation" /> * @see <a href="TODO: insert URL of elasticstack documentation" />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface ElasticStackClient { public interface ElasticStackClient {
/** /**
* list of server uuids in your account * list of server uuids in your account
@ -94,7 +90,6 @@ public interface ElasticStackClient {
* @param uuid * @param uuid
* what to start * what to start
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
void startServer(String uuid); void startServer(String uuid);
/** /**
@ -157,7 +152,6 @@ public interface ElasticStackClient {
* required parameters: name, size * required parameters: name, size
* @return newly created drive * @return newly created drive
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
DriveInfo createDrive(Drive createDrive); DriveInfo createDrive(Drive createDrive);
/** /**
@ -185,7 +179,6 @@ public interface ElasticStackClient {
* @param server * @param server
* @return newly created server * @return newly created server
*/ */
@Timeout(duration = 120, timeUnit = TimeUnit.SECONDS)
ServerInfo createAndStartServer(Server server); ServerInfo createAndStartServer(Server server);
/** /**

4
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApi.java
View File

@ -19,9 +19,6 @@
package org.jclouds.openstack.cinder.v1; package org.jclouds.openstack.cinder.v1;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.Zone; import org.jclouds.location.Zone;
import org.jclouds.location.functions.ZoneToEndpoint; import org.jclouds.location.functions.ZoneToEndpoint;
@ -41,7 +38,6 @@ import com.google.inject.Provides;
* @see <a href="http://api.openstack.org/">API Doc</a> * @see <a href="http://api.openstack.org/">API Doc</a>
* @author Everett Toews * @author Everett Toews
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface CinderApi { public interface CinderApi {
/** /**
* @return the Zone codes configured * @return the Zone codes configured

5
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/CinderApiMetadata.java
View File

@ -18,6 +18,8 @@
*/ */
package org.jclouds.openstack.cinder.v1; package org.jclouds.openstack.cinder.v1;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
@ -63,10 +65,9 @@ public class CinderApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", MINUTES.toMillis(3) + "");
properties.setProperty(SERVICE_TYPE, ServiceType.BLOCK_STORAGE); properties.setProperty(SERVICE_TYPE, ServiceType.BLOCK_STORAGE);
properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS); properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
return properties; return properties;
} }

4
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/SnapshotApi.java
View File

@ -1,8 +1,5 @@
package org.jclouds.openstack.cinder.v1.features; package org.jclouds.openstack.cinder.v1.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.cinder.v1.domain.Snapshot; import org.jclouds.openstack.cinder.v1.domain.Snapshot;
import org.jclouds.openstack.cinder.v1.options.CreateSnapshotOptions; import org.jclouds.openstack.cinder.v1.options.CreateSnapshotOptions;
@ -15,7 +12,6 @@ import com.google.common.collect.FluentIterable;
* @see <a href="http://api.openstack.org/">API Doc</a> * @see <a href="http://api.openstack.org/">API Doc</a>
* @author Everett Toews * @author Everett Toews
*/ */
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface SnapshotApi { public interface SnapshotApi {
/** /**
* Returns a summary list of Snapshots. * Returns a summary list of Snapshots.

4
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeApi.java
View File

@ -1,8 +1,5 @@
package org.jclouds.openstack.cinder.v1.features; package org.jclouds.openstack.cinder.v1.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.cinder.v1.domain.Volume; import org.jclouds.openstack.cinder.v1.domain.Volume;
import org.jclouds.openstack.cinder.v1.options.CreateVolumeOptions; import org.jclouds.openstack.cinder.v1.options.CreateVolumeOptions;
@ -18,7 +15,6 @@ import com.google.common.collect.FluentIterable;
* @see <a href="http://api.openstack.org/">API Doc</a> * @see <a href="http://api.openstack.org/">API Doc</a>
* @author Everett Toews * @author Everett Toews
*/ */
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface VolumeApi { public interface VolumeApi {
/** /**
* Returns a summary list of Volumes. * Returns a summary list of Volumes.

4
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/features/VolumeTypeApi.java
View File

@ -1,8 +1,5 @@
package org.jclouds.openstack.cinder.v1.features; package org.jclouds.openstack.cinder.v1.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.cinder.v1.domain.VolumeType; import org.jclouds.openstack.cinder.v1.domain.VolumeType;
import com.google.common.collect.FluentIterable; import com.google.common.collect.FluentIterable;
@ -14,7 +11,6 @@ import com.google.common.collect.FluentIterable;
* @see <a href="http://api.openstack.org/">API Doc</a> * @see <a href="http://api.openstack.org/">API Doc</a>
* @author Everett Toews * @author Everett Toews
*/ */
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface VolumeTypeApi { public interface VolumeTypeApi {
/** /**
* Returns a summary list of VolumeTypes. * Returns a summary list of VolumeTypes.

4
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/AuthenticationApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.keystone.v2_0; package org.jclouds.openstack.keystone.v2_0;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
import org.jclouds.openstack.keystone.v2_0.domain.Access; import org.jclouds.openstack.keystone.v2_0.domain.Access;
import org.jclouds.openstack.keystone.v2_0.domain.ApiAccessKeyCredentials; import org.jclouds.openstack.keystone.v2_0.domain.ApiAccessKeyCredentials;
@ -35,7 +32,6 @@ import org.jclouds.openstack.keystone.v2_0.domain.PasswordCredentials;
* /> * />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
public interface AuthenticationApi { public interface AuthenticationApi {
/** /**

4
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.keystone.v2_0; package org.jclouds.openstack.keystone.v2_0;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.keystone.v2_0.domain.ApiMetadata; import org.jclouds.openstack.keystone.v2_0.domain.ApiMetadata;
import org.jclouds.openstack.keystone.v2_0.features.ServiceApi; import org.jclouds.openstack.keystone.v2_0.features.ServiceApi;
import org.jclouds.openstack.keystone.v2_0.features.TenantApi; import org.jclouds.openstack.keystone.v2_0.features.TenantApi;
@ -39,7 +36,6 @@ import com.google.common.base.Optional;
* @see <a href="http://keystone.openstack.org/" /> * @see <a href="http://keystone.openstack.org/" />
* @see KeystoneAsyncApi * @see KeystoneAsyncApi
*/ */
@Timeout(duration = 10, timeUnit = TimeUnit.SECONDS)
public interface KeystoneApi { public interface KeystoneApi {
/** /**

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/KeystoneApiMetadata.java
View File

@ -18,6 +18,9 @@
*/ */
package org.jclouds.openstack.keystone.v2_0; package org.jclouds.openstack.keystone.v2_0;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
@ -63,6 +66,8 @@ public class KeystoneApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", SECONDS.toMillis(30) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "ExtensionApi", MINUTES.toMillis(3) + "");
properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS); properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
properties.setProperty(SERVICE_TYPE, ServiceType.IDENTITY); properties.setProperty(SERVICE_TYPE, ServiceType.IDENTITY);
return properties; return properties;

4
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/ServiceApi.java
View File

@ -19,9 +19,6 @@
package org.jclouds.openstack.keystone.v2_0.features; package org.jclouds.openstack.keystone.v2_0.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.keystone.v2_0.domain.Tenant; import org.jclouds.openstack.keystone.v2_0.domain.Tenant;
/** /**
@ -34,7 +31,6 @@ import org.jclouds.openstack.keystone.v2_0.domain.Tenant;
* "http://docs.openstack.org/api/openstack-identity-service/2.0/content/Service_API_Api_Operations.html" * "http://docs.openstack.org/api/openstack-identity-service/2.0/content/Service_API_Api_Operations.html"
* /> * />
*/ */
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
public interface ServiceApi { public interface ServiceApi {
/** /**

4
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TenantApi.java
View File

@ -18,10 +18,7 @@
*/ */
package org.jclouds.openstack.keystone.v2_0.features; package org.jclouds.openstack.keystone.v2_0.features;
import java.util.concurrent.TimeUnit;
import org.jclouds.collect.PagedIterable; import org.jclouds.collect.PagedIterable;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.keystone.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.keystone.v2_0.domain.PaginatedCollection;
import org.jclouds.openstack.keystone.v2_0.domain.Tenant; import org.jclouds.openstack.keystone.v2_0.domain.Tenant;
import org.jclouds.openstack.v2_0.options.PaginationOptions; import org.jclouds.openstack.v2_0.options.PaginationOptions;
@ -36,7 +33,6 @@ import org.jclouds.openstack.v2_0.options.PaginationOptions;
* "http://docs.openstack.org/api/openstack-identity-service/2.0/content/Tenant_Operations.html" * "http://docs.openstack.org/api/openstack-identity-service/2.0/content/Tenant_Operations.html"
* /> * />
*/ */
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
public interface TenantApi { public interface TenantApi {
/** /**

4
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/TokenApi.java
View File

@ -19,9 +19,6 @@
package org.jclouds.openstack.keystone.v2_0.features; package org.jclouds.openstack.keystone.v2_0.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.keystone.v2_0.domain.Endpoint; import org.jclouds.openstack.keystone.v2_0.domain.Endpoint;
import org.jclouds.openstack.keystone.v2_0.domain.Token; import org.jclouds.openstack.keystone.v2_0.domain.Token;
import org.jclouds.openstack.keystone.v2_0.domain.User; import org.jclouds.openstack.keystone.v2_0.domain.User;
@ -39,7 +36,6 @@ import com.google.common.annotations.Beta;
* /> * />
*/ */
@Beta @Beta
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
public interface TokenApi { public interface TokenApi {

4
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/features/UserApi.java
View File

@ -19,10 +19,7 @@
package org.jclouds.openstack.keystone.v2_0.features; package org.jclouds.openstack.keystone.v2_0.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.collect.PagedIterable; import org.jclouds.collect.PagedIterable;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.keystone.v2_0.domain.PaginatedCollection; import org.jclouds.openstack.keystone.v2_0.domain.PaginatedCollection;
import org.jclouds.openstack.keystone.v2_0.domain.Role; import org.jclouds.openstack.keystone.v2_0.domain.Role;
import org.jclouds.openstack.keystone.v2_0.domain.User; import org.jclouds.openstack.keystone.v2_0.domain.User;
@ -41,7 +38,6 @@ import com.google.common.annotations.Beta;
* /> * />
*/ */
@Beta @Beta
@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS)
public interface UserApi { public interface UserApi {
/** /**

4
apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/features/ExtensionApi.java
View File

@ -19,9 +19,6 @@
package org.jclouds.openstack.v2_0.features; package org.jclouds.openstack.v2_0.features;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.v2_0.domain.Extension; import org.jclouds.openstack.v2_0.domain.Extension;
/** /**
@ -34,7 +31,6 @@ import org.jclouds.openstack.v2_0.domain.Extension;
* /> * />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface ExtensionApi { public interface ExtensionApi {
/** /**

4
apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/NovaEC2Client.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.ec2; package org.jclouds.openstack.nova.ec2;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.EC2Client; import org.jclouds.ec2.EC2Client;
import org.jclouds.openstack.nova.ec2.services.NovaEC2KeyPairClient; import org.jclouds.openstack.nova.ec2.services.NovaEC2KeyPairClient;
import org.jclouds.rest.annotations.Delegate; import org.jclouds.rest.annotations.Delegate;
@ -30,7 +27,6 @@ import org.jclouds.rest.annotations.Delegate;
* *
* @author Adam Lowe * @author Adam Lowe
*/ */
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface NovaEC2Client extends EC2Client { public interface NovaEC2Client extends EC2Client {
/** /**

4
apis/openstack-nova-ec2/src/main/java/org/jclouds/openstack/nova/ec2/services/NovaEC2KeyPairClient.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.ec2.services; package org.jclouds.openstack.nova.ec2.services;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.domain.KeyPair;
import org.jclouds.ec2.services.KeyPairClient; import org.jclouds.ec2.services.KeyPairClient;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
@ -29,7 +26,6 @@ import org.jclouds.javax.annotation.Nullable;
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 90, timeUnit = TimeUnit.SECONDS)
public interface NovaEC2KeyPairClient extends KeyPairClient { public interface NovaEC2KeyPairClient extends KeyPairClient {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApi.java
View File

@ -19,9 +19,6 @@
package org.jclouds.openstack.nova.v2_0; package org.jclouds.openstack.nova.v2_0;
import java.util.Set; import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.javax.annotation.Nullable; import org.jclouds.javax.annotation.Nullable;
import org.jclouds.location.Zone; import org.jclouds.location.Zone;
import org.jclouds.location.functions.ZoneToEndpoint; import org.jclouds.location.functions.ZoneToEndpoint;
@ -59,7 +56,6 @@ import com.google.inject.Provides;
* /> * />
* @author Adrian Cole * @author Adrian Cole
*/ */
@Timeout(duration = 60, timeUnit = TimeUnit.SECONDS)
public interface NovaApi { public interface NovaApi {
/** /**
* *

6
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/NovaApiMetadata.java
View File

@ -18,6 +18,8 @@
*/ */
package org.jclouds.openstack.nova.v2_0; package org.jclouds.openstack.nova.v2_0;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.jclouds.Constants.PROPERTY_TIMEOUTS_PREFIX;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
import static org.jclouds.openstack.nova.v2_0.config.NovaProperties.AUTO_ALLOCATE_FLOATING_IPS; import static org.jclouds.openstack.nova.v2_0.config.NovaProperties.AUTO_ALLOCATE_FLOATING_IPS;
@ -68,13 +70,13 @@ public class NovaApiMetadata extends BaseRestApiMetadata {
public static Properties defaultProperties() { public static Properties defaultProperties() {
Properties properties = BaseRestApiMetadata.defaultProperties(); Properties properties = BaseRestApiMetadata.defaultProperties();
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "default", MINUTES.toMillis(3) + "");
properties.setProperty(PROPERTY_TIMEOUTS_PREFIX + "ServerApi.create", MINUTES.toMillis(10) + "");
// auth fail can happen while cloud-init applies keypair updates // auth fail can happen while cloud-init applies keypair updates
properties.setProperty("jclouds.ssh.max-retries", "7"); properties.setProperty("jclouds.ssh.max-retries", "7");
properties.setProperty("jclouds.ssh.retry-auth", "true"); properties.setProperty("jclouds.ssh.retry-auth", "true");
properties.setProperty(SERVICE_TYPE, ServiceType.COMPUTE); properties.setProperty(SERVICE_TYPE, ServiceType.COMPUTE);
properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS); properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
properties.setProperty(AUTO_ALLOCATE_FLOATING_IPS, "false"); properties.setProperty(AUTO_ALLOCATE_FLOATING_IPS, "false");
properties.setProperty(AUTO_GENERATE_KEYPAIRS, "false"); properties.setProperty(AUTO_GENERATE_KEYPAIRS, "false");
properties.setProperty(TIMEOUT_SECURITYGROUP_PRESENT, "500"); properties.setProperty(TIMEOUT_SECURITYGROUP_PRESENT, "500");

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FlavorExtraSpecsApi.java
View File

@ -19,9 +19,6 @@
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -37,7 +34,6 @@ import com.google.common.annotations.Beta;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLAVOR_EXTRA_SPECS) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLAVOR_EXTRA_SPECS)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface FlavorExtraSpecsApi { public interface FlavorExtraSpecsApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/FloatingIPApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.FloatingIP; import org.jclouds.openstack.nova.v2_0.domain.FloatingIP;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -37,7 +34,6 @@ import com.google.common.collect.FluentIterable;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLOATING_IPS) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.FLOATING_IPS)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface FloatingIPApi { public interface FloatingIPApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.Host; import org.jclouds.openstack.nova.v2_0.domain.Host;
import org.jclouds.openstack.nova.v2_0.domain.HostResourceUsage; import org.jclouds.openstack.nova.v2_0.domain.HostResourceUsage;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
@ -38,7 +35,6 @@ import com.google.common.collect.FluentIterable;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.HOSTS) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.HOSTS)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface HostAdministrationApi { public interface HostAdministrationApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApi.java
View File

@ -19,9 +19,6 @@
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.HostAggregate; import org.jclouds.openstack.nova.v2_0.domain.HostAggregate;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -39,7 +36,6 @@ import com.google.common.collect.FluentIterable;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.AGGREGATES) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.AGGREGATES)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface HostAggregateApi { public interface HostAggregateApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.KeyPair; import org.jclouds.openstack.nova.v2_0.domain.KeyPair;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -37,7 +34,6 @@ import com.google.common.collect.FluentIterable;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.KEYPAIRS) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.KEYPAIRS)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface KeyPairApi { public interface KeyPairApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.Quota; import org.jclouds.openstack.nova.v2_0.domain.Quota;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -40,7 +37,6 @@ import com.google.common.annotations.Beta;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTAS) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTAS)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface QuotaApi { public interface QuotaApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaClassApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.QuotaClass; import org.jclouds.openstack.nova.v2_0.domain.QuotaClass;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -39,7 +36,6 @@ import com.google.common.annotations.Beta;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTA_CLASSES) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.QUOTA_CLASSES)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface QuotaClassApi { public interface QuotaClassApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.Ingress; import org.jclouds.openstack.nova.v2_0.domain.Ingress;
import org.jclouds.openstack.nova.v2_0.domain.SecurityGroup; import org.jclouds.openstack.nova.v2_0.domain.SecurityGroup;
import org.jclouds.openstack.nova.v2_0.domain.SecurityGroupRule; import org.jclouds.openstack.nova.v2_0.domain.SecurityGroupRule;
@ -39,7 +36,6 @@ import com.google.common.collect.FluentIterable;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.SECURITY_GROUPS) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.SECURITY_GROUPS)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface SecurityGroupApi { public interface SecurityGroupApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerAdminApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.BackupType; import org.jclouds.openstack.nova.v2_0.domain.BackupType;
import org.jclouds.openstack.nova.v2_0.options.CreateBackupOfServerOptions; import org.jclouds.openstack.nova.v2_0.options.CreateBackupOfServerOptions;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
@ -38,7 +35,6 @@ import com.google.common.annotations.Beta;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.ADMIN_ACTIONS) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.ADMIN_ACTIONS)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface ServerAdminApi { public interface ServerAdminApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.ServerWithSecurityGroups; import org.jclouds.openstack.nova.v2_0.domain.ServerWithSecurityGroups;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -41,7 +38,6 @@ import com.google.common.annotations.Beta;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.CREATESERVEREXT) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.CREATESERVEREXT)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface ServerWithSecurityGroupsApi { public interface ServerWithSecurityGroupsApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.SimpleTenantUsage; import org.jclouds.openstack.nova.v2_0.domain.SimpleTenantUsage;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -37,7 +34,6 @@ import com.google.common.collect.FluentIterable;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.SIMPLE_TENANT_USAGE) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.SIMPLE_TENANT_USAGE)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface SimpleTenantUsageApi { public interface SimpleTenantUsageApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.VirtualInterface; import org.jclouds.openstack.nova.v2_0.domain.VirtualInterface;
import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.openstack.v2_0.services.Extension;
@ -36,7 +33,6 @@ import com.google.common.collect.FluentIterable;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VIRTUAL_INTERFACES) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VIRTUAL_INTERFACES)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface VirtualInterfaceApi { public interface VirtualInterfaceApi {
/** /**

4
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApi.java
View File

@ -18,9 +18,6 @@
*/ */
package org.jclouds.openstack.nova.v2_0.extensions; package org.jclouds.openstack.nova.v2_0.extensions;
import java.util.concurrent.TimeUnit;
import org.jclouds.concurrent.Timeout;
import org.jclouds.openstack.nova.v2_0.domain.Volume; import org.jclouds.openstack.nova.v2_0.domain.Volume;
import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment; import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment;
import org.jclouds.openstack.nova.v2_0.domain.VolumeSnapshot; import org.jclouds.openstack.nova.v2_0.domain.VolumeSnapshot;
@ -42,7 +39,6 @@ import com.google.common.collect.FluentIterable;
*/ */
@Beta @Beta
@Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VOLUMES) @Extension(of = ServiceType.COMPUTE, namespace = ExtensionNamespaces.VOLUMES)
@Timeout(duration = 180, timeUnit = TimeUnit.SECONDS)
public interface VolumeApi { public interface VolumeApi {
/** /**
* Returns a summary list of snapshots. * Returns a summary list of snapshots.

Some files were not shown because too many files have changed in this diff Show More