- CLOUDSTACK-3229: Passes the bucket name as "bucket" into the s3xen

jburwell · jburwell · commit ceed15242656 · 2013-07-31T09:58:22.000-04:00
plugin
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -7388,7 +7388,7 @@ private boolean backupSnapshotToS3(final Connection connection,
                     serializeProperties(s3, S3Utils.ClientOptions.class));
             parameters.addAll(Arrays.asList("operation", "put", "directory",
                     dir, "filename", filename, "iSCSIFlag",
-                    iSCSIFlag.toString(), "key", key));
+                    iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", key));
             final String result = callHostPluginAsync(connection, "s3xen",
                     "s3", wait,
                     parameters.toArray(new String[parameters.size()]));
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
@@ -1129,7 +1129,7 @@ private boolean backupSnapshotToS3(final Connection connection,
                     serializeProperties(s3, S3Utils.ClientOptions.class));
             parameters.addAll(Arrays.asList("operation", "put", "directory",
                     dir, "filename", filename, "iSCSIFlag",
-                    iSCSIFlag.toString(), "key", key));
+                    iSCSIFlag.toString(), "bucket", s3.getBucketName(), "key", key));
             final String result = hypervisorResource.callHostPluginAsync(connection, "s3xen",
                     "s3", wait,
                     parameters.toArray(new String[parameters.size()]));
