mirror of https://github.com/apache/jclouds.git
formatting and imports
This commit is contained in:
Adrian Cole
parent
c1d9a7c47c
commit
c63f3119ca
|
|
@ -66,15 +66,10 @@ public class SDCApiMetadata extends BaseRestApiMetadata {
|
|||
|
||||
protected Builder() {
|
||||
super(SDCClient.class, SDCAsyncClient.class);
|
||||
id("joyent-sdc")
|
||||
.name("Joyent SDC API")
|
||||
.identityName("username")
|
||||
.credentialName("password")
|
||||
.documentation(URI.create("http://sdc.joyent.org/sdcapi.html"))
|
||||
.version("~6.5")
|
||||
.defaultEndpoint("https://api.joyentcloud.com")
|
||||
.defaultProperties(SDCApiMetadata.defaultProperties())
|
||||
.defaultModules(ImmutableSet.<Class<? extends Module>>of(SDCRestClientModule.class));
|
||||
id("joyent-sdc").name("Joyent SDC API").identityName("username").credentialName("password")
|
||||
.documentation(URI.create("http://sdc.joyent.org/sdcapi.html")).version("~6.5")
|
||||
.defaultEndpoint("https://api.joyentcloud.com").defaultProperties(SDCApiMetadata.defaultProperties())
|
||||
.defaultModules(ImmutableSet.<Class<? extends Module>> of(SDCRestClientModule.class));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ public class SDCParserModule extends AbstractModule {
|
|||
@Provides
|
||||
@Singleton
|
||||
public Map<Type, Object> provideCustomAdapterBindings() {
|
||||
return ImmutableMap.<Type, Object> of(Machine.State.class, new SDCTypeAdapters.ServerStateAdapter(),
|
||||
Type.class, new SDCTypeAdapters.SDCTypeAdapter());
|
||||
return ImmutableMap.<Type, Object> of(Machine.State.class, new SDCTypeAdapters.ServerStateAdapter(), Type.class,
|
||||
new SDCTypeAdapters.SDCTypeAdapter());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -50,11 +50,8 @@ import com.google.common.collect.ImmutableMap;
|
|||
@ConfiguresRestClient
|
||||
public class SDCRestClientModule extends RestClientModule<SDCClient, SDCAsyncClient> {
|
||||
public static final Map<Class<?>, Class<?>> DELEGATE_MAP = ImmutableMap.<Class<?>, Class<?>> builder()
|
||||
.put(DatacenterClient.class, DatacenterAsyncClient.class)
|
||||
.put(MachineClient.class, MachineAsyncClient.class)
|
||||
.put(DatasetClient.class, DatasetAsyncClient.class)
|
||||
.put(PackageClient.class, PackageAsyncClient.class)
|
||||
.build();
|
||||
.put(DatacenterClient.class, DatacenterAsyncClient.class).put(MachineClient.class, MachineAsyncClient.class)
|
||||
.put(DatasetClient.class, DatasetAsyncClient.class).put(PackageClient.class, PackageAsyncClient.class).build();
|
||||
|
||||
public SDCRestClientModule() {
|
||||
super(DELEGATE_MAP);
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ public class Dataset implements Comparable<Dataset> {
|
|||
private Type type;
|
||||
private String version;
|
||||
private String urn;
|
||||
private boolean defaultDataset;
|
||||
private boolean isDefault;
|
||||
private Date created;
|
||||
|
||||
public Builder id(String id) {
|
||||
|
|
@ -51,8 +51,8 @@ public class Dataset implements Comparable<Dataset> {
|
|||
return this;
|
||||
}
|
||||
|
||||
public Builder defaultDataset(boolean defaultDataset) {
|
||||
this.defaultDataset = defaultDataset;
|
||||
public Builder isDefault(boolean isDefault) {
|
||||
this.isDefault = isDefault;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
|
@ -62,14 +62,12 @@ public class Dataset implements Comparable<Dataset> {
|
|||
}
|
||||
|
||||
public Dataset build() {
|
||||
return new Dataset(id, name, type, version, urn, defaultDataset, created);
|
||||
return new Dataset(id, name, type, version, urn, isDefault, created);
|
||||
}
|
||||
|
||||
public Builder fromDataset(Dataset in) {
|
||||
return id(in.getId()).name(in.getName()).type(in.getType()).version(
|
||||
in.getVersion()).urn(in.getUrn()).defaultDataset(
|
||||
in.isDefaultDataset()).created(
|
||||
in.getCreated());
|
||||
return id(in.getId()).name(in.getName()).type(in.getType()).version(in.getVersion()).urn(in.getUrn())
|
||||
.isDefault(in.isDefault()).created(in.getCreated());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -85,19 +83,18 @@ public class Dataset implements Comparable<Dataset> {
|
|||
protected final String urn;
|
||||
// Whether this is the default dataset in this datacenter
|
||||
@SerializedName("default")
|
||||
protected final boolean defaultDataset;
|
||||
protected final boolean isDefault;
|
||||
// Date (ISO8601) When this dataset was created
|
||||
protected final Date created;
|
||||
|
||||
public Dataset(String id, String name, Type type, String version,
|
||||
String urn, boolean defaultDataset, Date created) {
|
||||
public Dataset(String id, String name, Type type, String version, String urn, boolean isDefault, Date created) {
|
||||
super();
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
this.type = type;
|
||||
this.version = version;
|
||||
this.urn = urn;
|
||||
this.defaultDataset = defaultDataset;
|
||||
this.isDefault = isDefault;
|
||||
this.created = created;
|
||||
}
|
||||
|
||||
|
|
@ -121,8 +118,8 @@ public class Dataset implements Comparable<Dataset> {
|
|||
return urn;
|
||||
}
|
||||
|
||||
public boolean isDefaultDataset() {
|
||||
return defaultDataset;
|
||||
public boolean isDefault() {
|
||||
return isDefault;
|
||||
}
|
||||
|
||||
public Date getCreated() {
|
||||
|
|
@ -153,10 +150,7 @@ public class Dataset implements Comparable<Dataset> {
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String
|
||||
.format(
|
||||
"[id=%s, name=%s, type=%s, version=%s, urn=%s, default=%s, created=%s]",
|
||||
id, name, type.name(), type.name(), version, urn,
|
||||
defaultDataset, created);
|
||||
return String.format("[id=%s, name=%s, type=%s, version=%s, urn=%s, default=%s, created=%s]", id, name,
|
||||
type.name(), type.name(), version, urn, isDefault, created);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,17 +43,14 @@ public class Machine implements Comparable<Machine> {
|
|||
|
||||
public static State fromValue(String state) {
|
||||
try {
|
||||
return valueOf(CaseFormat.UPPER_CAMEL.to(
|
||||
CaseFormat.UPPER_UNDERSCORE, checkNotNull(state,
|
||||
"state")));
|
||||
return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(state, "state")));
|
||||
} catch (IllegalArgumentException e) {
|
||||
return UNRECOGNIZED;
|
||||
}
|
||||
}
|
||||
|
||||
public String value() {
|
||||
return (CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL,
|
||||
name()));
|
||||
return (CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -138,16 +135,13 @@ public class Machine implements Comparable<Machine> {
|
|||
}
|
||||
|
||||
public Machine build() {
|
||||
return new Machine(id, name, type, state, dataset, memorySizeMb,
|
||||
diskSizeGb, ips, created, updated, metadata);
|
||||
return new Machine(id, name, type, state, dataset, memorySizeMb, diskSizeGb, ips, created, updated, metadata);
|
||||
}
|
||||
|
||||
public Builder fromMachine(Machine in) {
|
||||
return id(in.getId()).name(in.getName()).type(in.getType()).state(
|
||||
in.getState()).dataset(in.getDataset()).memorySizeMb(
|
||||
in.getMemorySizeMb()).diskSizeGb(in.getDiskSizeGb()).ips(
|
||||
in.getIps()).metadata(in.getMetadata()).created(
|
||||
in.getCreated()).updated(in.getUpdated());
|
||||
return id(in.getId()).name(in.getName()).type(in.getType()).state(in.getState()).dataset(in.getDataset())
|
||||
.memorySizeMb(in.getMemorySizeMb()).diskSizeGb(in.getDiskSizeGb()).ips(in.getIps())
|
||||
.metadata(in.getMetadata()).created(in.getCreated()).updated(in.getUpdated());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -182,9 +176,8 @@ public class Machine implements Comparable<Machine> {
|
|||
return id.compareTo(other.getId());
|
||||
}
|
||||
|
||||
public Machine(String id, String name, Type type, State state,
|
||||
String dataset, int memorySizeMb, int diskSizeGb, Set<String> ips,
|
||||
Date created, Date updated, final Map<String, String> metadata) {
|
||||
public Machine(String id, String name, Type type, State state, String dataset, int memorySizeMb, int diskSizeGb,
|
||||
Set<String> ips, Date created, Date updated, final Map<String, String> metadata) {
|
||||
super();
|
||||
this.id = id;
|
||||
this.name = name;
|
||||
|
|
@ -262,10 +255,7 @@ public class Machine implements Comparable<Machine> {
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String
|
||||
.format(
|
||||
"[id=%s, name=%s, type=%s, state=%s, memory=%s, disk=%s, ips=%s, created=%s, updated=%s]",
|
||||
id, name, type.name(), state.name(), memorySizeMb,
|
||||
diskSizeGb, ips, created, updated);
|
||||
return String.format("[id=%s, name=%s, type=%s, state=%s, memory=%s, disk=%s, ips=%s, created=%s, updated=%s]",
|
||||
id, name, type.name(), state.name(), memorySizeMb, diskSizeGb, ips, created, updated);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,7 +29,6 @@ import com.google.gson.annotations.SerializedName;
|
|||
*/
|
||||
public class Package implements Comparable<Package> {
|
||||
|
||||
|
||||
public static Builder builder() {
|
||||
return new Builder();
|
||||
}
|
||||
|
|
@ -39,7 +38,7 @@ public class Package implements Comparable<Package> {
|
|||
private int memorySizeMb;
|
||||
private int diskSizeGb;
|
||||
private int swapSizeMb;
|
||||
private boolean defaultPackage;
|
||||
private boolean isDefault;
|
||||
|
||||
public Builder name(String name) {
|
||||
this.name = name;
|
||||
|
|
@ -61,20 +60,18 @@ public class Package implements Comparable<Package> {
|
|||
return this;
|
||||
}
|
||||
|
||||
public Builder isDefault(boolean defaultPackage) {
|
||||
this.defaultPackage = defaultPackage;
|
||||
public Builder isDefault(boolean isDefault) {
|
||||
this.isDefault = isDefault;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
public Package build() {
|
||||
return new Package(name, memorySizeMb,
|
||||
diskSizeGb, swapSizeMb, defaultPackage);
|
||||
return new Package(name, memorySizeMb, diskSizeGb, swapSizeMb, isDefault);
|
||||
}
|
||||
|
||||
public Builder fromPackage(Package in) {
|
||||
return name(in.getName()).memorySizeMb(
|
||||
in.getMemorySizeMb()).diskSizeGb(in.getDiskSizeGb()).swapSizeMb(in.getSwapSizeMb()).isDefault(in.isDefault());
|
||||
return name(in.getName()).memorySizeMb(in.getMemorySizeMb()).diskSizeGb(in.getDiskSizeGb())
|
||||
.swapSizeMb(in.getSwapSizeMb()).isDefault(in.isDefault());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -91,21 +88,20 @@ public class Package implements Comparable<Package> {
|
|||
protected final int swapSizeMb;
|
||||
// Whether this is the default package in this datacenter
|
||||
@SerializedName("default")
|
||||
protected final boolean defaultPackage;
|
||||
protected final boolean isDefault;
|
||||
|
||||
@Override
|
||||
public int compareTo(Package other) {
|
||||
return name.compareTo(other.getName());
|
||||
}
|
||||
|
||||
public Package(String name, int memorySizeMb, int diskSizeGb,
|
||||
int swapSizeMb, boolean defaultPackage) {
|
||||
public Package(String name, int memorySizeMb, int diskSizeGb, int swapSizeMb, boolean isDefault) {
|
||||
super();
|
||||
this.name = name;
|
||||
this.memorySizeMb = memorySizeMb;
|
||||
this.diskSizeGb = diskSizeGb;
|
||||
this.swapSizeMb = swapSizeMb;
|
||||
this.defaultPackage = defaultPackage;
|
||||
this.isDefault = isDefault;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
|
|
@ -125,7 +121,7 @@ public class Package implements Comparable<Package> {
|
|||
}
|
||||
|
||||
public boolean isDefault() {
|
||||
return defaultPackage;
|
||||
return isDefault;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -147,10 +143,7 @@ public class Package implements Comparable<Package> {
|
|||
|
||||
@Override
|
||||
public String toString() {
|
||||
return String
|
||||
.format(
|
||||
"[name=%s, memory=%s, disk=%s, swap=%s, default=%s]",
|
||||
name, memorySizeMb,
|
||||
diskSizeGb, swapSizeMb, defaultPackage);
|
||||
return String.format("[name=%s, memory=%s, disk=%s, swap=%s, default=%s]", name, memorySizeMb, diskSizeGb,
|
||||
swapSizeMb, isDefault);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,17 +9,14 @@ public enum Type {
|
|||
|
||||
public static Type fromValue(String type) {
|
||||
try {
|
||||
return valueOf(CaseFormat.UPPER_CAMEL
|
||||
.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type,
|
||||
"type")));
|
||||
return valueOf(CaseFormat.UPPER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, checkNotNull(type, "type")));
|
||||
} catch (IllegalArgumentException e) {
|
||||
return UNRECOGNIZED;
|
||||
}
|
||||
}
|
||||
|
||||
public String value() {
|
||||
return (CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL,
|
||||
name()));
|
||||
return (CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, name()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ import com.google.common.util.concurrent.ListenableFuture;
|
|||
* @author Adrian Cole
|
||||
* @see <a href="http://sdc.joyent.org/sdcapi.html">api doc</a>
|
||||
*/
|
||||
@SkipEncoding( { '/', '=' })
|
||||
@Headers(keys="X-Api-Version", values="{jclouds.api-version}")
|
||||
@SkipEncoding({ '/', '=' })
|
||||
@Headers(keys = "X-Api-Version", values = "{jclouds.api-version}")
|
||||
@RequestFilters(BasicAuthentication.class)
|
||||
public interface DatacenterAsyncClient {
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ import com.google.common.util.concurrent.ListenableFuture;
|
|||
* @see DatasetClient
|
||||
* @see <a href="http://apidocs.joyent.com/sdcapidoc/cloudapi">api doc</a>
|
||||
*/
|
||||
@SkipEncoding( { '/', '=' })
|
||||
@SkipEncoding({ '/', '=' })
|
||||
@Headers(keys = "X-Api-Version", values = "{jclouds.api-version}")
|
||||
@RequestFilters(BasicAuthentication.class)
|
||||
public interface DatasetAsyncClient {
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ public interface DatasetClient {
|
|||
|
||||
/**
|
||||
* Provides a list of datasets available in this datacenter.
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
Set<Dataset> listDatasets();
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ import com.google.common.util.concurrent.ListenableFuture;
|
|||
* @see MachineClient
|
||||
* @see <a href="http://apidocs.joyent.com/sdcapidoc/cloudapi">api doc</a>
|
||||
*/
|
||||
@SkipEncoding( { '/', '=' })
|
||||
@SkipEncoding({ '/', '=' })
|
||||
@Headers(keys = "X-Api-Version", values = "{jclouds.api-version}")
|
||||
@RequestFilters(BasicAuthentication.class)
|
||||
public interface MachineAsyncClient {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
|
|||
import org.jclouds.concurrent.Timeout;
|
||||
import org.jclouds.joyent.sdc.v6_5.domain.Machine;
|
||||
|
||||
|
||||
/**
|
||||
* Provides synchronous access to Machine.
|
||||
* <p/>
|
||||
|
|
@ -43,11 +42,11 @@ public interface MachineClient {
|
|||
*/
|
||||
Set<Machine> listMachines();
|
||||
|
||||
|
||||
/**
|
||||
* Gets the details for an individual machine.
|
||||
*
|
||||
* @param id the id of the machine
|
||||
* @param id
|
||||
* the id of the machine
|
||||
* @return
|
||||
*/
|
||||
Machine getMachine(String id);
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import com.google.common.util.concurrent.ListenableFuture;
|
|||
* @see PackageClient
|
||||
* @see <a href="http://apidocs.joyent.com/sdcapidoc/cloudapi">api doc</a>
|
||||
*/
|
||||
@SkipEncoding( { '/', '=' })
|
||||
@SkipEncoding({ '/', '=' })
|
||||
@Headers(keys = "X-Api-Version", values = "{jclouds.api-version}")
|
||||
@RequestFilters(BasicAuthentication.class)
|
||||
public interface PackageAsyncClient {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ public interface PackageClient {
|
|||
|
||||
/**
|
||||
* Provides a list of packages available in this datacenter.
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
Set<org.jclouds.joyent.sdc.v6_5.domain.Package> listPackages();
|
||||
|
|
|
|||
|
|
@ -36,25 +36,24 @@ import com.google.common.collect.ImmutableMultimap;
|
|||
*/
|
||||
@Test(groups = "unit", testName = "DatacenterClientExpectTest")
|
||||
public class DatacenterClientExpectTest extends BaseSDCClientExpectTest {
|
||||
HttpRequest getDatacenters = HttpRequest.builder()
|
||||
HttpRequest getDatacenters = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint(URI.create("https://api.joyentcloud.com/my/datacenters"))
|
||||
.headers(ImmutableMultimap.<String, String> builder()
|
||||
.put("X-Api-Version", "~6.5")
|
||||
.put("Accept", "application/json")
|
||||
.put("Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==").build())
|
||||
.build();
|
||||
.headers(
|
||||
ImmutableMultimap.<String, String> builder().put("X-Api-Version", "~6.5")
|
||||
.put("Accept", "application/json").put("Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==")
|
||||
.build()).build();
|
||||
|
||||
public void testGetDatacentersWhenResponseIs2xx() {
|
||||
HttpResponse getDatacentersResponse = HttpResponse.builder()
|
||||
.statusCode(200)
|
||||
HttpResponse getDatacentersResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/datacenters.json")).build();
|
||||
|
||||
SDCClient clientWhenDatacentersExists = requestSendsResponse(getDatacenters, getDatacentersResponse);
|
||||
|
||||
assertEquals(clientWhenDatacentersExists.getDatacenterClient().getDatacenters(),
|
||||
ImmutableMap.<String, URI> builder()
|
||||
.put("us-east-1", URI.create("https://us-east-1.api.joyentcloud.com"))
|
||||
assertEquals(
|
||||
clientWhenDatacentersExists.getDatacenterClient().getDatacenters(),
|
||||
ImmutableMap.<String, URI> builder().put("us-east-1", URI.create("https://us-east-1.api.joyentcloud.com"))
|
||||
.put("us-west-1", URI.create("https://us-west-1.api.joyentcloud.com"))
|
||||
.put("us-sw-1", URI.create("https://us-sw-1.api.joyentcloud.com"))
|
||||
.put("eu-ams-1", URI.create("https://eu-ams-1.api.joyentcloud.com")).build());
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ import org.testng.annotations.Test;
|
|||
@Test(groups = "live", testName = "DatacenterClientLiveTest")
|
||||
public class DatacenterClientLiveTest extends BaseSDCClientLiveTest {
|
||||
|
||||
public void testGetDatacenters(){
|
||||
public void testGetDatacenters() {
|
||||
Map<String, URI> dcs = sdcContext.getApi().getDatacenterClient().getDatacenters();
|
||||
assertNotNull(dcs);
|
||||
assertTrue(dcs.size() > 0);
|
||||
|
|
|
|||
|
|
@ -37,34 +37,30 @@ import com.google.common.collect.ImmutableSet;
|
|||
*/
|
||||
@Test(groups = "unit", testName = "DatasetClientExpectTest")
|
||||
public class DatasetClientExpectTest extends BaseSDCClientExpectTest {
|
||||
HttpRequest listDatasets = HttpRequest.builder().method("GET").endpoint(
|
||||
URI.create("https://api.joyentcloud.com/my/datasets")).headers(
|
||||
ImmutableMultimap.<String, String> builder().put("X-Api-Version",
|
||||
"~6.5").put("Accept", "application/json").put(
|
||||
"Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==")
|
||||
HttpRequest listDatasets = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint(URI.create("https://api.joyentcloud.com/my/datasets"))
|
||||
.headers(
|
||||
ImmutableMultimap.<String, String> builder().put("X-Api-Version", "~6.5")
|
||||
.put("Accept", "application/json").put("Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==")
|
||||
.build()).build();
|
||||
|
||||
public void testListDatasetsWhenResponseIs2xx() {
|
||||
HttpResponse listDatasetsResponse = HttpResponse.builder()
|
||||
.statusCode(200).payload(
|
||||
payloadFromResource("/dataset_list.json")).build();
|
||||
HttpResponse listDatasetsResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/dataset_list.json")).build();
|
||||
|
||||
SDCClient clientWhenDatasetsExists = requestSendsResponse(listDatasets,
|
||||
listDatasetsResponse);
|
||||
SDCClient clientWhenDatasetsExists = requestSendsResponse(listDatasets, listDatasetsResponse);
|
||||
|
||||
assertEquals(
|
||||
clientWhenDatasetsExists.getDatasetClient().listDatasets().toString(),
|
||||
new ParseDatasetListTest().expected().toString());
|
||||
assertEquals(clientWhenDatasetsExists.getDatasetClient().listDatasets().toString(), new ParseDatasetListTest()
|
||||
.expected().toString());
|
||||
}
|
||||
|
||||
public void testListDatasetsWhenResponseIs404() {
|
||||
HttpResponse listDatasetsResponse = HttpResponse.builder().statusCode(
|
||||
404).build();
|
||||
HttpResponse listDatasetsResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
SDCClient listDatasetsWhenNone = requestSendsResponse(listDatasets,
|
||||
listDatasetsResponse);
|
||||
SDCClient listDatasetsWhenNone = requestSendsResponse(listDatasets, listDatasetsResponse);
|
||||
|
||||
assertEquals(listDatasetsWhenNone.getDatasetClient().listDatasets(),
|
||||
ImmutableSet.of());
|
||||
assertEquals(listDatasetsWhenNone.getDatasetClient().listDatasets(), ImmutableSet.of());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
*/
|
||||
package org.jclouds.joyent.sdc.v6_5.features;
|
||||
|
||||
import static org.testng.AssertJUnit.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
import static org.testng.Assert.assertTrue;
|
||||
import static org.testng.AssertJUnit.assertEquals;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
|
@ -35,8 +35,7 @@ import org.testng.annotations.Test;
|
|||
public class DatasetClientLiveTest extends BaseSDCClientLiveTest {
|
||||
|
||||
public void testListDatasets() {
|
||||
Set<Dataset> datasets = sdcContext.getApi().getDatasetClient()
|
||||
.listDatasets();
|
||||
Set<Dataset> datasets = sdcContext.getApi().getDatasetClient().listDatasets();
|
||||
assertNotNull(datasets);
|
||||
assertTrue(datasets.size() > 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,34 +37,29 @@ import com.google.common.collect.ImmutableSet;
|
|||
*/
|
||||
@Test(groups = "unit", testName = "MachineClientExpectTest")
|
||||
public class MachineClientExpectTest extends BaseSDCClientExpectTest {
|
||||
HttpRequest listMachines = HttpRequest.builder().method("GET").endpoint(
|
||||
URI.create("https://api.joyentcloud.com/my/machines")).headers(
|
||||
ImmutableMultimap.<String, String> builder().put("X-Api-Version",
|
||||
"~6.5").put("Accept", "application/json").put(
|
||||
"Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==")
|
||||
HttpRequest listMachines = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint(URI.create("https://api.joyentcloud.com/my/machines"))
|
||||
.headers(
|
||||
ImmutableMultimap.<String, String> builder().put("X-Api-Version", "~6.5")
|
||||
.put("Accept", "application/json").put("Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==")
|
||||
.build()).build();
|
||||
|
||||
public void testListMachinesWhenResponseIs2xx() {
|
||||
HttpResponse listMachinesResponse = HttpResponse.builder()
|
||||
.statusCode(200).payload(
|
||||
payloadFromResource("/machine_list.json")).build();
|
||||
HttpResponse listMachinesResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/machine_list.json")).build();
|
||||
|
||||
SDCClient clientWhenMachinesExists = requestSendsResponse(listMachines,
|
||||
listMachinesResponse);
|
||||
SDCClient clientWhenMachinesExists = requestSendsResponse(listMachines, listMachinesResponse);
|
||||
|
||||
assertEquals(
|
||||
clientWhenMachinesExists.getMachineClient().listMachines(),
|
||||
new ParseMachineListTest().expected());
|
||||
assertEquals(clientWhenMachinesExists.getMachineClient().listMachines(), new ParseMachineListTest().expected());
|
||||
}
|
||||
|
||||
public void testListMachinesWhenResponseIs404() {
|
||||
HttpResponse listMachinesResponse = HttpResponse.builder().statusCode(
|
||||
404).build();
|
||||
HttpResponse listMachinesResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
SDCClient listMachinesWhenNone = requestSendsResponse(listMachines,
|
||||
listMachinesResponse);
|
||||
SDCClient listMachinesWhenNone = requestSendsResponse(listMachines, listMachinesResponse);
|
||||
|
||||
assertEquals(listMachinesWhenNone.getMachineClient().listMachines(),
|
||||
ImmutableSet.of());
|
||||
assertEquals(listMachinesWhenNone.getMachineClient().listMachines(), ImmutableSet.of());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
*/
|
||||
package org.jclouds.joyent.sdc.v6_5.features;
|
||||
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
import static org.testng.Assert.assertTrue;
|
||||
|
||||
import java.util.Set;
|
||||
|
|
@ -35,8 +35,7 @@ import org.testng.annotations.Test;
|
|||
public class MachineClientLiveTest extends BaseSDCClientLiveTest {
|
||||
|
||||
public void testListMachines() {
|
||||
Set<Machine> machines = sdcContext.getApi().getMachineClient()
|
||||
.listMachines();
|
||||
Set<Machine> machines = sdcContext.getApi().getMachineClient().listMachines();
|
||||
assertNotNull(machines);
|
||||
assertTrue(machines.size() > 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,34 +37,29 @@ import com.google.common.collect.ImmutableSet;
|
|||
*/
|
||||
@Test(groups = "unit", testName = "PackageClientExpectTest")
|
||||
public class PackageClientExpectTest extends BaseSDCClientExpectTest {
|
||||
HttpRequest listPackages = HttpRequest.builder().method("GET").endpoint(
|
||||
URI.create("https://api.joyentcloud.com/my/packages")).headers(
|
||||
ImmutableMultimap.<String, String> builder().put("X-Api-Version",
|
||||
"~6.5").put("Accept", "application/json").put(
|
||||
"Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==")
|
||||
HttpRequest listPackages = HttpRequest
|
||||
.builder()
|
||||
.method("GET")
|
||||
.endpoint(URI.create("https://api.joyentcloud.com/my/packages"))
|
||||
.headers(
|
||||
ImmutableMultimap.<String, String> builder().put("X-Api-Version", "~6.5")
|
||||
.put("Accept", "application/json").put("Authorization", "Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==")
|
||||
.build()).build();
|
||||
|
||||
public void testListPackagesWhenResponseIs2xx() {
|
||||
HttpResponse listPackagesResponse = HttpResponse.builder()
|
||||
.statusCode(200).payload(
|
||||
payloadFromResource("/package_list.json")).build();
|
||||
HttpResponse listPackagesResponse = HttpResponse.builder().statusCode(200)
|
||||
.payload(payloadFromResource("/package_list.json")).build();
|
||||
|
||||
SDCClient clientWhenPackagesExists = requestSendsResponse(listPackages,
|
||||
listPackagesResponse);
|
||||
SDCClient clientWhenPackagesExists = requestSendsResponse(listPackages, listPackagesResponse);
|
||||
|
||||
assertEquals(
|
||||
clientWhenPackagesExists.getPackageClient().listPackages(),
|
||||
new ParsePackageListTest().expected());
|
||||
assertEquals(clientWhenPackagesExists.getPackageClient().listPackages(), new ParsePackageListTest().expected());
|
||||
}
|
||||
|
||||
public void testListPackagesWhenResponseIs404() {
|
||||
HttpResponse listPackagesResponse = HttpResponse.builder().statusCode(
|
||||
404).build();
|
||||
HttpResponse listPackagesResponse = HttpResponse.builder().statusCode(404).build();
|
||||
|
||||
SDCClient listPackagesWhenNone = requestSendsResponse(listPackages,
|
||||
listPackagesResponse);
|
||||
SDCClient listPackagesWhenNone = requestSendsResponse(listPackages, listPackagesResponse);
|
||||
|
||||
assertEquals(listPackagesWhenNone.getPackageClient().listPackages(),
|
||||
ImmutableSet.of());
|
||||
assertEquals(listPackagesWhenNone.getPackageClient().listPackages(), ImmutableSet.of());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,9 +18,9 @@
|
|||
*/
|
||||
package org.jclouds.joyent.sdc.v6_5.features;
|
||||
|
||||
import static org.testng.AssertJUnit.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
import static org.testng.Assert.assertTrue;
|
||||
import static org.testng.AssertJUnit.assertEquals;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
|
@ -34,8 +34,7 @@ import org.testng.annotations.Test;
|
|||
public class PackageClientLiveTest extends BaseSDCClientLiveTest {
|
||||
|
||||
public void testListPackages() {
|
||||
Set<org.jclouds.joyent.sdc.v6_5.domain.Package> packages = sdcContext.getApi().getPackageClient()
|
||||
.listPackages();
|
||||
Set<org.jclouds.joyent.sdc.v6_5.domain.Package> packages = sdcContext.getApi().getPackageClient().listPackages();
|
||||
assertNotNull(packages);
|
||||
assertTrue(packages.size() > 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ import org.testng.annotations.Test;
|
|||
@Test(groups = "unit", testName = "SDCErrorHandlerTest")
|
||||
public class SDCErrorHandlerTest {
|
||||
|
||||
|
||||
private void assertCodeMakes(String method, URI uri, int statusCode, String message, String content,
|
||||
Class<? extends Exception> expected) {
|
||||
assertCodeMakes(method, uri, statusCode, message, "text/plain", content, expected);
|
||||
|
|
@ -87,5 +86,4 @@ public class SDCErrorHandlerTest {
|
|||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,27 +49,14 @@ public class ParseDatasetListTest extends BaseSetParserTest<Dataset> {
|
|||
@Override
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public Set<Dataset> expected() {
|
||||
return ImmutableSet
|
||||
.of(
|
||||
Dataset
|
||||
.builder()
|
||||
.id("e4cd7b9e-4330-11e1-81cf-3bb50a972bda")
|
||||
.name("centos-6")
|
||||
.urn("sdc:sdc:centos-6:1.0.1")
|
||||
.type(Type.VIRTUALMACHINE)
|
||||
.version("1.0.1")
|
||||
.defaultDataset(false)
|
||||
return ImmutableSet.of(
|
||||
Dataset.builder().id("e4cd7b9e-4330-11e1-81cf-3bb50a972bda").name("centos-6").urn("sdc:sdc:centos-6:1.0.1")
|
||||
.type(Type.VIRTUALMACHINE).version("1.0.1").isDefault(false)
|
||||
.created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-02-13T06:30:33+00:00"))
|
||||
.build(),
|
||||
|
||||
Dataset
|
||||
.builder()
|
||||
.id("e62c30b4-cdda-11e0-9dd4-af4d032032e3")
|
||||
.name("nodejs")
|
||||
.urn("sdc:sdc:nodejs:1.2.3")
|
||||
.type(Type.SMARTMACHINE)
|
||||
.version("1.2.3")
|
||||
.defaultDataset(false)
|
||||
Dataset.builder().id("e62c30b4-cdda-11e0-9dd4-af4d032032e3").name("nodejs").urn("sdc:sdc:nodejs:1.2.3")
|
||||
.type(Type.SMARTMACHINE).version("1.2.3").isDefault(false)
|
||||
.created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-09-15T08:15:29+00:00"))
|
||||
.build()
|
||||
|
||||
|
|
|
|||
|
|
@ -43,20 +43,12 @@ public class ParseDatasetTest extends BaseItemParserTest<Dataset> {
|
|||
return "/dataset.json";
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public Dataset expected() {
|
||||
return Dataset
|
||||
.builder()
|
||||
.id("e4cd7b9e-4330-11e1-81cf-3bb50a972bda")
|
||||
.name("centos-6")
|
||||
.urn("sdc:sdc:centos-6:1.0.1")
|
||||
.type(Type.VIRTUALMACHINE)
|
||||
.version("1.0.1")
|
||||
.defaultDataset(false)
|
||||
.created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-02-13T06:30:33+00:00"))
|
||||
.build();
|
||||
return Dataset.builder().id("e4cd7b9e-4330-11e1-81cf-3bb50a972bda").name("centos-6")
|
||||
.urn("sdc:sdc:centos-6:1.0.1").type(Type.VIRTUALMACHINE).version("1.0.1").isDefault(false)
|
||||
.created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-02-13T06:30:33+00:00")).build();
|
||||
}
|
||||
|
||||
protected Injector injector() {
|
||||
|
|
|
|||
|
|
@ -50,8 +50,7 @@ public class ParseMachineListTest extends BaseSetParserTest<Machine> {
|
|||
@Override
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public Set<Machine> expected() {
|
||||
return ImmutableSet
|
||||
.of(
|
||||
return ImmutableSet.of(
|
||||
Machine
|
||||
.builder()
|
||||
.id("94eba336-ecb7-49f5-8a27-52f5e4dd57a1")
|
||||
|
|
@ -59,48 +58,22 @@ public class ParseMachineListTest extends BaseSetParserTest<Machine> {
|
|||
.type(Type.VIRTUALMACHINE)
|
||||
.state(Machine.State.RUNNING)
|
||||
.dataset("sdc:sdc:centos-5.7:1.2.1")
|
||||
.ips(
|
||||
ImmutableSet.<String> builder().add(
|
||||
"37.153.96.62").add(
|
||||
"10.224.0.63").build())
|
||||
.ips(ImmutableSet.<String> builder().add("37.153.96.62").add("10.224.0.63").build())
|
||||
.memorySizeMb(1024)
|
||||
.diskSizeGb(61440)
|
||||
.metadata(
|
||||
ImmutableMap
|
||||
.<String, String> builder()
|
||||
.put("root_authorized_keys",
|
||||
"ssh-rsa XXXXXX== test@xxxx.ovh.net\n")
|
||||
.build())
|
||||
.created(
|
||||
new SimpleDateFormatDateService()
|
||||
.iso8601SecondsDateParse("2012-05-09T13:32:46+00:00"))
|
||||
.updated(
|
||||
new SimpleDateFormatDateService()
|
||||
.iso8601SecondsDateParse("2012-05-11T09:00:33+00:00"))
|
||||
ImmutableMap.<String, String> builder()
|
||||
.put("root_authorized_keys", "ssh-rsa XXXXXX== test@xxxx.ovh.net\n").build())
|
||||
.created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-05-09T13:32:46+00:00"))
|
||||
.updated(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-05-11T09:00:33+00:00"))
|
||||
.build(),
|
||||
|
||||
Machine
|
||||
.builder()
|
||||
.id("d73cb0b0-7d1f-44ef-8c40-e040eef0f726")
|
||||
.name("testJClouds2")
|
||||
.type(Type.SMARTMACHINE)
|
||||
.state(Machine.State.RUNNING)
|
||||
.dataset("sdc:sdc:smartosplus:3.1.0")
|
||||
.ips(
|
||||
ImmutableSet.<String> builder().add(
|
||||
"37.153.96.56").add(
|
||||
"10.224.0.57").build())
|
||||
.memorySizeMb(1024)
|
||||
.diskSizeGb(61440)
|
||||
.metadata(
|
||||
ImmutableMap
|
||||
.<String, String> of())
|
||||
.created(
|
||||
new SimpleDateFormatDateService()
|
||||
.iso8601SecondsDateParse("2012-05-09T13:39:43+00:00"))
|
||||
.updated(
|
||||
new SimpleDateFormatDateService()
|
||||
.iso8601SecondsDateParse("2012-05-09T13:43:45+00:00"))
|
||||
Machine.builder().id("d73cb0b0-7d1f-44ef-8c40-e040eef0f726").name("testJClouds2").type(Type.SMARTMACHINE)
|
||||
.state(Machine.State.RUNNING).dataset("sdc:sdc:smartosplus:3.1.0")
|
||||
.ips(ImmutableSet.<String> builder().add("37.153.96.56").add("10.224.0.57").build())
|
||||
.memorySizeMb(1024).diskSizeGb(61440).metadata(ImmutableMap.<String, String> of())
|
||||
.created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-05-09T13:39:43+00:00"))
|
||||
.updated(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-05-09T13:43:45+00:00"))
|
||||
.build()
|
||||
|
||||
);
|
||||
|
|
|
|||
|
|
@ -55,13 +55,14 @@ public class ParseMachineTest extends BaseItemParserTest<Machine> {
|
|||
.type(Type.VIRTUALMACHINE)
|
||||
.state(Machine.State.STOPPED)
|
||||
.dataset("sdc:sdc:centos-5.7:1.2.1")
|
||||
.ips(ImmutableSet. <String>builder().add("37.153.96.62").add("10.224.0.63").build())
|
||||
.ips(ImmutableSet.<String> builder().add("37.153.96.62").add("10.224.0.63").build())
|
||||
.memorySizeMb(1024)
|
||||
.diskSizeGb(61440)
|
||||
.metadata(ImmutableMap. <String,String>builder().put("root_authorized_keys","ssh-rsa XXXXXX== test@xxxx.ovh.net\n").build())
|
||||
.metadata(
|
||||
ImmutableMap.<String, String> builder()
|
||||
.put("root_authorized_keys", "ssh-rsa XXXXXX== test@xxxx.ovh.net\n").build())
|
||||
.created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-05-09T13:32:46+00:00"))
|
||||
.updated(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-05-11T08:44:53+00:00"))
|
||||
.build();
|
||||
.updated(new SimpleDateFormatDateService().iso8601SecondsDateParse("2012-05-11T08:44:53+00:00")).build();
|
||||
}
|
||||
|
||||
protected Injector injector() {
|
||||
|
|
|
|||
|
|
@ -47,25 +47,11 @@ public class ParsePackageListTest extends BaseSetParserTest<Package> {
|
|||
@Override
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public Set<Package> expected() {
|
||||
return ImmutableSet
|
||||
.of(
|
||||
org.jclouds.joyent.sdc.v6_5.domain.Package
|
||||
.builder()
|
||||
.name("Small 1GB")
|
||||
.memorySizeMb(1024)
|
||||
.diskSizeGb(30720)
|
||||
.swapSizeMb(2048)
|
||||
.isDefault(true)
|
||||
.build(),
|
||||
return ImmutableSet.of(org.jclouds.joyent.sdc.v6_5.domain.Package.builder().name("Small 1GB").memorySizeMb(1024)
|
||||
.diskSizeGb(30720).swapSizeMb(2048).isDefault(true).build(),
|
||||
|
||||
org.jclouds.joyent.sdc.v6_5.domain.Package
|
||||
.builder()
|
||||
.name("Medium 2GB")
|
||||
.memorySizeMb(2048)
|
||||
.diskSizeGb(61440)
|
||||
.swapSizeMb(4096)
|
||||
.isDefault(false)
|
||||
.build()
|
||||
org.jclouds.joyent.sdc.v6_5.domain.Package.builder().name("Medium 2GB").memorySizeMb(2048).diskSizeGb(61440)
|
||||
.swapSizeMb(4096).isDefault(false).build()
|
||||
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,18 +40,11 @@ public class ParsePackageTest extends BaseItemParserTest<org.jclouds.joyent.sdc.
|
|||
return "/package.json";
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Consumes(MediaType.APPLICATION_JSON)
|
||||
public org.jclouds.joyent.sdc.v6_5.domain.Package expected() {
|
||||
return org.jclouds.joyent.sdc.v6_5.domain.Package
|
||||
.builder()
|
||||
.name("Small 1GB")
|
||||
.memorySizeMb(1024)
|
||||
.diskSizeGb(30720)
|
||||
.swapSizeMb(2048)
|
||||
.isDefault(true)
|
||||
.build();
|
||||
return org.jclouds.joyent.sdc.v6_5.domain.Package.builder().name("Small 1GB").memorySizeMb(1024)
|
||||
.diskSizeGb(30720).swapSizeMb(2048).isDefault(true).build();
|
||||
}
|
||||
|
||||
protected Injector injector() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue