refactoring attachVolume operation
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ef4ee401 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ef4ee401 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ef4ee401 Branch: refs/heads/master Commit: ef4ee4015f51097eafa1a1dbb6cecd3fae76f1fc Parents: 6b561b2 Author: Nirmal Fernando <[email protected]> Authored: Tue Feb 11 17:44:40 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Feb 11 17:44:40 2014 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java | 4 ++-- .../stratos/cloud/controller/iaases/OpenstackNovaIaas.java | 4 ++-- .../org/apache/stratos/cloud/controller/iaases/VCloudIaas.java | 2 +- .../org/apache/stratos/cloud/controller/interfaces/Iaas.java | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ef4ee401/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java index 5796ed5..aec86e9 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java @@ -418,7 +418,7 @@ public class AWSEC2Iaas extends Iaas { } @Override - public String attachVolume(String instanceId, String volumeId) { + public String attachVolume(String instanceId, String volumeId, String deviceName) { IaasProvider iaasInfo = getIaasProvider(); ComputeServiceContext context = iaasInfo.getComputeService() @@ -426,7 +426,7 @@ public class AWSEC2Iaas extends Iaas { String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo); String zone = ComputeServiceBuilderUtil.extractZone(iaasInfo); - String device = ComputeServiceBuilderUtil.extractDevice(iaasInfo, "/dev/sdh"); + String device = deviceName == null ? "/dev/sdh" : deviceName; if(region == null || zone == null) { log.fatal("Cannot attach the volume [id]: "+volumeId+" in the [region] : "+region http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ef4ee401/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java index de1b258..0c7da61 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/OpenstackNovaIaas.java @@ -408,14 +408,14 @@ public class OpenstackNovaIaas extends Iaas { } @Override - public String attachVolume(String instanceId, String volumeId) { + public String attachVolume(String instanceId, String volumeId, String deviceName) { IaasProvider iaasInfo = getIaasProvider(); ComputeServiceContext context = iaasInfo.getComputeService() .getContext(); String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo); - String device = ComputeServiceBuilderUtil.extractDevice(iaasInfo, "/dev/vdc"); + String device = deviceName == null ? "/dev/vdc" : deviceName; if(region == null) { log.fatal("Cannot attach the volume [id]: "+volumeId+" in the [region] : "+region http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ef4ee401/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java index 852bc30..bbc6951 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/VCloudIaas.java @@ -218,7 +218,7 @@ public class VCloudIaas extends Iaas { } @Override - public String attachVolume(String instanceId, String volumeId) { + public String attachVolume(String instanceId, String volumeId, String deviceName) { // TODO Auto-generated method stub return null; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ef4ee401/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java index c66844f..dfd15c8 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/interfaces/Iaas.java @@ -138,9 +138,10 @@ public abstract class Iaas { * Attach a given volume to an instance at the specified device path. * @param instanceId of the instance. * @param volumeId volume id of the volume to be attached. + * @param deviceName name of the device that the volume would bind to. * @return the status of the attachment. */ - public abstract String attachVolume(String instanceId, String volumeId); + public abstract String attachVolume(String instanceId, String volumeId, String deviceName); /** * Detach a given volume from the given instance.
