Repository: jclouds-examples Updated Branches: refs/heads/master 4db8e78c2 -> 22c5bdffe
Updated Rackspace examples for 1.8.0 Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/22c5bdff Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/22c5bdff Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/22c5bdff Branch: refs/heads/master Commit: 22c5bdffe92c6cc0494d61edb356fce6b1c69593 Parents: 4db8e78 Author: Everett Toews <[email protected]> Authored: Sun Aug 17 22:29:15 2014 +0100 Committer: Everett Toews <[email protected]> Committed: Sun Aug 17 22:29:15 2014 +0100 ---------------------------------------------------------------------- rackspace/pom.xml | 4 ++-- .../cloudblockstorage/CreateVolumeAndAttach.java | 13 +++++-------- .../rackspace/cloudblockstorage/DetachVolume.java | 10 ++++------ .../rackspace/cloudfiles/CloudFilesPublish.java | 1 - .../examples/rackspace/cloudfiles/GenerateTempURL.java | 3 +-- .../rackspace/cloudfiles/UploadDirectoryToCDN.java | 2 +- .../rackspace/cloudfiles/UploadLargeObject.java | 2 +- .../examples/rackspace/cloudfiles/UploadObjects.java | 2 +- .../cloudservers/CreateServerWithKeyPair.java | 12 +++++------- .../rackspace/cloudservers/ServerMetadata.java | 12 +++++------- 10 files changed, 25 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace/pom.xml b/rackspace/pom.xml index 939bf52..4264d08 100644 --- a/rackspace/pom.xml +++ b/rackspace/pom.xml @@ -22,11 +22,11 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.jclouds.examples</groupId> <artifactId>rackspace-examples</artifactId> - <version>1.7.4-SNAPSHOT</version> + <version>1.8.0</version> <name>rackspace-examples</name> <properties> - <jclouds.version>1.7.3</jclouds.version> + <jclouds.version>1.8.0</jclouds.version> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java index e96fc33..82cb073 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java @@ -48,11 +48,9 @@ import org.jclouds.openstack.cinder.v1.features.VolumeApi; import org.jclouds.openstack.cinder.v1.options.CreateVolumeOptions; import org.jclouds.openstack.cinder.v1.predicates.VolumePredicates; import org.jclouds.openstack.nova.v2_0.NovaApi; -import org.jclouds.openstack.nova.v2_0.NovaAsyncApi; import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment; import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId; import org.jclouds.openstack.nova.v2_0.extensions.VolumeAttachmentApi; -import org.jclouds.rest.RestContext; import org.jclouds.scriptbuilder.ScriptBuilder; import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.sshj.config.SshjSshClientModule; @@ -67,7 +65,7 @@ import com.google.inject.Module; */ public class CreateVolumeAndAttach implements Closeable { private final ComputeService computeService; - private final RestContext<NovaApi, NovaAsyncApi> nova; + private final NovaApi novaApi; private final VolumeAttachmentApi volumeAttachmentApi; private final CinderApi cinderApi; @@ -114,8 +112,8 @@ public class CreateVolumeAndAttach implements Closeable { .overrides(overrides) .buildView(ComputeServiceContext.class); computeService = context.getComputeService(); - nova = context.unwrap(); - volumeAttachmentApi = nova.getApi().getVolumeAttachmentExtensionForZone(ZONE).get(); + novaApi = context.unwrapApi(NovaApi.class); + volumeAttachmentApi = novaApi.getVolumeAttachmentExtensionForZone(ZONE).get(); cinderApi = ContextBuilder.newBuilder(PROVIDER) .credentials(username, apiKey) @@ -138,8 +136,7 @@ public class CreateVolumeAndAttach implements Closeable { String publicAddress = nodeMetadata.getPublicAddresses().iterator().next(); // We set the password to something we know so we can login in the DetachVolume example - nova.getApi().getServerApiForZone(ZONE) - .changeAdminPass(nodeMetadata.getProviderId(), PASSWORD); + novaApi.getServerApiForZone(ZONE).changeAdminPass(nodeMetadata.getProviderId(), PASSWORD); System.out.format(" %s%n", nodeMetadata); System.out.format(" Login: ssh %s@%s%n", nodeMetadata.getCredentials().getUser(), publicAddress); @@ -152,7 +149,7 @@ public class CreateVolumeAndAttach implements Closeable { CreateVolumeOptions options = CreateVolumeOptions.Builder .name(NAME) .volumeType("SSD") - .metadata(ImmutableMap.<String, String> of("key1", "value1")); + .metadata(ImmutableMap.of("key1", "value1")); System.out.format("Create Volume%n"); http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java index a1f3f33..41478f4 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java @@ -39,13 +39,11 @@ import org.jclouds.openstack.cinder.v1.domain.Volume; import org.jclouds.openstack.cinder.v1.features.VolumeApi; import org.jclouds.openstack.cinder.v1.predicates.VolumePredicates; import org.jclouds.openstack.nova.v2_0.NovaApi; -import org.jclouds.openstack.nova.v2_0.NovaAsyncApi; import org.jclouds.openstack.nova.v2_0.domain.Server; import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment; import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId; import org.jclouds.openstack.nova.v2_0.extensions.VolumeAttachmentApi; import org.jclouds.openstack.nova.v2_0.features.ServerApi; -import org.jclouds.rest.RestContext; import org.jclouds.scriptbuilder.ScriptBuilder; import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.sshj.config.SshjSshClientModule; @@ -60,7 +58,7 @@ import com.google.inject.Module; */ public class DetachVolume implements Closeable { private final ComputeService computeService; - private final RestContext<NovaApi, NovaAsyncApi> nova; + private final NovaApi novaApi; private final ServerApi serverApi; private final VolumeAttachmentApi volumeAttachmentApi; @@ -102,9 +100,9 @@ public class DetachVolume implements Closeable { .modules(modules) .buildView(ComputeServiceContext.class); computeService = context.getComputeService(); - nova = context.unwrap(); - serverApi = nova.getApi().getServerApiForZone(ZONE); - volumeAttachmentApi = nova.getApi().getVolumeAttachmentExtensionForZone(ZONE).get(); + novaApi = context.unwrapApi(NovaApi.class); + serverApi = novaApi.getServerApiForZone(ZONE); + volumeAttachmentApi = novaApi.getVolumeAttachmentExtensionForZone(ZONE).get(); cinderApi = ContextBuilder.newBuilder(PROVIDER) .credentials(username, apiKey) http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java index c0e6288..41c4466 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/CloudFilesPublish.java @@ -36,7 +36,6 @@ import org.jclouds.io.Payload; import org.jclouds.io.Payloads; import org.jclouds.openstack.swift.v1.features.ObjectApi; import org.jclouds.openstack.swift.v1.options.CreateContainerOptions; -import org.jclouds.openstack.swift.v1.reference.SwiftHeaders; import org.jclouds.rackspace.cloudfiles.v1.CloudFilesApi; import org.jclouds.rackspace.cloudfiles.v1.features.CDNApi; http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java index 5f6148a..a663e1c 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/GenerateTempURL.java @@ -23,7 +23,6 @@ import com.google.common.io.Closeables; import com.google.common.io.Files; import org.jclouds.ContextBuilder; import org.jclouds.blobstore.BlobStore; -import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.domain.Blob; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; @@ -89,7 +88,7 @@ public class GenerateTempURL implements Closeable { blobStoreContext = ContextBuilder.newBuilder(PROVIDER) .credentials(username, apiKey) .buildView(RegionScopedBlobStoreContext.class); - blobStore = blobStoreContext.blobStoreInRegion(REGION); + blobStore = blobStoreContext.getBlobStore(REGION); } private void generatePutTempURL() throws IOException { http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java index c6f32e6..98eb2b1 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadDirectoryToCDN.java @@ -93,7 +93,7 @@ public class UploadDirectoryToCDN implements Closeable { RegionScopedBlobStoreContext context = ContextBuilder.newBuilder(PROVIDER) .credentials(username, apiKey) .buildView(RegionScopedBlobStoreContext.class); - blobStore = context.blobStoreInRegion(REGION); + blobStore = context.getBlobStore(REGION); cloudFiles = blobStore.getContext().unwrapApi(CloudFilesApi.class); } http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadLargeObject.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadLargeObject.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadLargeObject.java index 980a0f6..3b68f80 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadLargeObject.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadLargeObject.java @@ -78,7 +78,7 @@ public class UploadLargeObject implements Closeable { .credentials(username, apiKey) .overrides(overrides) .buildView(RegionScopedBlobStoreContext.class); - blobStore = context.blobStoreInRegion(REGION); + blobStore = context.getBlobStore(REGION); } /** http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java index 3e62a2b..433fcb5 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/UploadObjects.java @@ -74,7 +74,7 @@ public class UploadObjects implements Closeable { public UploadObjects(String username, String apiKey) { ContextBuilder builder = ContextBuilder.newBuilder(PROVIDER) .credentials(username, apiKey); - blobStore = builder.buildView(RegionScopedBlobStoreContext.class).blobStoreInRegion(REGION); + blobStore = builder.buildView(RegionScopedBlobStoreContext.class).getBlobStore(REGION); cloudFiles = blobStore.getContext().unwrapApi(CloudFilesApi.class); } http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java index b8e805b..1fc0be4 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java @@ -42,12 +42,10 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; import org.jclouds.compute.options.RunScriptOptions; import org.jclouds.openstack.nova.v2_0.NovaApi; -import org.jclouds.openstack.nova.v2_0.NovaAsyncApi; import org.jclouds.openstack.nova.v2_0.compute.options.NovaTemplateOptions; import org.jclouds.openstack.nova.v2_0.domain.KeyPair; import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId; import org.jclouds.openstack.nova.v2_0.extensions.KeyPairApi; -import org.jclouds.rest.RestContext; import org.jclouds.scriptbuilder.ScriptBuilder; import org.jclouds.scriptbuilder.domain.OsFamily; import org.jclouds.sshj.config.SshjSshClientModule; @@ -68,7 +66,7 @@ import com.google.inject.Module; */ public class CreateServerWithKeyPair implements Closeable { private final ComputeService computeService; - private final RestContext<NovaApi, NovaAsyncApi> novaContext; + private final NovaApi novaApi; private final File keyPairFile = new File(NAME + ".pem"); @@ -115,7 +113,7 @@ public class CreateServerWithKeyPair implements Closeable { .buildView(ComputeServiceContext.class); computeService = context.getComputeService(); - novaContext = context.unwrap(); + novaApi = context.unwrapApi(NovaApi.class); } /** @@ -124,7 +122,7 @@ public class CreateServerWithKeyPair implements Closeable { * This method is not necessary and is here for demonstration purposes only. */ private void detectKeyPairExtension() { - Optional<? extends KeyPairApi> keyPairApiExtension = novaContext.getApi().getKeyPairExtensionForZone(ZONE); + Optional<? extends KeyPairApi> keyPairApiExtension = novaApi.getKeyPairExtensionForZone(ZONE); if (keyPairApiExtension.isPresent()) { System.out.format(" Key Pair Extension Present%n"); @@ -143,7 +141,7 @@ public class CreateServerWithKeyPair implements Closeable { private KeyPair createKeyPair() throws IOException { System.out.format(" Create Key Pair%n"); - KeyPairApi keyPairApi = novaContext.getApi().getKeyPairExtensionForZone(ZONE).get(); + KeyPairApi keyPairApi = novaApi.getKeyPairExtensionForZone(ZONE).get(); KeyPair keyPair = keyPairApi.create(NAME); Files.write(keyPair.getPrivateKey(), keyPairFile, UTF_8); @@ -211,7 +209,7 @@ public class CreateServerWithKeyPair implements Closeable { private void deleteKeyPair(KeyPair keyPair) { System.out.format(" Delete Key Pair%n"); - KeyPairApi keyPairApi = novaContext.getApi().getKeyPairExtensionForZone(ZONE).get(); + KeyPairApi keyPairApi = novaApi.getKeyPairExtensionForZone(ZONE).get(); keyPairApi.delete(keyPair.getName()); if (keyPairFile.delete()) { http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/22c5bdff/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java index d5c5b06..a25b27f 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java @@ -30,10 +30,8 @@ import org.jclouds.ContextBuilder; import org.jclouds.compute.ComputeService; import org.jclouds.compute.ComputeServiceContext; import org.jclouds.openstack.nova.v2_0.NovaApi; -import org.jclouds.openstack.nova.v2_0.NovaAsyncApi; import org.jclouds.openstack.nova.v2_0.domain.Server; import org.jclouds.openstack.nova.v2_0.features.ServerApi; -import org.jclouds.rest.RestContext; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; @@ -45,7 +43,7 @@ import com.google.common.io.Closeables; */ public class ServerMetadata implements Closeable { private final ComputeService computeService; - private final RestContext<NovaApi, NovaAsyncApi> nova; + private final NovaApi novaApi; private final ServerApi serverApi; /** @@ -77,8 +75,8 @@ public class ServerMetadata implements Closeable { .credentials(username, apiKey) .buildView(ComputeServiceContext.class); computeService = context.getComputeService(); - nova = context.unwrap(); - serverApi = nova.getApi().getServerApiForZone(ZONE); + novaApi = context.unwrapApi(NovaApi.class); + serverApi = novaApi.getServerApiForZone(ZONE); } /** @@ -99,7 +97,7 @@ public class ServerMetadata implements Closeable { private void setMetadata(Server server) { System.out.format("Set Metadata%n"); - ImmutableMap<String, String> metadata = ImmutableMap.<String, String> of( + ImmutableMap<String, String> metadata = ImmutableMap.of( "key1", "value1", "key2", "value2", "key3", "value3"); @@ -111,7 +109,7 @@ public class ServerMetadata implements Closeable { private void updateMetadata(Server server) { System.out.format("Udpate Metadata%n"); - ImmutableMap<String, String> metadata = ImmutableMap.<String, String> of("key2", "new-value2"); + ImmutableMap<String, String> metadata = ImmutableMap.of("key2", "new-value2"); Map<String, String> responseMetadata = serverApi.updateMetadata(server.getId(), metadata); System.out.format(" %s%n", responseMetadata);
