From a05e2d55c296e99efa209ad9ac6eb60317b83e47 Mon Sep 17 00:00:00 2001 From: Jason King Date: Tue, 11 Oct 2011 17:48:45 +0100 Subject: [PATCH] Cloudsigma: Fixed documentation links, plus LiveTest for rename a VLAN which works now --- .../cloudsigma/CloudSigmaAsyncClient.java | 2 +- .../cloudsigma/CloudSigmaClientLiveTest.java | 56 +++++++------------ .../CloudSigmaLasVegasProviderMetadata.java | 2 +- 3 files changed, 22 insertions(+), 38 deletions(-) diff --git a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java index 5ff17d4207..5e118373d2 100644 --- a/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java +++ b/apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/CloudSigmaAsyncClient.java @@ -70,7 +70,7 @@ import com.google.common.util.concurrent.ListenableFuture; *

* * @see CloudSigmaClient - * @see + * @see * @author Adrian Cole */ @RequestFilters(BasicAuthentication.class) diff --git a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java index fcfa510892..1727e586e3 100644 --- a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java +++ b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/CloudSigmaClientLiveTest.java @@ -18,31 +18,15 @@ */ package org.jclouds.cloudsigma; -import static com.google.common.base.Preconditions.checkNotNull; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.io.IOException; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.logging.Logger; - +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.gson.Gson; +import com.google.inject.Guice; +import com.google.inject.Module; import org.jclouds.Constants; -import org.jclouds.cloudsigma.domain.ClaimType; -import org.jclouds.cloudsigma.domain.CreateDriveRequest; -import org.jclouds.cloudsigma.domain.DriveData; -import org.jclouds.cloudsigma.domain.DriveInfo; -import org.jclouds.cloudsigma.domain.DriveStatus; -import org.jclouds.cloudsigma.domain.DriveType; -import org.jclouds.cloudsigma.domain.IDEDevice; -import org.jclouds.cloudsigma.domain.Model; -import org.jclouds.cloudsigma.domain.ProfileInfo; -import org.jclouds.cloudsigma.domain.Server; -import org.jclouds.cloudsigma.domain.ServerInfo; -import org.jclouds.cloudsigma.domain.ServerStatus; -import org.jclouds.cloudsigma.domain.StaticIPInfo; -import org.jclouds.cloudsigma.domain.VLANInfo; +import org.jclouds.cloudsigma.domain.*; import org.jclouds.cloudsigma.options.CloneDriveOptions; import org.jclouds.cloudsigma.predicates.DriveClaimed; import org.jclouds.cloudsigma.util.Servers; @@ -60,13 +44,15 @@ import org.testng.annotations.AfterGroups; import org.testng.annotations.BeforeGroups; import org.testng.annotations.Test; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.gson.Gson; -import com.google.inject.Guice; -import com.google.inject.Module; +import java.io.IOException; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.logging.Logger; + +import static com.google.common.base.Preconditions.checkNotNull; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; /** * Tests behavior of {@code CloudSigmaClient} @@ -273,11 +259,9 @@ public class CloudSigmaClientLiveTest { vlan = client.getVLANInfo(vlan.getUuid()); assertEquals(vlan.getName(), prefix); - vlan = client.renameVLAN(vlan.getUuid(), prefix + "2"); - // test that rename didn't work :) - assertEquals(vlan.getName(), prefix); - vlan = client.getVLANInfo(vlan.getUuid()); - assertEquals(vlan.getName(), prefix); + String prefix2 = prefix + "2"; + vlan = client.renameVLAN(vlan.getUuid(), prefix2); + assertEquals(vlan.getName(),prefix2); } finally { client.destroyVLAN(id); } diff --git a/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java b/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java index ddc634be93..7b65ecae0a 100644 --- a/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java +++ b/providers/cloudsigma-lvs/src/main/java/org/jclouds/cloudsigma/CloudSigmaLasVegasProviderMetadata.java @@ -93,7 +93,7 @@ public class CloudSigmaLasVegasProviderMetadata extends BaseProviderMetadata { */ @Override public URI getApiDocumentation() { - return URI.create("http://lvs.cloudsigma.com/en/platform-details/the-api"); + return URI.create("http://cloudsigma.com/en/platform-details/the-api"); } /**