allocateAddressInLocation(@FormParam("location") String locationId,
+ @FormParam("offeringID") String offeringID);
/**
* @see IBMDeveloperCloudClient#releaseAddress
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java b/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java
index 309e31e833..0a416c3cc6 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudClient.java
@@ -52,6 +52,8 @@ import org.jclouds.ibmdev.domain.Image;
import org.jclouds.ibmdev.domain.Instance;
import org.jclouds.ibmdev.domain.Key;
import org.jclouds.ibmdev.domain.Location;
+import org.jclouds.ibmdev.domain.Offering;
+import org.jclouds.ibmdev.domain.StorageOffering;
import org.jclouds.ibmdev.domain.Volume;
import org.jclouds.ibmdev.options.CreateInstanceOptions;
import org.jclouds.ibmdev.options.RestartInstanceOptions;
@@ -70,7 +72,8 @@ import org.jclouds.rest.ResourceNotFoundException;
public interface IBMDeveloperCloudClient {
/**
*
- * @return the list of Images available to be provisioned on the IBM DeveloperCloud.
+ * @return the list of Images available to be provisioned on the IBM
+ * DeveloperCloud.
*/
Set listImages();
@@ -79,7 +82,8 @@ public interface IBMDeveloperCloudClient {
*
* @return null if image is not found
* @throws AuthorizationException
- * code 401 if the user is not authorized to view this image to section
+ * code 401 if the user is not authorized to view this image to
+ * section
*/
Image getImage(String id);
@@ -89,20 +93,24 @@ public interface IBMDeveloperCloudClient {
* @throws AuthorizationException
* code 401 if the user is not authorized to delete this image
* @throws IllegalStateException
- * code 412 if the image is in an invalid state to perform this operation
+ * code 412 if the image is in an invalid state to perform this
+ * operation
*/
void deleteImage(String id);
/**
- * If set to {@code Image.Visibility#PUBLIC}, makes the Image identified by the supplied Image ID
- * publicly available for all users to create Instances of.
+ * If set to {@code Image.Visibility#PUBLIC}, makes the Image identified by
+ * the supplied Image ID publicly available for all users to create Instances
+ * of.
*
* @return modified image or null, if image was not found.
*
* @throws AuthorizationException
- * code 401 if the user is not authorized to change the visibility of this image
+ * code 401 if the user is not authorized to change the visibility
+ * of this image
* @throws IllegalStateException
- * code 412 if the image is in an invalid state to perform this operation
+ * code 412 if the image is in an invalid state to perform this
+ * operation
*/
Image setImageVisibility(String id, Image.Visibility visibility);
@@ -110,27 +118,30 @@ public interface IBMDeveloperCloudClient {
*
* @return the list of Instances that the authenticated user manages.
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to view this
- * information
+ * code 401 if the currently authenticated user is not authorized
+ * to view this information
*/
Set listInstances();
/**
*
- * @return the list of Instances that the authenticated user manages that were created as part of
- * the request specified by {@code requestId}, or null if the request was not found
+ * @return the list of Instances that the authenticated user manages that
+ * were created as part of the request specified by {@code requestId}
+ * , or null if the request was not found
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to view this request
+ * code 401 if the currently authenticated user is not authorized
+ * to view this request
*/
Set listInstancesFromRequest(String requestId);
/**
- * Returns the Instance that the authenticated user manages with the specified {@code id}
+ * Returns the Instance that the authenticated user manages with the
+ * specified {@code id}
*
* @return null if instance is not found
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to view this
- * instance
+ * code 401 if the currently authenticated user is not authorized
+ * to view this instance
*/
Instance getInstance(String id);
@@ -144,20 +155,26 @@ public interface IBMDeveloperCloudClient {
* @param imageID
* The ID of the image to create this instance from
* @param instanceType
- * The instance type to use for this instance {SMALL, MEDIUM, LARGE}
+ * The instance type to use for this instance {SMALL, MEDIUM,
+ * LARGE}
* @param options
- * overrides default public key, mounts a volume, or attaches a static ip
+ * overrides default public key, mounts a volume, or attaches a
+ * static ip
* @throws AuthorizationException
- * code 401 if the authenticated user is not authorized to create instances
+ * code 401 if the authenticated user is not authorized to create
+ * instances
*
- * code 402 if payment is required before more instances may be created
+ * code 402 if payment is required before more instances may be
+ * created
* @throws IllegalStateException
- * code 409 if there are not enough resources in the cloud to fulfill this request
+ * code 409 if there are not enough resources in the cloud to
+ * fulfill this request
*
- * code 412 One or more of the supplied parameters are invalid for this request
+ * code 412 One or more of the supplied parameters are invalid for
+ * this request
*/
- Instance createInstanceInLocation(String location, String name, String imageID,
- String instanceType, CreateInstanceOptions... options);
+ Instance createInstanceInLocation(String location, String name, String imageID, String instanceType,
+ CreateInstanceOptions... options);
/**
* Sets the expiration time of the instance to the value specified
@@ -165,16 +182,19 @@ public interface IBMDeveloperCloudClient {
* @throws ResourceNotFoundException
* code 404 The instance specified by {@code name} was not found
* @throws AuthorizationException
- * code 401 if the user is not authorized to extend the expiration time of this
- * instance
+ * code 401 if the user is not authorized to extend the expiration
+ * time of this instance
*
- * code 402 if payment is required before more instances may be created
+ * code 402 if payment is required before more instances may be
+ * created
* @throws IllegalStateException
*
- * code 406 The provided expiration date is not valid code 409 if there are not enough
- * resources in the cloud to fulfill this request
+ * code 406 The provided expiration date is not valid code 409 if
+ * there are not enough resources in the cloud to fulfill this
+ * request
*
- * code 412 The instance is in an invalid state to perform this operation
+ * code 412 The instance is in an invalid state to perform this
+ * operation
*/
Date extendReservationForInstance(String id, Date expirationTime);
@@ -188,16 +208,19 @@ public interface IBMDeveloperCloudClient {
* @throws ResourceNotFoundException
* code 404 The instance specified by {@code name} was not found
* @throws AuthorizationException
- * code 401 if the user is not authorized to extend the expiration time of this
- * instance
+ * code 401 if the user is not authorized to extend the expiration
+ * time of this instance
*
- * code 402 if payment is required before more instances may be created
+ * code 402 if payment is required before more instances may be
+ * created
* @throws IllegalStateException
*
- * code 406 The provided expiration date is not valid code 409 if there are not enough
- * resources in the cloud to fulfill this request
+ * code 406 The provided expiration date is not valid code 409 if
+ * there are not enough resources in the cloud to fulfill this
+ * request
*
- * code 412 The instance is in an invalid state to perform this operation
+ * code 412 The instance is in an invalid state to perform this
+ * operation
*/
void restartInstance(String id, RestartInstanceOptions... options);
@@ -214,26 +237,31 @@ public interface IBMDeveloperCloudClient {
* @throws ResourceNotFoundException
* code 404 The instance specified by {@code name} was not found
* @throws AuthorizationException
- * code 401 if the user is not authorized to extend the expiration time of this
- * instance
+ * code 401 if the user is not authorized to extend the expiration
+ * time of this instance
*
- * code 402 if payment is required before more instances may be created
+ * code 402 if payment is required before more instances may be
+ * created
* @throws IllegalStateException
*
- * code 406 The provided expiration date is not valid code 409 if there are not enough
- * resources in the cloud to fulfill this request
+ * code 406 The provided expiration date is not valid code 409 if
+ * there are not enough resources in the cloud to fulfill this
+ * request
*
- * code 412 The instance is in an invalid state to perform this operation
+ * code 412 The instance is in an invalid state to perform this
+ * operation
*/
Image saveInstanceToImage(String id, String toImageName, String toImageDescription);
/**
- * Deletes the Instance that the authenticated user manages with the specified {@code id}
+ * Deletes the Instance that the authenticated user manages with the
+ * specified {@code id}
*
* @throws AuthorizationException
* code 401 if the user is not authorized to delete this instance
* @throws IllegalStateException
- * code 412 if the instance is in an invalid state to perform this operation
+ * code 412 if the instance is in an invalid state to perform this
+ * operation
*/
void deleteInstance(String id);
@@ -244,8 +272,8 @@ public interface IBMDeveloperCloudClient {
Set listKeys();
/**
- * Returns the key with the specified key name from the set of Public Keys stored for the
- * authenticated user.
+ * Returns the key with the specified key name from the set of Public Keys
+ * stored for the authenticated user.
*
* @return null if key is not found
*/
@@ -280,8 +308,8 @@ public interface IBMDeveloperCloudClient {
void addPublicKey(String name, String publicKey);
/**
- * Used to update the Public Key specified by the supplied key name stored for the authenticated
- * user.
+ * Used to update the Public Key specified by the supplied key name stored
+ * for the authenticated user.
*
* @param name
* The name to used to identify this key pair.
@@ -295,7 +323,8 @@ public interface IBMDeveloperCloudClient {
void updatePublicKey(String name, String publicKey);
/**
- * Used to set the Public Key specified by the supplied key name as the default key.
+ * Used to set the Public Key specified by the supplied key name as the
+ * default key.
*
* @param name
* The name to used to identify this key pair.
@@ -314,12 +343,22 @@ public interface IBMDeveloperCloudClient {
*/
void deleteKey(String name);
+ /**
+ * Used to retrieve the offerings of storage for the authenticated user.
+ *
+ * @return offerings or empty set if none
+ * @throws AuthorizationException
+ * code 401 if the currently authenticated user is not authorized
+ * to view this information
+ */
+ Set listStorageOfferings();
+
/**
*
* @return the set of storage volumes for the authenticated user.
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to view this
- * information
+ * code 401 if the currently authenticated user is not authorized
+ * to view this information
*/
Set listVolumes();
@@ -331,29 +370,37 @@ public interface IBMDeveloperCloudClient {
* @param name
* The desired name of the newly created storage volume
* @param format
- * The filesystem format for the new storage volume. Valid format is: EXT3
+ * The filesystem format for the new storage volume. Valid format
+ * is: EXT3
* @param size
- * The size of the new storage volume. Valid values may include SMALL, MEDIUM, and
- * LARGE. Actual values may depend on the location used and may be discov- ered via the
- * location service
+ * The size of the new storage volume. Valid values may include
+ * SMALL, MEDIUM, and LARGE. Actual values may depend on the
+ * location used and may be discov- ered via the location service
+ * @param offeringID
+ * The offeringID which can be obtained from
+ * {@link #listStorageOfferings}
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to create a volume
+ * code 401 if the currently authenticated user is not authorized
+ * to create a volume
*
- * code 402 if payment is required before more storage volumes may be created
+ * code 402 if payment is required before more storage volumes may
+ * be created
* @throws IllegalStateException
- * code 409 ifhere are not enough resources in the cloud to fulfill this request
+ * code 409 ifhere are not enough resources in the cloud to
+ * fulfill this request
*
- * code 412 One or more of the supplied parameters are invalid for this request
+ * code 412 One or more of the supplied parameters are invalid for
+ * this request
*/
- Volume createVolumeInLocation(String location, String name, String format, String size);
+ Volume createVolumeInLocation(String location, String name, String format, String size, String offeringID);
/**
* Used to retrieve the specified storage volume for the authenticated user.
*
* @return null if volume is not found
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to view this storage
- * volume
+ * code 401 if the currently authenticated user is not authorized
+ * to view this storage volume
*/
Volume getVolume(String id);
@@ -361,17 +408,18 @@ public interface IBMDeveloperCloudClient {
* Remove the specified storage volume for the authenticated user.
*
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to remove this
- * storage volume
+ * code 401 if the currently authenticated user is not authorized
+ * to remove this storage volume
* @throws IllegalStateException
- * code 412 if the storage volume is not in the correct state to be deleted
+ * code 412 if the storage volume is not in the correct state to
+ * be deleted
*/
void deleteVolume(String id);
/**
*
- * @return the list of Locations (Data Centers) that the user is entitled to and their
- * capabilities
+ * @return the list of Locations (Data Centers) that the user is entitled to
+ * and their capabilities
*/
Set listLocations();
@@ -389,8 +437,8 @@ public interface IBMDeveloperCloudClient {
*
* @return the set of static IP addresses for the authenticated user.
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to view this
- * information
+ * code 401 if the currently authenticated user is not authorized
+ * to view this information
*/
Set listAddresses();
@@ -400,23 +448,41 @@ public interface IBMDeveloperCloudClient {
*
* @param locationId
* the id of the Location where this address will be allocated
+ * @param offeringID
+ * The offeringID which can be obtained from
+ * {@link #listAddressOfferings}
* @throws AuthorizationException
- * code 401 if the currently authenticated user is not authorized to remove this IP
- * address
+ * code 401 if the currently authenticated user is not authorized
+ * to remove this IP address
*
- * code 402 if payment is required before more addresses may be allocated
+ * code 402 if payment is required before more addresses may be
+ * allocated
+ *
* @throws IllegalStateException
- * code 409 ifhere are not enough resources in the cloud to fulfill this request
+ * code 409 ifhere are not enough resources in the cloud to
+ * fulfill this request
*/
- Address allocateAddressInLocation(String locationId);
+ Address allocateAddressInLocation(String locationId, String offeringID);
/**
- * Used to release the specified static IP addresses for the authenticated user.
+ * Used to retrieve the offerings of addresses for the authenticated user.
+ *
+ * @return offerings or empty set if none
+ * @throws AuthorizationException
+ * code 401 if the currently authenticated user is not authorized
+ * to view this information
+ */
+ Set listAddressOfferings();
+
+ /**
+ * Used to release the specified static IP addresses for the authenticated
+ * user.
*
* @throws AuthorizationException
* code 401 if the user is not authorized to release this address
* @throws IllegalStateException
- * code 412 address is in an invalid state to perform this operation
+ * code 412 address is in an invalid state to perform this
+ * operation
*/
void releaseAddress(String id);
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java b/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java
index aaf415e071..8ac517c4eb 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/IBMDeveloperCloudPropertiesBuilder.java
@@ -42,8 +42,7 @@ public class IBMDeveloperCloudPropertiesBuilder extends PropertiesBuilder {
protected Properties defaultProperties() {
Properties properties = super.defaultProperties();
properties.setProperty(PROPERTY_API_VERSION, IBMDeveloperCloudAsyncClient.VERSION);
- properties.setProperty(PROPERTY_ENDPOINT,
- "https://www-180.ibm.com/cloud/enterprise/beta/api/rest");
+ properties.setProperty(PROPERTY_ENDPOINT, "https://www-147.ibm.com/computecloud/enterprise/api/rest");
properties.setProperty(PROPERTY_IBMDEVELOPERCLOUD_LOCATION, "1");
properties.setProperty(PROPERTY_TIMEOUT_NODE_RUNNING, (15 * 60 * 1000) + "");
return properties;
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java
index 79a8b11cbc..479784fc55 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Image.java
@@ -36,18 +36,18 @@ public class Image {
NEW, AVAILABLE, UNAVAILABLE, DELETED, CAPTURING;
public static State fromValue(int v) {
switch (v) {
- case 0:
- return NEW;
- case 1:
- return AVAILABLE;
- case 2:
- return UNAVAILABLE;
- case 3:
- return DELETED;
- case 4:
- return CAPTURING;
- default:
- throw new IllegalArgumentException("invalid state:" + v);
+ case 0:
+ return NEW;
+ case 1:
+ return AVAILABLE;
+ case 2:
+ return UNAVAILABLE;
+ case 3:
+ return DELETED;
+ case 4:
+ return CAPTURING;
+ default:
+ throw new IllegalArgumentException("invalid state:" + v);
}
}
}
@@ -67,16 +67,37 @@ public class Image {
private int state;
private Visibility visibility;
private String owner;
- private String architecture;
private String platform;
private Date createdTime;
private String location;
- private Set supportedInstanceTypes = Sets.newLinkedHashSet();
+ private Set supportedInstanceTypes = Sets.newLinkedHashSet();
private Set productCodes = Sets.newLinkedHashSet();
private URI documentation;
private String id;
private String description;
+ Image() {
+
+ }
+
+ public Image(String name, URI manifest, int state, Visibility visibility, String owner, String platform,
+ Date createdTime, String location, Set supportedInstanceTypes, Set productCodes,
+ URI documentation, String id, String description) {
+ this.name = name;
+ this.manifest = manifest;
+ this.state = state;
+ this.visibility = visibility;
+ this.owner = owner;
+ this.platform = platform;
+ this.createdTime = createdTime;
+ this.location = location;
+ this.supportedInstanceTypes = supportedInstanceTypes;
+ this.productCodes = productCodes;
+ this.documentation = documentation;
+ this.id = id;
+ this.description = description;
+ }
+
public String getName() {
return name;
}
@@ -117,14 +138,6 @@ public class Image {
this.owner = owner;
}
- public String getArchitecture() {
- return architecture;
- }
-
- public void setArchitecture(String architecture) {
- this.architecture = architecture;
- }
-
public String getPlatform() {
return platform;
}
@@ -149,11 +162,11 @@ public class Image {
this.location = location;
}
- public Set getSupportedInstanceTypes() {
+ public Set getSupportedInstanceTypes() {
return supportedInstanceTypes;
}
- public void setSupportedInstanceTypes(Set supportedInstanceTypes) {
+ public void setSupportedInstanceTypes(Set supportedInstanceTypes) {
this.supportedInstanceTypes = supportedInstanceTypes;
}
@@ -193,7 +206,6 @@ public class Image {
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((architecture == null) ? 0 : architecture.hashCode());
result = prime * result + ((createdTime == null) ? 0 : createdTime.hashCode());
result = prime * result + ((description == null) ? 0 : description.hashCode());
result = prime * result + ((documentation == null) ? 0 : documentation.hashCode());
@@ -204,8 +216,7 @@ public class Image {
result = prime * result + ((owner == null) ? 0 : owner.hashCode());
result = prime * result + ((platform == null) ? 0 : platform.hashCode());
result = prime * result + ((productCodes == null) ? 0 : productCodes.hashCode());
- result = prime * result
- + ((supportedInstanceTypes == null) ? 0 : supportedInstanceTypes.hashCode());
+ result = prime * result + ((supportedInstanceTypes == null) ? 0 : supportedInstanceTypes.hashCode());
result = prime * result + ((visibility == null) ? 0 : visibility.hashCode());
return result;
}
@@ -219,11 +230,6 @@ public class Image {
if (getClass() != obj.getClass())
return false;
Image other = (Image) obj;
- if (architecture == null) {
- if (other.architecture != null)
- return false;
- } else if (!architecture.equals(other.architecture))
- return false;
if (createdTime == null) {
if (other.createdTime != null)
return false;
@@ -289,9 +295,8 @@ public class Image {
@Override
public String toString() {
- return "Image [id=" + id + ", name=" + name + ", location=" + location + ", manifest="
- + manifest + ", platform=" + platform + ", state=" + getState()
- + ", supportedInstanceTypes=" + supportedInstanceTypes + ", visibility="
- + visibility + "]";
+ return "Image [id=" + id + ", name=" + name + ", location=" + location + ", manifest=" + manifest + ", platform="
+ + platform + ", state=" + getState() + ", supportedInstanceTypes=" + supportedInstanceTypes
+ + ", visibility=" + visibility + "]";
}
}
\ No newline at end of file
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java
index db6ba61eeb..af70b4c60d 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Instance.java
@@ -31,35 +31,37 @@ import com.google.common.collect.Sets;
*/
public class Instance {
public static enum Status {
- NEW, PROVISIONING, FAILED, REMOVED, REJECTED, ACTIVE, UNKNOWN, DEPROVISIONING, RESTARTING, STARTING, STOPPING, STOPPED;
+ NEW, PROVISIONING, FAILED, REMOVED, REJECTED, ACTIVE, UNKNOWN, DEPROVISIONING, RESTARTING, STARTING, STOPPING, STOPPED, DEPROVISION_PENDING;
public static Status fromValue(int v) {
switch (v) {
- case 0:
- return NEW;
- case 1:
- return PROVISIONING;
- case 2:
- return FAILED;
- case 3:
- return REMOVED;
- case 4:
- return REJECTED;
- case 5:
- return ACTIVE;
- case 6:
- return UNKNOWN;
- case 7:
- return DEPROVISIONING;
- case 8:
- return RESTARTING;
- case 9:
- return STARTING;
- case 10:
- return STOPPING;
- case 11:
- return STOPPED;
- default:
- throw new IllegalArgumentException("invalid state:" + v);
+ case 0:
+ return NEW;
+ case 1:
+ return PROVISIONING;
+ case 2:
+ return FAILED;
+ case 3:
+ return REMOVED;
+ case 4:
+ return REJECTED;
+ case 5:
+ return ACTIVE;
+ case 6:
+ return UNKNOWN;
+ case 7:
+ return DEPROVISIONING;
+ case 8:
+ return RESTARTING;
+ case 9:
+ return STARTING;
+ case 10:
+ return STOPPING;
+ case 11:
+ return STOPPED;
+ case 12:
+ return DEPROVISION_PENDING;
+ default:
+ throw new IllegalArgumentException("invalid state:" + v);
}
}
}
@@ -163,10 +165,9 @@ public class Instance {
private String id;
private Date expirationTime;
- public Instance(Date launchTime, Set software, String ip, String requestId,
- String keyName, String name, String instanceType, int status, String owner,
- String hostname, String location, String imageId, Set productCodes,
- String requestName, String id, Date expirationTime) {
+ public Instance(Date launchTime, Set software, String ip, String requestId, String keyName, String name,
+ String instanceType, int status, String owner, String hostname, String location, String imageId,
+ Set productCodes, String requestName, String id, Date expirationTime) {
this.launchTime = launchTime;
this.software = software;
this.ip = ip;
@@ -421,12 +422,11 @@ public class Instance {
@Override
public String toString() {
- return "Instance [id=" + id + ", name=" + name + ", ip=" + ip + ", hostname=" + hostname
- + ", status=" + getStatus() + ", instanceType=" + instanceType + ", location="
- + location + ", imageId=" + imageId + ", software=" + software + ", keyName="
- + keyName + ", launchTime=" + launchTime + ", expirationTime=" + expirationTime
- + ", owner=" + owner + ", productCodes=" + productCodes + ", requestId=" + requestId
- + ", requestName=" + requestName + "]";
+ return "Instance [id=" + id + ", name=" + name + ", ip=" + ip + ", hostname=" + hostname + ", status="
+ + getStatus() + ", instanceType=" + instanceType + ", location=" + location + ", imageId=" + imageId
+ + ", software=" + software + ", keyName=" + keyName + ", launchTime=" + launchTime + ", expirationTime="
+ + expirationTime + ", owner=" + owner + ", productCodes=" + productCodes + ", requestId=" + requestId
+ + ", requestName=" + requestName + "]";
}
}
\ No newline at end of file
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java
new file mode 100644
index 0000000000..f48bb5da34
--- /dev/null
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/InstanceType.java
@@ -0,0 +1,97 @@
+/**
+ *
+ * Copyright (C) 2009 Cloud Conscious, LLC.
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the ;License;);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ;AS IS; BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibmdev.domain;
+
+/**
+ *
+ *
+ * @author Adrian Cole
+ */
+public class InstanceType {
+
+ protected String label;
+ protected Price price;
+ protected String id;
+
+ public InstanceType(String label, Price price, String id) {
+ super();
+ this.label = label;
+ this.price = price;
+ this.id = id;
+ }
+
+ InstanceType() {
+ super();
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public Price getPrice() {
+ return price;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((label == null) ? 0 : label.hashCode());
+ result = prime * result + ((price == null) ? 0 : price.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ InstanceType other = (InstanceType) obj;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ if (label == null) {
+ if (other.label != null)
+ return false;
+ } else if (!label.equals(other.label))
+ return false;
+ if (price == null) {
+ if (other.price != null)
+ return false;
+ } else if (!price.equals(other.price))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "[id=" + id + ", label=" + label + ", price=" + price + "]";
+ }
+
+}
\ No newline at end of file
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java
index d1ecb40629..b70f82a0a7 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Key.java
@@ -40,8 +40,7 @@ public class Key {
private String name;
private Date lastModifiedTime;
- public Key(boolean isDefault, Iterable instanceIds, String keyMaterial, String name,
- Date lastModifiedTime) {
+ public Key(boolean isDefault, Iterable instanceIds, String keyMaterial, String name, Date lastModifiedTime) {
this.isDefault = isDefault;
Iterables.addAll(this.instanceIds, instanceIds);
this.keyMaterial = keyMaterial;
@@ -133,8 +132,8 @@ public class Key {
@Override
public String toString() {
- return "Key [isDefault=" + isDefault + ", instanceIds=" + instanceIds + ", name=" + name
- + ", keyMaterial=" + keyMaterial + ", lastModifiedTime=" + lastModifiedTime + "]";
+ return "Key [isDefault=" + isDefault + ", instanceIds=" + instanceIds + ", name=" + name + ", keyMaterial="
+ + keyMaterial + ", lastModifiedTime=" + lastModifiedTime + "]";
}
public Set getInstanceIds() {
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java
new file mode 100644
index 0000000000..887190f950
--- /dev/null
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Offering.java
@@ -0,0 +1,90 @@
+/**
+ *
+ * Copyright (C) 2009 Cloud Conscious, LLC.
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the ;License;);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ;AS IS; BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibmdev.domain;
+
+/**
+ *
+ *
+ * @author Adrian Cole
+ */
+public class Offering {
+
+ protected String location;
+ protected Price price;
+ protected String id;
+
+ public Offering() {
+ super();
+ }
+
+ public String getLocation() {
+ return location;
+ }
+
+ public Price getPrice() {
+ return price;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((location == null) ? 0 : location.hashCode());
+ result = prime * result + ((price == null) ? 0 : price.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Offering other = (Offering) obj;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ if (location == null) {
+ if (other.location != null)
+ return false;
+ } else if (!location.equals(other.location))
+ return false;
+ if (price == null) {
+ if (other.price != null)
+ return false;
+ } else if (!price.equals(other.price))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "[id=" + id + ", location=" + location + ", price=" + price + "]";
+ }
+
+}
\ No newline at end of file
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java
new file mode 100644
index 0000000000..5b587caa46
--- /dev/null
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/Price.java
@@ -0,0 +1,132 @@
+/**
+ *
+ * Copyright (C) 2009 Cloud Conscious, LLC.
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the ;License;);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ;AS IS; BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibmdev.domain;
+
+import java.util.Date;
+
+/**
+ *
+ *
+ * @author Adrian Cole
+ */
+public class Price {
+
+ private double rate;
+ private String unitOfMeasure;
+ private String countryCode;
+ private Date effectiveDate;
+ private String currencyCode;
+ private double pricePerQuantity;
+
+ Price() {
+
+ }
+
+ public Price(double rate, String unitOfMeasure, String countryCode, Date effectiveDate, String currencyCode,
+ double pricePerQuantity) {
+ this.rate = rate;
+ this.unitOfMeasure = unitOfMeasure;
+ this.countryCode = countryCode;
+ this.effectiveDate = effectiveDate;
+ this.currencyCode = currencyCode;
+ this.pricePerQuantity = pricePerQuantity;
+ }
+
+ public double getRate() {
+ return rate;
+ }
+
+ public String getUnitOfMeasure() {
+ return unitOfMeasure;
+ }
+
+ public String getCountryCode() {
+ return countryCode;
+ }
+
+ public Date getEffectiveDate() {
+ return effectiveDate;
+ }
+
+ public String getCurrencyCode() {
+ return currencyCode;
+ }
+
+ public double getPricePerQuantity() {
+ return pricePerQuantity;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((countryCode == null) ? 0 : countryCode.hashCode());
+ result = prime * result + ((currencyCode == null) ? 0 : currencyCode.hashCode());
+ result = prime * result + ((effectiveDate == null) ? 0 : effectiveDate.hashCode());
+ long temp;
+ temp = Double.doubleToLongBits(pricePerQuantity);
+ result = prime * result + (int) (temp ^ (temp >>> 32));
+ temp = Double.doubleToLongBits(rate);
+ result = prime * result + (int) (temp ^ (temp >>> 32));
+ result = prime * result + ((unitOfMeasure == null) ? 0 : unitOfMeasure.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Price other = (Price) obj;
+ if (countryCode == null) {
+ if (other.countryCode != null)
+ return false;
+ } else if (!countryCode.equals(other.countryCode))
+ return false;
+ if (currencyCode == null) {
+ if (other.currencyCode != null)
+ return false;
+ } else if (!currencyCode.equals(other.currencyCode))
+ return false;
+ if (effectiveDate == null) {
+ if (other.effectiveDate != null)
+ return false;
+ } else if (!effectiveDate.equals(other.effectiveDate))
+ return false;
+ if (Double.doubleToLongBits(pricePerQuantity) != Double.doubleToLongBits(other.pricePerQuantity))
+ return false;
+ if (Double.doubleToLongBits(rate) != Double.doubleToLongBits(other.rate))
+ return false;
+ if (unitOfMeasure == null) {
+ if (other.unitOfMeasure != null)
+ return false;
+ } else if (!unitOfMeasure.equals(other.unitOfMeasure))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "[countryCode=" + countryCode + ", currencyCode=" + currencyCode + ", effectiveDate=" + effectiveDate
+ + ", pricePerQuantity=" + pricePerQuantity + ", rate=" + rate + ", unitOfMeasure=" + unitOfMeasure + "]";
+ }
+}
\ No newline at end of file
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java
new file mode 100644
index 0000000000..b757be7055
--- /dev/null
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/domain/StorageOffering.java
@@ -0,0 +1,125 @@
+/**
+ *
+ * Copyright (C) 2009 Cloud Conscious, LLC.
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the ;License;);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an ;AS IS; BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibmdev.domain;
+
+import java.util.Set;
+
+import com.google.common.collect.Sets;
+
+/**
+ *
+ * An Offering for Storage
+ *
+ * @author Adrian Cole
+ */
+public class StorageOffering extends Offering {
+ public static class Format {
+ private String label;
+ private String id;
+
+ Format() {
+
+ }
+
+ public Format(String label, String id) {
+ this.label = label;
+ this.id = id;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((label == null) ? 0 : label.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Format other = (Format) obj;
+ if (id == null) {
+ if (other.id != null)
+ return false;
+ } else if (!id.equals(other.id))
+ return false;
+ if (label == null) {
+ if (other.label != null)
+ return false;
+ } else if (!label.equals(other.label))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return "[id=" + id + ", label=" + label + "]";
+ }
+ }
+
+ private long capacity;
+ private String name;
+ private Set formats = Sets.newLinkedHashSet();
+
+ StorageOffering() {
+
+ }
+
+ public StorageOffering(String location, Price price, long capacity, String name, String id, Set formats) {
+ this.location = location;
+ this.price = price;
+ this.capacity = capacity;
+ this.name = name;
+ this.id = id;
+ this.formats = formats;
+ }
+
+ public long getCapacity() {
+ return capacity;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public Set getFormats() {
+ return formats;
+ }
+
+ @Override
+ public String toString() {
+ return "[capacity=" + capacity + ", formats=" + formats + ", id=" + id + ", location=" + location + ", name="
+ + name + ", price=" + price + "]";
+ }
+
+}
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java b/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java
index 8836270aa4..884747cce7 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/functions/GetFirstInstanceInList.java
@@ -35,8 +35,8 @@ public class GetFirstInstanceInList implements Function
private ParseInstancesFromJson listParser;
@Inject
- public GetFirstInstanceInList(ParseInstancesFromJson gson) {
- this.listParser = gson;
+ public GetFirstInstanceInList(ParseInstancesFromJson mapper) {
+ this.listParser = mapper;
}
@Override
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java b/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java
index 822d7dff4d..0fee53e400 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/functions/ParseUtils.java
@@ -16,29 +16,6 @@
* limitations under the License.
* ====================================================================
*/
-/**
- *
- * Copyright (C) 2009 Cloud Conscious, LLC.
- *
- * ====================================================================
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * ====================================================================
- */
package org.jclouds.ibmdev.functions;
import java.util.Set;
@@ -64,8 +41,10 @@ public class ParseUtils {
public boolean apply(Address input) {
if ("0".equals(input.getInstanceId()))
input.setInstanceId(null);
- if ("".equals(input.getIp()))
+ if (input.getIp() != null && "".equals(input.getIp().trim()))
input.setIp(null);
+ else if (input.getIp() != null && input.getIp().endsWith(" "))
+ input.setIp(input.getIp().trim());
return true;
}
};
@@ -102,8 +81,14 @@ public class ParseUtils {
public boolean apply(Instance input) {
if (emptyString.equals(input.getProductCodes()))
input.getProductCodes().clear();
- if ("".equals(input.getIp()))
+ if (input.getIp() != null && "".equals(input.getIp().trim()))
input.setIp(null);
+ else if (input.getIp() != null && input.getIp().endsWith(" "))
+ input.setIp(input.getIp().trim());
+ if (input.getHostname() != null && "".equals(input.getHostname().trim()))
+ input.setHostname(null);
+ else if (input.getHostname() != null && input.getHostname().endsWith(" "))
+ input.setHostname(input.getHostname().trim());
return true;
}
};
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java b/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java
index 1b509e147b..798599aab1 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/handlers/IBMDeveloperCloudErrorHandler.java
@@ -50,29 +50,32 @@ public class IBMDeveloperCloudErrorHandler implements HttpErrorHandler {
try {
// it is important to always read fully and close streams
String message = parseMessage(response);
- exception = message != null ? new HttpResponseException(command, response, message)
- : exception;
- message = message != null ? message : String.format("%s -> %s", command.getRequest()
- .getRequestLine(), response.getStatusLine());
+ exception = message != null ? new HttpResponseException(command, response, message) : exception;
+ message = message != null ? message : String.format("%s -> %s", command.getRequest().getRequestLine(),
+ response.getStatusLine());
switch (response.getStatusCode()) {
- case 401:
- exception = new AuthorizationException(command.getRequest(),
- message != null ? message : response.getStatusLine());
- break;
- case 402:
- case 403:
- exception = new AuthorizationException(message, exception);
- break;
- case 406:
- case 409:
- case 412:
+ case 401:
+ exception = new AuthorizationException(command.getRequest(), message != null ? message : response
+ .getStatusLine());
+ break;
+ case 402:
+ case 403:
+ exception = new AuthorizationException(message, exception);
+ break;
+ case 404:
+ if (!command.getRequest().getMethod().equals("DELETE")) {
+ exception = new ResourceNotFoundException(message, exception);
+ }
+ break;
+ case 406:
+ case 409:
+ case 412:
+ exception = new IllegalStateException(message, exception);
+ break;
+ case 500:
+ if (message != null && message.indexOf("There is already a BlockStorageDevice object with name") != 1)
exception = new IllegalStateException(message, exception);
- break;
- case 404:
- if (!command.getRequest().getMethod().equals("DELETE")) {
- exception = new ResourceNotFoundException(message, exception);
- }
- break;
+ break;
}
} catch (IOException e) {
} finally {
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java b/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java
new file mode 100644
index 0000000000..36ca074394
--- /dev/null
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceActiveOrFailed.java
@@ -0,0 +1,58 @@
+/**
+ *
+ * Copyright (C) 2009 Cloud Conscious, LLC.
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibmdev.predicates;
+
+import javax.annotation.Resource;
+import javax.inject.Singleton;
+
+import org.jclouds.ibmdev.IBMDeveloperCloudClient;
+import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.logging.Logger;
+
+import com.google.common.base.Predicate;
+import com.google.inject.Inject;
+
+/**
+ *
+ * @author Adrian Cole
+ */
+@Singleton
+public class InstanceActiveOrFailed implements Predicate {
+
+ private final IBMDeveloperCloudClient client;
+
+ @Resource
+ protected Logger logger = Logger.NULL;
+
+ @Inject
+ public InstanceActiveOrFailed(IBMDeveloperCloudClient client) {
+ this.client = client;
+ }
+
+ public boolean apply(Instance instance) {
+ logger.trace("looking for state on instance %s", instance);
+ instance = client.getInstance(instance.getId());
+ if (instance == null)
+ return false;
+ logger.trace("%s: looking for instance state %s: currently: %s", instance.getId(), String.format("%s or %s",
+ Instance.Status.ACTIVE, Instance.Status.FAILED), instance.getStatus());
+ return instance.getStatus() == Instance.Status.ACTIVE || instance.getStatus() == Instance.Status.FAILED;
+ }
+
+}
diff --git a/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java b/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java
index d51541bab4..c4d6f342bd 100644
--- a/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java
+++ b/ibmdev/src/main/java/org/jclouds/ibmdev/predicates/InstanceRemovedOrNotFound.java
@@ -51,8 +51,8 @@ public class InstanceRemovedOrNotFound implements Predicate {
instance = client.getInstance(instance.getId());
if (instance == null)
return true;
- logger.trace("%s: looking for instance state %s: currently: %s", instance.getId(),
- Instance.Status.REMOVED, instance.getStatus());
+ logger.trace("%s: looking for instance state %s: currently: %s", instance.getId(), Instance.Status.REMOVED,
+ instance.getStatus());
return instance.getStatus() == Instance.Status.REMOVED;
}
diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java
index 5c79f817b4..ff82d87907 100644
--- a/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java
+++ b/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudAsyncClientTest.java
@@ -35,6 +35,7 @@ import org.jclouds.http.filters.BasicAuthentication;
import org.jclouds.http.functions.ParseJson;
import org.jclouds.http.functions.ParseSax;
import org.jclouds.http.functions.ReleasePayloadAndReturn;
+import org.jclouds.http.functions.UnwrapOnlyJsonValue;
import org.jclouds.ibmdev.domain.Image;
import org.jclouds.ibmdev.functions.GetFirstInstanceInList;
import org.jclouds.ibmdev.functions.ParseAddressFromJson;
@@ -78,7 +79,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method);
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/images HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -87,11 +88,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/images/1 HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -124,7 +125,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "DELETE https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/images/1 HTTP/1.1");
+ "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, null, null, false);
@@ -138,12 +139,12 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1",
- Image.Visibility.PUBLIC);
+ Image.Visibility.PUBLIC);
assertRequestLineEquals(httpRequest,
- "PUT https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/images/1 HTTP/1.1");
+ "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/image/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, "visibility=PUBLIC", "application/x-www-form-urlencoded", false);
@@ -160,7 +161,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method);
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -177,7 +178,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/requests/1 HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/requests/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -194,7 +195,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances/1 HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -208,12 +209,12 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1", new Date(
- 123215235l));
+ 123215235l));
assertRequestLineEquals(httpRequest,
- "PUT https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances/1 HTTP/1.1");
+ "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, "expirationTime=123215235", "application/x-www-form-urlencoded", false);
@@ -226,11 +227,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "PUT https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances/1 HTTP/1.1");
+ "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, "state=restart", "application/x-www-form-urlencoded", false);
@@ -243,12 +244,12 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1",
- new RestartInstanceOptions().authorizePublicKey("keyName"));
+ new RestartInstanceOptions().authorizePublicKey("keyName"));
assertRequestLineEquals(httpRequest,
- "PUT https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances/1 HTTP/1.1");
+ "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, "state=restart&keyName=keyName", "application/x-www-form-urlencoded", false);
@@ -261,15 +262,15 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1",
- "imageName", "imageDescription");
+ "imageName", "imageDescription");
assertRequestLineEquals(httpRequest,
- "PUT https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances/1 HTTP/1.1");
+ "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, "state=save&description=imageDescription&name=imageName",
- "application/x-www-form-urlencoded", false);
+ "application/x-www-form-urlencoded", false);
assertResponseParserClassEquals(method, httpRequest, ParseImageFromJson.class);
assertSaxResponseParserClassEquals(method, null);
@@ -283,7 +284,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "DELETE https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances/1 HTTP/1.1");
+ "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, null, null, false);
@@ -300,7 +301,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method);
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/keys HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -317,7 +318,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/keys/1 HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -334,7 +335,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "key");
assertRequestLineEquals(httpRequest,
- "POST https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/keys HTTP/1.1");
+ "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, "name=key", "application/x-www-form-urlencoded", false);
@@ -349,10 +350,10 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "key",
- "publicbits");
+ "publicbits");
assertRequestLineEquals(httpRequest,
- "POST https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/keys HTTP/1.1");
+ "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, "name=key&publicKey=publicbits", "application/x-www-form-urlencoded", false);
@@ -367,10 +368,10 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "key",
- "publicbits");
+ "publicbits");
assertRequestLineEquals(httpRequest,
- "PUT https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/keys/key HTTP/1.1");
+ "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/key HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, "publicKey=publicbits", "application/x-www-form-urlencoded", false);
@@ -384,11 +385,11 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "key", true);
assertRequestLineEquals(httpRequest,
- "PUT https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/keys/key HTTP/1.1");
+ "PUT https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/key HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, "default=true", "application/x-www-form-urlencoded", false);
@@ -405,7 +406,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "DELETE https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/keys/1 HTTP/1.1");
+ "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/keys/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, null, null, false);
@@ -422,7 +423,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method);
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/storage HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -439,7 +440,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/storage/1 HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -453,15 +454,15 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "location",
- "name", "format", "size");
+ "name", "format", "size", "offering");
assertRequestLineEquals(httpRequest,
- "POST https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/storage HTTP/1.1");
+ "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, "location=location&format=format&name=name&size=size",
- "application/x-www-form-urlencoded", false);
+ assertPayloadEquals(httpRequest, "location=location&format=format&name=name&size=size&offeringID=offering",
+ "application/x-www-form-urlencoded", false);
assertResponseParserClassEquals(method, httpRequest, ParseVolumeFromJson.class);
assertSaxResponseParserClassEquals(method, null);
@@ -473,15 +474,15 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1", "name",
- "22", "instanceType");
+ "22", "instanceType");
assertRequestLineEquals(httpRequest,
- "POST https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances HTTP/1.1");
+ "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, "location=1&imageID=22&name=name&instanceType=instanceType",
- "application/x-www-form-urlencoded", false);
+ "application/x-www-form-urlencoded", false);
assertResponseParserClassEquals(method, httpRequest, GetFirstInstanceInList.class);
assertSaxResponseParserClassEquals(method, null);
assertExceptionParserClassEquals(method, null);
@@ -492,20 +493,20 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "location",
- "name", "22", "instanceType", new CreateInstanceOptions().attachIp("1").authorizePublicKey("MOO")
- .mountVolume("2", "/mnt").configurationData(
- ImmutableMap.of("insight_admin_password", "myPassword1", "db2_admin_password",
- "myPassword2", "report_user_password", "myPassword3")));
+ "name", "22", "instanceType", new CreateInstanceOptions().attachIp("1").authorizePublicKey("MOO")
+ .mountVolume("2", "/mnt").configurationData(
+ ImmutableMap.of("insight_admin_password", "myPassword1", "db2_admin_password", "myPassword2",
+ "report_user_password", "myPassword3")));
assertRequestLineEquals(httpRequest,
- "POST https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/instances HTTP/1.1");
+ "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/instances HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(
- httpRequest,
- "location=location&imageID=22&name=name&instanceType=instanceType&ip=1&publicKey=MOO&volumeID=2&oss.storage.id.0.mnt=%2Fmnt&insight_admin_password=myPassword1&db2_admin_password=myPassword2&report_user_password=myPassword3",
- "application/x-www-form-urlencoded", false);
+ httpRequest,
+ "location=location&imageID=22&name=name&instanceType=instanceType&ip=1&publicKey=MOO&volumeID=2&oss.storage.id.0.mnt=%2Fmnt&insight_admin_password=myPassword1&db2_admin_password=myPassword2&report_user_password=myPassword3",
+ "application/x-www-form-urlencoded", false);
assertResponseParserClassEquals(method, httpRequest, GetFirstInstanceInList.class);
assertSaxResponseParserClassEquals(method, null);
@@ -520,7 +521,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "DELETE https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/storage/1 HTTP/1.1");
+ "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/storage/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, null, null, false);
@@ -537,7 +538,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method);
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/locations HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/locations HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: text/xml\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -554,7 +555,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/locations/1 HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/locations/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: text/xml\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -571,7 +572,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method);
assertRequestLineEquals(httpRequest,
- "GET https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/addresses HTTP/1.1");
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
assertPayloadEquals(httpRequest, null, null, false);
@@ -584,13 +585,14 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
+ Method method = IBMDeveloperCloudAsyncClient.class.getMethod("allocateAddressInLocation", String.class,
+ String.class);
+ GeneratedHttpRequest httpRequest = processor.createRequest(method, "1", "offering");
assertRequestLineEquals(httpRequest,
- "POST https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/addresses HTTP/1.1");
+ "POST https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
- assertPayloadEquals(httpRequest, "location=1", "application/x-www-form-urlencoded", false);
+ assertPayloadEquals(httpRequest, "location=1&offeringID=offering", "application/x-www-form-urlencoded", false);
assertResponseParserClassEquals(method, httpRequest, ParseAddressFromJson.class);
assertSaxResponseParserClassEquals(method, null);
@@ -605,7 +607,7 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method, "1");
assertRequestLineEquals(httpRequest,
- "DELETE https://www-180.ibm.com/cloud/enterprise/beta/api/rest/20090403/addresses/1 HTTP/1.1");
+ "DELETE https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/addresses/1 HTTP/1.1");
assertNonPayloadHeadersEqual(httpRequest, "");
assertPayloadEquals(httpRequest, null, null, false);
@@ -617,6 +619,38 @@ public class IBMDeveloperCloudAsyncClientTest extends RestClientTest httpRequest = processor.createRequest(method);
+
+ assertRequestLineEquals(httpRequest,
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/storage HTTP/1.1");
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+ assertPayloadEquals(httpRequest, null, null, false);
+
+ assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+ assertSaxResponseParserClassEquals(method, null);
+ assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
+
+ checkFilters(httpRequest);
+ }
+
+ public void testListAddressOfferings() throws SecurityException, NoSuchMethodException, IOException {
+ Method method = IBMDeveloperCloudAsyncClient.class.getMethod("listAddressOfferings");
+ GeneratedHttpRequest httpRequest = processor.createRequest(method);
+
+ assertRequestLineEquals(httpRequest,
+ "GET https://www-147.ibm.com/computecloud/enterprise/api/rest/20100331/offerings/address HTTP/1.1");
+ assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+ assertPayloadEquals(httpRequest, null, null, false);
+
+ assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+ assertSaxResponseParserClassEquals(method, null);
+ assertExceptionParserClassEquals(method, ReturnEmptySetOnNotFoundOr404.class);
+
+ checkFilters(httpRequest);
+ }
+
@Override
protected void checkFilters(HttpRequest request) {
assertEquals(request.getFilters().size(), 1);
diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
index 21b11a24ba..ce90e8fe49 100644
--- a/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
+++ b/ibmdev/src/test/java/org/jclouds/ibmdev/IBMDeveloperCloudClientLiveTest.java
@@ -24,11 +24,12 @@
package org.jclouds.ibmdev;
import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.collect.Iterables.filter;
import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.attachIp;
import static org.jclouds.ibmdev.options.CreateInstanceOptions.Builder.authorizePublicKey;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
import java.io.File;
import java.io.FileNotFoundException;
@@ -38,33 +39,49 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import org.jclouds.domain.Credentials;
import org.jclouds.http.HttpResponseException;
+import org.jclouds.http.handlers.BackoffLimitedRetryHandler;
import org.jclouds.ibmdev.domain.Address;
import org.jclouds.ibmdev.domain.Image;
import org.jclouds.ibmdev.domain.Instance;
+import org.jclouds.ibmdev.domain.InstanceType;
import org.jclouds.ibmdev.domain.Key;
import org.jclouds.ibmdev.domain.Location;
+import org.jclouds.ibmdev.domain.Offering;
+import org.jclouds.ibmdev.domain.StorageOffering;
import org.jclouds.ibmdev.domain.Volume;
import org.jclouds.ibmdev.domain.Instance.Software;
+import org.jclouds.ibmdev.domain.StorageOffering.Format;
import org.jclouds.ibmdev.predicates.AddressFree;
import org.jclouds.ibmdev.predicates.InstanceActive;
+import org.jclouds.ibmdev.predicates.InstanceActiveOrFailed;
import org.jclouds.ibmdev.predicates.InstanceRemovedOrNotFound;
import org.jclouds.ibmdev.predicates.VolumeUnmounted;
import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+import org.jclouds.net.IPSocket;
import org.jclouds.predicates.RetryablePredicate;
import org.jclouds.rest.RestContext;
import org.jclouds.rest.RestContextFactory;
+import org.jclouds.ssh.ExecResponse;
+import org.jclouds.ssh.SshClient;
+import org.jclouds.ssh.SshException;
+import org.jclouds.ssh.jsch.JschSshClient;
+import org.jclouds.ssh.jsch.predicates.InetSocketAddressConnect;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test;
import com.google.common.base.Charsets;
import com.google.common.base.Predicate;
+import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Ordering;
import com.google.common.io.Files;
import com.google.inject.Module;
+import com.google.inject.internal.Sets;
/**
* Tests behavior of {@code IBMDeveloperCloudClient}
@@ -73,10 +90,15 @@ import com.google.inject.Module;
*/
@Test(groups = "live", testName = "ibmdevelopercloud.IBMDeveloperCloudClientLiveTest")
public class IBMDeveloperCloudClientLiveTest {
+ private static final String OS = "Red Hat Enterprise Linux";
+ private static final String VERSION = "5.4";
+
+ private static final String PLATFORM = OS + "/" + VERSION;
+
+ private static final ImmutableSet SOFTWARE = ImmutableSet. of(new Software(OS, "OS", VERSION));
+
+ private static String FORMAT = "EXT3";
- private static final ImmutableSet SOFTWARE = ImmutableSet. of(new Software(
- "SUSE Linux Enterprise", "OS", "10 SP2"));
- private static final String SIZE = "LARGE";
private IBMDeveloperCloudClient connection;
private Location location;
private Address ip;
@@ -87,6 +109,10 @@ public class IBMDeveloperCloudClientLiveTest {
private Instance instance2;
private Instance instance;
private RestContext context;
+ private InstanceType instanceType;
+ private Image image;
+
+ private StorageOffering cheapestStorage;
private static final String TAG = System.getProperty("user.name");
@@ -95,14 +121,13 @@ public class IBMDeveloperCloudClientLiveTest {
String endpoint = System.getProperty("jclouds.test.endpoint");
identity = checkNotNull(System.getProperty("jclouds.test.identity"), "jclouds.test.identity");
- String credential = checkNotNull(System.getProperty("jclouds.test.credential"),
- "jclouds.test.credential");
+ String credential = checkNotNull(System.getProperty("jclouds.test.credential"), "jclouds.test.credential");
Properties props = new Properties();
if (endpoint != null)
props.setProperty("ibmdev.endpoint", endpoint);
context = new RestContextFactory().createContext("ibmdev", identity, credential, ImmutableSet
- . of(new Log4JLoggingModule()), props);
+ . of(new Log4JLoggingModule()), props);
connection = context.getApi();
for (Instance instance : connection.listInstances()) {
@@ -137,9 +162,9 @@ public class IBMDeveloperCloudClientLiveTest {
}
@Test
- public void testListInstancesFromRequestReturnsNull() throws Exception {
+ public void testListInstancesFromRequestReturnsEmptySet() throws Exception {
Set response = connection.listInstancesFromRequest(Long.MAX_VALUE + "");
- assertNull(response);
+ assertEquals(response.size(), 0);
}
@Test
@@ -223,12 +248,8 @@ public class IBMDeveloperCloudClientLiveTest {
key = connection.getKey(TAG);
for (String instanceId : key.getInstanceIds()) {
Instance instance = connection.getInstance(instanceId);
- System.out.println("deleting instance: " + instance);
- if (instance.getStatus() == Instance.Status.FAILED
- || instance.getStatus() == Instance.Status.ACTIVE) {
- connection.deleteInstance(instanceId);
- assert new RetryablePredicate(new InstanceRemovedOrNotFound(connection),
- 30, 2, TimeUnit.SECONDS).apply(instance) : instance;
+ if (instance.getStatus() == Instance.Status.FAILED || instance.getStatus() == Instance.Status.ACTIVE) {
+ killInstance(instance.getId());
}
}
}
@@ -237,15 +258,23 @@ public class IBMDeveloperCloudClientLiveTest {
assertNotNull(key.getLastModifiedTime());
}
- @Test(dependsOnMethods = "testGetLocation")
+ @Test(dependsOnMethods = "resolveImageAndInstanceType")
public void testAllocateIpAddress() throws Exception {
+
+ Offering offering = Iterables.find(connection.listAddressOfferings(), new Predicate() {
+
+ @Override
+ public boolean apply(Offering arg0) {
+ return arg0.getLocation().equals(location.getId());
+ }
+ });
+
try {
- ip = connection.allocateAddressInLocation(location.getId());
+ ip = connection.allocateAddressInLocation(location.getId(), offering.getId());
System.out.println(ip);
assertEquals(ip.getIp(), null);
// wait up to 30 seconds for this to become "free"
- new RetryablePredicate(new AddressFree(connection), 30, 2, TimeUnit.SECONDS)
- .apply(ip);
+ new RetryablePredicate(new AddressFree(connection), 30, 2, TimeUnit.SECONDS).apply(ip);
refreshIpAndReturnAllAddresses();
assertEquals(ip.getInstanceId(), null);
} catch (IllegalStateException e) {
@@ -271,14 +300,44 @@ public class IBMDeveloperCloudClientLiveTest {
}
@Test(dependsOnMethods = "testGetLocation")
+ public void testResolveVolumeOffering() throws Exception {
+
+ Ordering cheapestOrdering = new Ordering() {
+ public int compare(StorageOffering left, StorageOffering right) {
+ return ComparisonChain.start().compare(left.getPrice().getRate(), right.getPrice().getRate()).result();
+ }
+ }.reverse();
+
+ Iterable storageOfferingsThatAreInOurLocationAndCorrectFormat = filter(connection
+ .listStorageOfferings(), new Predicate() {
+ @Override
+ public boolean apply(StorageOffering arg0) {
+
+ return arg0.getLocation().equals(location.getId())
+ && Iterables.any(arg0.getFormats(), new Predicate() {
+
+ @Override
+ public boolean apply(Format arg0) {
+ return arg0.getId().equals(FORMAT);
+ }
+
+ });
+ }
+ });
+ cheapestStorage = cheapestOrdering.max(storageOfferingsThatAreInOurLocationAndCorrectFormat);
+ System.out.println(cheapestStorage);
+ }
+
+ @Test(dependsOnMethods = "testResolveVolumeOffering")
public void testCreateVolume() throws Exception {
try {
- volume = connection.createVolumeInLocation(location.getId(), TAG, "EXT3", "SMALL");
+ volume = connection.createVolumeInLocation(location.getId(), TAG, FORMAT, cheapestStorage.getName(),
+ cheapestStorage.getId());
// wait up to 5 minutes for this to become "unmounted"
- assert new RetryablePredicate(new VolumeUnmounted(connection), 300, 5,
- TimeUnit.SECONDS).apply(volume);
+ assert new RetryablePredicate(new VolumeUnmounted(connection), 300, 5, TimeUnit.SECONDS).apply(volume);
} catch (IllegalStateException e) {
- if (HttpResponseException.class.cast(e.getCause()).getResponse().getStatusCode() == 409) {
+ int code = HttpResponseException.class.cast(e.getCause()).getResponse().getStatusCode();
+ if (code == 409 || code == 500) {
Set volumes = connection.listVolumes();
try {
volume = Iterables.find(volumes, new Predicate() {
@@ -290,7 +349,7 @@ public class IBMDeveloperCloudClientLiveTest {
});
} catch (NoSuchElementException ex) {
- throw new RuntimeException("no unmounted volumes in: " + volumes, e);
+ killInstance(TAG + 1);
}
} else {
throw e;
@@ -315,32 +374,64 @@ public class IBMDeveloperCloudClientLiveTest {
assert (allVolumes.contains(volume)) : String.format("volume %s not in %s", volume, volume);
}
- private static final String IMAGE_ID = "11";// Rational Insight
+ @Test(dependsOnMethods = "testGetLocation")
+ public void resolveImageAndInstanceType() throws Exception {
+ Iterable imagesThatAreInOurLocationAndNotBYOL = filter(connection.listImages(),
+ new Predicate() {
+ @Override
+ public boolean apply(Image arg0) {
+ return arg0.getLocation().equals(location.getId()) && arg0.getPlatform().equals(PLATFORM)
+ && !arg0.getName().contains("BYOL") && !arg0.getName().contains("PAYG");
+ }
+ });
- @Test(dependsOnMethods = { "testAddPublicKey" })
+ Ordering cheapestOrdering = new Ordering() {
+ public int compare(InstanceType left, InstanceType right) {
+ return ComparisonChain.start().compare(left.getPrice().getRate(), right.getPrice().getRate()).result();
+ }
+ }.reverse();
+
+ Set instanceTypes = Sets.newLinkedHashSet();
+
+ for (Image image : imagesThatAreInOurLocationAndNotBYOL)
+ Iterables.addAll(instanceTypes, image.getSupportedInstanceTypes());
+
+ instanceType = cheapestOrdering.max(instanceTypes);
+
+ final InstanceType cheapestInstanceType = instanceType;
+ System.err.println(cheapestInstanceType);
+
+ image = Iterables.find(imagesThatAreInOurLocationAndNotBYOL, new Predicate() {
+
+ @Override
+ public boolean apply(Image arg0) {
+ return arg0.getSupportedInstanceTypes().contains(cheapestInstanceType);
+ }
+
+ });
+ System.err.println(image);
+ connection.getManifest(connection.getImage(image.getId()).getManifest());
+ connection.getManifest(connection.getImage(image.getId()).getDocumentation());
+ }
+
+ @Test(dependsOnMethods = { "testAddPublicKey", "resolveImageAndInstanceType" })
public void testCreateInstance() throws Exception {
-
killInstance(TAG);
- System.err.println(connection.getManifest(connection.getImage(IMAGE_ID).getManifest()));
- System.err.println(connection.getManifest(connection.getImage(IMAGE_ID).getDocumentation()));
-
- instance = connection.createInstanceInLocation(location.getId(), TAG, IMAGE_ID, SIZE,
- authorizePublicKey(key.getName()).configurationData(
- ImmutableMap.of("insight_admin_password", "myPassword1",
- "db2_admin_password", "myPassword2", "report_user_password",
- "myPassword3")));
+ instance = connection.createInstanceInLocation(location.getId(), TAG, image.getId(), instanceType.getId(),
+ authorizePublicKey(key.getName()));
assertBeginState(instance, TAG);
+ assertIpHostNullAndStatusNEW(instance);
blockUntilRunning(instance);
- assertRunning(instance, TAG);
-
+ instance = assertRunning(instance, TAG);
+ sshAndDf(new IPSocket(instance.getIp(), 22), new Credentials("idcuser", key.getKeyMaterial()));
}
private void killInstance(final String nameToKill) {
Set instances = connection.listInstances();
try {
- instance = Iterables.find(instances, new Predicate() {
+ Instance instance = Iterables.find(instances, new Predicate() {
@Override
public boolean apply(Instance input) {
@@ -348,12 +439,22 @@ public class IBMDeveloperCloudClientLiveTest {
}
});
- connection.deleteInstance(instance.getId());
+ if (instance.getStatus() != Instance.Status.DEPROVISIONING
+ && instance.getStatus() != Instance.Status.DEPROVISION_PENDING) {
+ System.out.println("deleting instance: " + instance);
+ int timeout = (instance.getStatus() == Instance.Status.NEW || instance.getStatus() == Instance.Status.PROVISIONING) ? 300
+ : 30;
+ assert new RetryablePredicate(new InstanceActiveOrFailed(connection), timeout, 2,
+ TimeUnit.SECONDS).apply(instance) : instance;
+ connection.deleteInstance(instance.getId());
+ }
+ assert new RetryablePredicate(new InstanceRemovedOrNotFound(connection), 120, 2, TimeUnit.SECONDS)
+ .apply(instance) : instance;
} catch (NoSuchElementException ex) {
}
}
- private void assertRunning(Instance instance, String name) throws AssertionError {
+ private Instance assertRunning(Instance instance, String name) throws AssertionError {
instance = connection.getInstance(instance.getId());
try {
@@ -366,25 +467,26 @@ public class IBMDeveloperCloudClientLiveTest {
System.err.println(instance);
throw e;
}
+ System.err.println("RUNNING: " + instance);
+ return instance;
}
private void blockUntilRunning(Instance instance) {
long start = System.currentTimeMillis();
- assert new RetryablePredicate(new InstanceActive(connection), 15 * 60 * 1000)
- .apply(instance) : connection.getInstance(instance.getId());
+ assert new RetryablePredicate(new InstanceActive(connection), 15 * 60 * 1000).apply(instance) : connection
+ .getInstance(instance.getId());
System.out.println(((System.currentTimeMillis() - start) / 1000) + " seconds");
}
private void assertBeginState(Instance instance, String name) throws AssertionError {
try {
- assertIpHostAndStatusNEW(instance);
assertConsistent(instance, name);
} catch (NullPointerException e) {
System.err.println(instance);
throw e;
} catch (AssertionError e) {
- System.err.println(instance);
+ killInstance(instance.getId());
throw e;
}
}
@@ -392,9 +494,9 @@ public class IBMDeveloperCloudClientLiveTest {
private void assertConsistent(Instance instance, String name) {
assertNotNull(instance.getId());
assertEquals(instance.getName(), name);
- assertEquals(instance.getInstanceType(), SIZE);
+ assertEquals(instance.getInstanceType(), instanceType.getId());
assertEquals(instance.getLocation(), location.getId());
- assertEquals(instance.getImageId(), IMAGE_ID);
+ assertEquals(instance.getImageId(), image.getId());
assertEquals(instance.getSoftware(), SOFTWARE);
assertEquals(instance.getKeyName(), key.getName());
assertNotNull(instance.getLaunchTime());
@@ -405,39 +507,37 @@ public class IBMDeveloperCloudClientLiveTest {
assertNotNull(instance.getRequestId());
}
- private void assertIpHostAndStatusNEW(Instance instance) {
+ private void assertIpHostNullAndStatusNEW(Instance instance) {
assertEquals(instance.getIp(), null);
assertEquals(instance.getHostname(), null);
assertEquals(instance.getStatus(), Instance.Status.NEW);
}
+ private void assertIpHostAndStatusNEW(Instance instance) {
+ assertNotNull(instance.getIp());
+ assertNotNull(instance.getHostname());
+ assertEquals(instance.getStatus(), Instance.Status.NEW);
+ }
+
private void assertIpHostAndStatusACTIVE(Instance instance) {
assertNotNull(instance.getIp());
assertNotNull(instance.getHostname());
assertEquals(instance.getStatus(), Instance.Status.ACTIVE);
}
- /**
- * cannot run an instance due to 500 errors:
- *
- * http://www-180.ibm.com/cloud/enterprise/beta/ram/community/discussionTopic .faces?guid={
- * DA689AEE-783C-6FE7-6F9F-DFEE9763F806}&v=1&fid=1068&tid=1523#topic
- */
- @Test(dependsOnMethods = { "testAddPublicKey", "testAllocateIpAddress", "testCreateVolume" })
- public void testCreateInstanceWithVolume() throws Exception {
+ @Test(dependsOnMethods = { "testAddPublicKey", "testAllocateIpAddress", "testCreateVolume",
+ "resolveImageAndInstanceType" })
+ public void testCreateInstanceWithIpAndVolume() throws Exception {
String name = TAG + "1";
killInstance(name);
- instance2 = connection.createInstanceInLocation(location.getId(), name, IMAGE_ID, SIZE,
- attachIp(ip.getId()).authorizePublicKey(key.getName()).mountVolume(volume.getId(),
- "/mnt").configurationData(
- ImmutableMap.of("insight_admin_password", "myPassword1",
- "db2_admin_password", "myPassword2", "report_user_password",
- "myPassword3")));
+ instance2 = connection.createInstanceInLocation(location.getId(), name, image.getId(), instanceType.getId(),
+ attachIp(ip.getId()).authorizePublicKey(key.getName()).mountVolume(volume.getId(), "/mnt"));
assertBeginState(instance2, name);
+ assertIpHostAndStatusNEW(instance2);
blockUntilRunning(instance2);
- assertRunning(instance2, name);
+ instance2 = assertRunning(instance2, name);
volume = connection.getVolume(volume.getId());
assertEquals(volume.getInstanceId(), instance2.getId());
@@ -445,7 +545,7 @@ public class IBMDeveloperCloudClientLiveTest {
refreshIpAndReturnAllAddresses();
assertEquals(ip.getInstanceId(), instance2.getId());
assertEquals(ip.getIp(), instance2.getIp());
-
+ sshAndDf(new IPSocket(instance2.getIp(), 22), new Credentials("idcuser", keyPair.get("private")));
}
private Set refreshIpAndReturnAllAddresses() {
@@ -497,18 +597,53 @@ public class IBMDeveloperCloudClientLiveTest {
}
}
+ private void sshAndDf(IPSocket socket, Credentials credentials) throws IOException {
+ for (int i = 0; i < 5; i++) {// retry loop TODO replace with predicate.
+ try {
+ _sshAndDf(socket, credentials);
+ return;
+ } catch (SshException e) {
+ try {
+ Thread.sleep(10 * 1000);
+ } catch (InterruptedException e1) {
+ }
+ continue;
+ }
+ }
+ }
+
+ private void _sshAndDf(IPSocket socket, Credentials credentials) {
+ RetryablePredicate socketOpen = new RetryablePredicate(new InetSocketAddressConnect(), 180,
+ 5, TimeUnit.SECONDS);
+
+ socketOpen.apply(socket);
+
+ SshClient ssh = new JschSshClient(new BackoffLimitedRetryHandler(), socket, 60000, credentials.identity, null,
+ credentials.credential.getBytes());
+ try {
+ ssh.connect();
+ ExecResponse hello = ssh.exec("echo hello");
+ assertEquals(hello.getOutput().trim(), "hello");
+ ExecResponse exec = ssh.exec("df");
+ assertTrue(exec.getOutput().contains("Filesystem"),
+ "The output should've contained filesystem information, but it didn't. Output: " + exec);
+ } finally {
+ if (ssh != null)
+ ssh.disconnect();
+ }
+ }
+
@BeforeGroups(groups = { "live" })
protected void setupKeyPair() throws FileNotFoundException, IOException {
String secretKeyFile;
try {
- secretKeyFile = checkNotNull(System.getProperty("jclouds.test.ssh.keyfile"),
- "jclouds.test.ssh.keyfile");
+ secretKeyFile = checkNotNull(System.getProperty("jclouds.test.ssh.keyfile"), "jclouds.test.ssh.keyfile");
} catch (NullPointerException e) {
secretKeyFile = System.getProperty("user.home") + "/.ssh/id_rsa";
}
String secret = Files.toString(new File(secretKeyFile), Charsets.UTF_8);
assert secret.startsWith("-----BEGIN RSA PRIVATE KEY-----") : "invalid key:\n" + secret;
- keyPair = ImmutableMap. of("private", secret, "public", Files.toString(
- new File(secretKeyFile + ".pub"), Charsets.UTF_8));
+ keyPair = ImmutableMap. of("private", secret, "public", Files.toString(new File(secretKeyFile
+ + ".pub"), Charsets.UTF_8));
}
}
diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java b/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java
new file mode 100644
index 0000000000..cd5f483096
--- /dev/null
+++ b/ibmdev/src/test/java/org/jclouds/ibmdev/compute/IBMDeveloperCloudComputeServiceLiveTestDisabled.java
@@ -0,0 +1,78 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC.
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+package org.jclouds.ibmdev.compute;
+
+import static org.testng.Assert.assertEquals;
+
+import org.jclouds.compute.BaseComputeServiceLiveTest;
+import org.jclouds.compute.ComputeServiceContextFactory;
+import org.jclouds.compute.domain.Architecture;
+import org.jclouds.compute.domain.ComputeMetadata;
+import org.jclouds.compute.domain.ComputeType;
+import org.jclouds.compute.domain.OsFamily;
+import org.jclouds.compute.domain.Template;
+import org.jclouds.ibmdev.IBMDeveloperCloudAsyncClient;
+import org.jclouds.ibmdev.IBMDeveloperCloudClient;
+import org.jclouds.rest.RestContext;
+import org.jclouds.ssh.jsch.config.JschSshClientModule;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+/**
+ * @author Adrian Cole
+ */
+@Test(groups = "live", enabled = false, sequential = true, testName = "ibmdevelopercloud.IBMDeveloperCloudComputeServiceLiveTest")
+public class IBMDeveloperCloudComputeServiceLiveTestDisabled extends BaseComputeServiceLiveTest {
+
+ @BeforeClass
+ @Override
+ public void setServiceDefaults() {
+ provider = "ibmdev";
+ }
+
+ @Test
+ public void testTemplateBuilder() {
+ Template defaultTemplate = client.templateBuilder().build();
+ assertEquals(defaultTemplate.getImage().getArchitecture(), Architecture.X86_32);
+ assertEquals(defaultTemplate.getImage().getOsFamily(), OsFamily.RHEL);
+ assertEquals(defaultTemplate.getLocation().getId(), "1");
+ assertEquals(defaultTemplate.getSize().getCores(), 2.0d);
+ }
+
+ @Override
+ public void testListNodes() throws Exception {
+ for (ComputeMetadata node : client.listNodes()) {
+ assert node.getProviderId() != null;
+ // assert node.getLocation() != null;
+ assertEquals(node.getType(), ComputeType.NODE);
+ }
+ }
+
+ @Override
+ protected JschSshClientModule getSshModule() {
+ return new JschSshClientModule();
+ }
+
+ public void testAssignability() throws Exception {
+ @SuppressWarnings("unused")
+ RestContext tmContext = new ComputeServiceContextFactory()
+ .createContext(provider, identity, credential).getProviderSpecificContext();
+ }
+
+}
\ No newline at end of file
diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java
index 8ae0dd5775..381b4de479 100644
--- a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java
+++ b/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImageFromJsonTest.java
@@ -29,6 +29,8 @@ import org.jclouds.http.HttpUtils;
import org.jclouds.http.functions.config.ParserModule;
import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
import org.jclouds.ibmdev.domain.Image;
+import org.jclouds.ibmdev.domain.InstanceType;
+import org.jclouds.ibmdev.domain.Price;
import org.jclouds.ibmdev.domain.Image.Visibility;
import org.jclouds.io.Payloads;
import org.testng.annotations.BeforeTest;
@@ -50,37 +52,33 @@ public class ParseImageFromJsonTest {
@BeforeTest
protected void setUpInjector() throws IOException {
- Injector injector = Guice.createInjector(new ParserModule(),
- new IBMDeveloperCloudParserModule());
+ Injector injector = Guice.createInjector(new ParserModule(), new IBMDeveloperCloudParserModule());
handler = injector.getInstance(ParseImageFromJson.class);
}
public void test() {
- Image image = new Image();
- image.setName("Rational Requirements Composer");
- image
- .setManifest(HttpUtils
- .createUri("https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{28C7B870-2C0A-003F-F886-B89F5B413B77}/1.0/parameters.xml"));
- image.setState(1);
- image.setVisibility(Visibility.PUBLIC);
- image.setOwner("mutdosch@us.ibm.com");
- image.setArchitecture("i386");
- image.setPlatform("Redhat Enterprise Linux (32-bit)/5.4");
- image.setCreatedTime(new Date(1265647398000l));
- image.setLocation("1");
- image.setSupportedInstanceTypes(ImmutableSet.of("LARGE", "MEDIUM"));
- // image.setProductCodes();
- image
- .setDocumentation(HttpUtils
- .createUri("https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{28C7B870-2C0A-003F-F886-B89F5B413B77}/1.0/GettingStarted.html"));
- image.setId("10005598");
- image
- .setDescription("Rational Requirements Composer helps teams define and use requirements effectively across the project lifecycle.");
+ Image image = new Image(
+ "SUSE Linux Enterprise Server 11 for x86",
+ HttpUtils
+ .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/parameters.xml"),
+ 1,
+ Visibility.PUBLIC,
+ "SYSTEM",
+ "SUSE Linux Enterprise Server/11",
+ new Date(1216944000000l),
+ "41",
+ ImmutableSet. of(new InstanceType("Bronze 32 bit", new Price(0.17, "UHR ", "897", null,
+ "USD", 1), "BRZ32.1/2048/175"), new InstanceType("Gold 32 bit", new Price(0.41, "UHR ", "897", null,
+ "USD", 1), "GLD32.4/4096/350"), new InstanceType("Silver 32 bit", new Price(0.265, "UHR ", "897",
+ null, "USD", 1), "SLV32.2/4096/350")),
+ ImmutableSet. of("ifeE7VOzRG6SGvoDlRPTQw"),
+ HttpUtils
+ .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/GettingStarted.html"),
+ "20001150", "SUSE Linux Enterprise Server 11 for x86 Base OS 32-bit with pay for use licensing");
Image compare = handler.apply(new HttpResponse(200, "ok", Payloads
- .newInputStreamPayload(ParseImageFromJsonTest.class
- .getResourceAsStream("/image.json"))));
+ .newInputStreamPayload(ParseImageFromJsonTest.class.getResourceAsStream("/image.json"))));
assertEquals(compare, image);
}
}
diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java
index 1e79a4cff5..165c4ce64e 100644
--- a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java
+++ b/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseImagesFromJsonTest.java
@@ -28,6 +28,9 @@ import org.jclouds.http.HttpUtils;
import org.jclouds.http.functions.config.ParserModule;
import org.jclouds.ibmdev.config.IBMDeveloperCloudParserModule;
import org.jclouds.ibmdev.domain.Image;
+import org.jclouds.ibmdev.domain.InstanceType;
+import org.jclouds.ibmdev.domain.Price;
+import org.jclouds.ibmdev.domain.Image.Visibility;
import org.jclouds.io.Payloads;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -48,61 +51,32 @@ public class ParseImagesFromJsonTest {
@BeforeTest
protected void setUpInjector() throws IOException {
- Injector injector = Guice.createInjector(new ParserModule(),
- new IBMDeveloperCloudParserModule());
+ Injector injector = Guice.createInjector(new ParserModule(), new IBMDeveloperCloudParserModule());
handler = injector.getInstance(ParseImagesFromJson.class);
}
public void test() {
- Image image1 = new Image();
+ Image image1 = new Image(
+ "SUSE Linux Enterprise Server 11 for x86",
+ HttpUtils
+ .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/parameters.xml"),
+ 1,
+ Visibility.PUBLIC,
+ "SYSTEM",
+ "SUSE Linux Enterprise Server/11",
+ new Date(1216944000000l),
+ "41",
+ ImmutableSet. of(new InstanceType("Bronze 32 bit", new Price(0.17, "UHR ", "897", null,
+ "USD", 1), "BRZ32.1/2048/175"), new InstanceType("Gold 32 bit", new Price(0.41, "UHR ", "897", null,
+ "USD", 1), "GLD32.4/4096/350"), new InstanceType("Silver 32 bit", new Price(0.265, "UHR ", "897",
+ null, "USD", 1), "SLV32.2/4096/350")),
+ ImmutableSet. of("ifeE7VOzRG6SGvoDlRPTQw"),
+ HttpUtils
+ .createUri("https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/GettingStarted.html"),
+ "20001150", "SUSE Linux Enterprise Server 11 for x86 Base OS 32-bit with pay for use licensing");
- image1.setName("Rational Build Forge Agent");
- image1
- .setManifest(HttpUtils
- .createUri("https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{A233F5A0-05A5-F21D-3E92-3793B722DFBD}/1.0/parameters.xml"));
- image1.setState(1);
- image1.setVisibility(Image.Visibility.PUBLIC);
- image1.setOwner("SYSTEM");
- image1.setArchitecture("i386");
- image1.setPlatform("SUSE Linux Enterprise/10 SP2");
- image1.setCreatedTime(new Date(1240632000000l));
- image1.setLocation("1");
- image1.setSupportedInstanceTypes(ImmutableSet.of("SMALL", "MEDIUM",
- "LARGE"));
- image1.setProductCodes(ImmutableSet
- .of("fd2d0478b132490897526b9b4433a334"));
- image1
- .setDocumentation(HttpUtils
- .createUri("https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{A233F5A0-05A5-F21D-3E92-3793B722DFBD}/1.0/GettingStarted.html"));
- image1.setId("2");
- image1
- .setDescription("Rational Build Forge provides an adaptive process execution framework that automates, orchestrates, manages, and tracks all the processes between each handoff within the assembly line of software development, creating an automated software factory.");
-
- Image image2 = new Image();
- image2.setName("Rational Requirements Composer");
- image2
- .setManifest(HttpUtils
- .createUri("https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{28C7B870-2C0A-003F-F886-B89F5B413B77}/1.0/parameters.xml"));
- image2.setState(1);
- image2.setVisibility(Image.Visibility.PUBLIC);
- image2.setOwner("mutdosch@us.ibm.com");
- image2.setArchitecture("i386");
- image2.setPlatform("Redhat Enterprise Linux (32-bit)/5.4");
- image2.setCreatedTime(new Date(1265647398869l));
- image2.setLocation("1");
- image2.setSupportedInstanceTypes(ImmutableSet.of("LARGE", "MEDIUM"));
- // image.setProductCodes();
- image2
- .setDocumentation(HttpUtils
- .createUri("https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{28C7B870-2C0A-003F-F886-B89F5B413B77}/1.0/GettingStarted.html"));
- image2.setId("10005598");
- image2
- .setDescription("Rational Requirements Composer helps teams define and use requirements effectively across the project lifecycle.");
-
- Set compare = handler.apply(new HttpResponse(200, "ok",
- Payloads.newInputStreamPayload(ParseImagesFromJsonTest.class
- .getResourceAsStream("/images.json"))));
+ Set compare = handler.apply(new HttpResponse(200, "ok", Payloads
+ .newInputStreamPayload(ParseImagesFromJsonTest.class.getResourceAsStream("/images.json"))));
assert (compare.contains(image1));
- assert (compare.contains(image2));
}
}
diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java
index e79d5af92a..0b9ee10322 100644
--- a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java
+++ b/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseInstancesFromJsonTest.java
@@ -19,6 +19,8 @@
package org.jclouds.ibmdev.functions;
+import static org.testng.Assert.assertEquals;
+
import java.io.IOException;
import java.util.Date;
import java.util.Set;
@@ -32,6 +34,7 @@ import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
import com.google.inject.Guice;
import com.google.inject.Injector;
@@ -58,23 +61,17 @@ public class ParseInstancesFromJsonTest {
}
public void test() {
- Instance instance1 = new Instance(new Date(1260472231726l), ImmutableSet
- .of(new Software("SUSE Linux Enterprise", "OS", "10 SP2")),
- "129.33.197.78", "7430", "DEFAULT", "ABC", "MEDIUM", 5,
- "aadelucc@us.ibm.com", "vm723.developer.ihost.com", "1", "3",
- ImmutableSet. of(), "ABC", "7430", new Date(1263064240837l));
+ Instance instance1 = new Instance(new Date(1260472231726l), ImmutableSet.of(new Software("SUSE Linux Enterprise",
+ "OS", "10 SP2")), "129.33.197.78", "7430", "DEFAULT", "ABC", "MEDIUM", 5, "aadelucc@us.ibm.com",
+ "vm723.developer.ihost.com", "1", "3", ImmutableSet. of(), "ABC", "7430", new Date(1263064240837l));
- Instance instance2 = new Instance(new Date(1260472231727l), ImmutableSet
- .of(new Software("SUSE Linux Enterprise", "OS", "10 SP3")),
- "129.33.197.79", "7431", "DEFAULT", "ABC", "MEDIUM", 6,
- "aadelucc@us.ibm.com", "vm723.developer.ihost.com", "2", "4",
+ Instance instance2 = new Instance(new Date(1260472231727l), ImmutableSet.of(new Software("SUSE Linux Enterprise",
+ "OS", "10 SP3")), null, "7431", "DEFAULT", "ABC", "MEDIUM", 1, "aadelucc@us.ibm.com", null, "2", "4",
ImmutableSet. of(), "ABC", "7431", new Date(1263064240838l));
- Set compare = handler.apply(new HttpResponse(200,
- "ok", Payloads
- .newInputStreamPayload(ParseInstancesFromJsonTest.class
- .getResourceAsStream("/instances.json"))));
- assert (compare.contains(instance1));
- assert (compare.contains(instance2));
+ Set compare = handler.apply(new HttpResponse(200, "ok", Payloads
+ .newInputStreamPayload(ParseInstancesFromJsonTest.class.getResourceAsStream("/instances.json"))));
+ assertEquals(Iterables.get(compare, 1), instance1);
+ assertEquals(Iterables.get(compare, 0), instance2);
}
}
diff --git a/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java b/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java
new file mode 100644
index 0000000000..b6e93d4c5c
--- /dev/null
+++ b/ibmdev/src/test/java/org/jclouds/ibmdev/functions/ParseStorageOfferingsFromJsonTest.java
@@ -0,0 +1,84 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC.
+ *
+ * ====================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ====================================================================
+ */
+
+package org.jclouds.ibmdev.functions;
+
+import static org.testng.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.Set;
+
+import org.jclouds.http.HttpResponse;
+import org.jclouds.http.functions.UnwrapOnlyJsonValue;
+import org.jclouds.http.functions.config.ParserModule;
+import org.jclouds.ibmdev.domain.Price;
+import org.jclouds.ibmdev.domain.StorageOffering;
+import org.jclouds.ibmdev.domain.StorageOffering.Format;
+import org.jclouds.io.Payloads;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Key;
+import com.google.inject.TypeLiteral;
+
+/**
+ * Tests behavior of {@code ParseStorageOfferingsFromJson}
+ *
+ * @author Adrian Cole
+ */
+@Test(groups = "unit", sequential = true, testName = "ibmdev.ParseStorageOfferingsFromJsonTest")
+public class ParseStorageOfferingsFromJsonTest {
+ private UnwrapOnlyJsonValue> handler;
+ private Injector injector;
+
+ @BeforeTest
+ protected void setUpInjector() throws IOException {
+ injector = Guice.createInjector(new ParserModule() {
+ @Override
+ protected void configure() {
+ bind(DateAdapter.class).to(LongDateAdapter.class);
+ super.configure();
+ }
+ });
+ handler = injector.getInstance(Key.get(new TypeLiteral>>() {
+ }));
+ }
+
+ @Test
+ public void testDeserialize() throws IOException {
+ Set compare = ImmutableSet.of(//
+ new StorageOffering("41", new Price(0.039, "UHR", "897", new Date(1279497600000l), "USD", 1), 256, "Small",
+ "20001208", ImmutableSet.of(new Format("ext3", "EXT3"))),//
+ new StorageOffering("41", new Price(0.312, "UHR", "897", new Date(1279497600000l), "USD", 1), 2048,
+ "Large", "20001210", ImmutableSet.of(new Format("ext3", "EXT3"))),//
+ new StorageOffering("41", new Price(0.078, "UHR", "897", new Date(1279497600000l), "USD", 1), 512,
+ "Medium", "20001209", ImmutableSet.of(new Format("ext3", "EXT3")))//
+ );
+
+ Set expected = handler.apply(new HttpResponse(200, "ok", Payloads
+ .newPayload(ParseStorageOfferingsFromJsonTest.class.getResourceAsStream("/storage-offerings.json"))));
+
+ assertEquals(compare, expected);
+ }
+
+}
diff --git a/ibmdev/src/test/resources/image.json b/ibmdev/src/test/resources/image.json
index 8a63c96c57..884031b5df 100644
--- a/ibmdev/src/test/resources/image.json
+++ b/ibmdev/src/test/resources/image.json
@@ -1,15 +1,50 @@
-{"name":"Rational Requirements Composer",
- "manifest":"https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{28C7B870-2C0A-003F-F886-B89F5B413B77}/1.0/parameters.xml",
- "state":1,
- "visibility":"PUBLIC",
- "owner":"mutdosch@us.ibm.com",
- "architecture":"i386",
- "platform":"Redhat Enterprise Linux (32-bit)/5.4",
- "createdTime":1265647398000,
- "location":"1",
- "supportedInstanceTypes":["MEDIUM","LARGE"],
- "productCodes":[""],
- "documentation":"https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{28C7B870-2C0A-003F-F886-B89F5B413B77}/1.0/GettingStarted.html",
- "id":"10005598",
- "description":"Rational Requirements Composer helps teams define and use requirements effectively across the project lifecycle."
-}
\ No newline at end of file
+ {
+ "name": "SUSE Linux Enterprise Server 11 for x86",
+ "manifest": "https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/parameters.xml",
+ "state": 1,
+ "visibility": "PUBLIC",
+ "owner": "SYSTEM",
+ "platform": "SUSE Linux Enterprise Server/11",
+ "createdTime": 1216944000000,
+ "location": "41",
+ "supportedInstanceTypes": [{
+ "label": "Bronze 32 bit",
+ "price": {
+ "rate": 0.17,
+ "unitOfMeasure": "UHR ",
+ "countryCode": "897",
+ "effectiveDate": -1,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "id": "BRZ32.1/2048/175"
+ },
+ {
+ "label": "Gold 32 bit",
+ "price": {
+ "rate": 0.41,
+ "unitOfMeasure": "UHR ",
+ "countryCode": "897",
+ "effectiveDate": -1,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "id": "GLD32.4/4096/350"
+ },
+ {
+ "label": "Silver 32 bit",
+ "price": {
+ "rate": 0.265,
+ "unitOfMeasure": "UHR ",
+ "countryCode": "897",
+ "effectiveDate": -1,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "id": "SLV32.2/4096/350"
+ }],
+ "productCodes": ["ifeE7VOzRG6SGvoDlRPTQw"],
+ "documentation": "https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/GettingStarted.html",
+ "id": "20001150",
+ "description": "SUSE Linux Enterprise Server 11 for x86 Base OS 32-bit with pay for use licensing"
+ }
\ No newline at end of file
diff --git a/ibmdev/src/test/resources/images.json b/ibmdev/src/test/resources/images.json
index ffdf764445..2a5ccbfde3 100644
--- a/ibmdev/src/test/resources/images.json
+++ b/ibmdev/src/test/resources/images.json
@@ -1,34 +1,54 @@
{"images":
- [
- { "name": "Rational Build Forge Agent",
- "manifest":"https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{A233F5A0-05A5-F21D-3E92-3793B722DFBD}/1.0/parameters.xml",
- "state":1,
- "visibility":"PUBLIC",
- "owner":"SYSTEM",
- "architecture":"i386",
- "platform":"SUSE Linux Enterprise/10 SP2",
- "createdTime":1240632000000,
- "location":"1",
- "supportedInstanceTypes":["SMALL","MEDIUM","LARGE"],
- "productCodes":["fd2d0478b132490897526b9b4433a334"],
- "documentation":"https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{A233F5A0-05A5-F21D-3E92-3793B722DFBD}/1.0/GettingStarted.html",
- "id":"2",
- "description":"Rational Build Forge provides an adaptive process execution framework that automates, orchestrates, manages, and tracks all the processes between each handoff within the assembly line of software development, creating an automated software factory."
- },
- { "name":"Rational Requirements Composer",
- "manifest":"https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{28C7B870-2C0A-003F-F886-B89F5B413B77}/1.0/parameters.xml",
- "state":1,
- "visibility":"PUBLIC",
- "owner":"mutdosch@us.ibm.com",
- "architecture":"i386",
- "platform":"Redhat Enterprise Linux (32-bit)/5.4",
- "createdTime":1265647398869,
- "location":"1",
- "supportedInstanceTypes":["MEDIUM","LARGE"],
- "productCodes":[""],
- "documentation":"https://www-180.ibm.com/cloud/enterprise/beta/ram.ws/RAMSecure/artifact/{28C7B870-2C0A-003F-F886-B89F5B413B77}/1.0/GettingStarted.html",
- "id":"10005598",
- "description":"Rational Requirements Composer helps teams define and use requirements effectively across the project lifecycle."
- }
+ [{
+
+ "name": "SUSE Linux Enterprise Server 11 for x86",
+ "manifest": "https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/parameters.xml",
+ "state": 1,
+ "visibility": "PUBLIC",
+ "owner": "SYSTEM",
+ "platform": "SUSE Linux Enterprise Server/11",
+ "createdTime": 1216944000000,
+ "location": "41",
+ "supportedInstanceTypes": [{
+ "label": "Bronze 32 bit",
+ "price": {
+ "rate": 0.17,
+ "unitOfMeasure": "UHR ",
+ "countryCode": "897",
+ "effectiveDate": -1,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "id": "BRZ32.1/2048/175"
+ },
+ {
+ "label": "Gold 32 bit",
+ "price": {
+ "rate": 0.41,
+ "unitOfMeasure": "UHR ",
+ "countryCode": "897",
+ "effectiveDate": -1,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "id": "GLD32.4/4096/350"
+ },
+ {
+ "label": "Silver 32 bit",
+ "price": {
+ "rate": 0.265,
+ "unitOfMeasure": "UHR ",
+ "countryCode": "897",
+ "effectiveDate": -1,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "id": "SLV32.2/4096/350"
+ }],
+ "productCodes": ["ifeE7VOzRG6SGvoDlRPTQw"],
+ "documentation": "https://www-147.ibm.com/cloud/enterprise/ram.ws/RAMSecure/artifact/{F006D027-02CC-9D08-D389-6C729D939D44}/1.0/GettingStarted.html",
+ "id": "20001150",
+ "description": "SUSE Linux Enterprise Server 11 for x86 Base OS 32-bit with pay for use licensing"
+ }
]
}
\ No newline at end of file
diff --git a/ibmdev/src/test/resources/instance.json b/ibmdev/src/test/resources/instance.json
index 7d9ac3c47a..85ecabf4be 100644
--- a/ibmdev/src/test/resources/instance.json
+++ b/ibmdev/src/test/resources/instance.json
@@ -4,14 +4,14 @@
[
{ "version":"10 SP2", "type":"OS", "name":"SUSE Linux Enterprise" }
],
- "ip":"129.33.197.78",
+ "ip":"129.33.197.78 ",
"requestId":"7430",
"keyName":"DEFAULT",
"name":"ABC",
"instanceType":"MEDIUM",
"status":5,
"owner":"aadelucc@us.ibm.com",
- "hostname":"vm723.developer.ihost.com",
+ "hostname":"vm723.developer.ihost.com ",
"location":"1",
"imageId":"3",
"productCodes":[],
diff --git a/ibmdev/src/test/resources/instances.json b/ibmdev/src/test/resources/instances.json
index 2e48c0ae08..3300546078 100644
--- a/ibmdev/src/test/resources/instances.json
+++ b/ibmdev/src/test/resources/instances.json
@@ -6,14 +6,14 @@
[
{ "version":"10 SP2", "type":"OS", "name":"SUSE Linux Enterprise" }
],
- "ip":"129.33.197.78",
+ "ip":"129.33.197.78 ",
"requestId":"7430",
"keyName":"DEFAULT",
"name":"ABC",
"instanceType":"MEDIUM",
"status":5,
"owner":"aadelucc@us.ibm.com",
- "hostname":"vm723.developer.ihost.com",
+ "hostname":"vm723.developer.ihost.com ",
"location":"1",
"imageId":"3",
"productCodes":[],
@@ -27,14 +27,14 @@
[
{ "version":"10 SP3", "type":"OS", "name":"SUSE Linux Enterprise" }
],
- "ip":"129.33.197.79",
+ "ip":" ",
"requestId":"7431",
"keyName":"DEFAULT",
"name":"ABC",
"instanceType":"MEDIUM",
- "status":6,
+ "status":1,
"owner":"aadelucc@us.ibm.com",
- "hostname":"vm723.developer.ihost.com",
+ "hostname":" ",
"location":"2",
"imageId":"4",
"productCodes":[],
diff --git a/ibmdev/src/test/resources/storage-offerings.json b/ibmdev/src/test/resources/storage-offerings.json
new file mode 100644
index 0000000000..a6edca1c42
--- /dev/null
+++ b/ibmdev/src/test/resources/storage-offerings.json
@@ -0,0 +1,56 @@
+{
+ "addresses": [{
+ "location": "41",
+ "price": {
+ "rate": 0.039,
+ "unitOfMeasure": "UHR",
+ "countryCode": "897",
+ "effectiveDate": 1279497600000,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "capacity": 256,
+ "name": "Small",
+ "id": "20001208",
+ "formats": [{
+ "label": "ext3",
+ "id": "EXT3"
+ }]
+ },
+ {
+ "location": "41",
+ "price": {
+ "rate": 0.078,
+ "unitOfMeasure": "UHR",
+ "countryCode": "897",
+ "effectiveDate": 1279497600000,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "capacity": 512,
+ "name": "Medium",
+ "id": "20001209",
+ "formats": [{
+ "label": "ext3",
+ "id": "EXT3"
+ }]
+ },
+ {
+ "location": "41",
+ "price": {
+ "rate": 0.312,
+ "unitOfMeasure": "UHR",
+ "countryCode": "897",
+ "effectiveDate": 1279497600000,
+ "currencyCode": "USD",
+ "pricePerQuantity": 1
+ },
+ "capacity": 2048,
+ "name": "Large",
+ "id": "20001210",
+ "formats": [{
+ "label": "ext3",
+ "id": "EXT3"
+ }]
+ }]
+}
\ No newline at end of file