Repository: stratos Updated Branches: refs/heads/master ba95cf3d1 -> b23a9c70a
Removing unused code. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b23a9c70 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b23a9c70 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b23a9c70 Branch: refs/heads/master Commit: b23a9c70a7fde254d7f93e89eb8e8618b21362b5 Parents: 4203d59 Author: Nirmal Fernando <[email protected]> Authored: Sun Oct 19 17:45:51 2014 +0200 Committer: Nirmal Fernando <[email protected]> Committed: Sun Oct 19 17:47:35 2014 +0200 ---------------------------------------------------------------------- .../org/apache/stratos/cloud/controller/iaases/GCEIaas.java | 9 --------- 1 file changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b23a9c70/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/GCEIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/GCEIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/GCEIaas.java index 78588df..4fc4db4 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/GCEIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/GCEIaas.java @@ -18,11 +18,8 @@ */ package org.apache.stratos.cloud.controller.iaases; -import java.io.File; -import java.io.IOException; import java.util.*; -import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.stratos.cloud.controller.exception.CloudControllerException; @@ -41,7 +38,6 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.compute.options.TemplateOptions; -import org.wso2.carbon.utils.CarbonUtils; import org.jclouds.domain.Location; import org.apache.stratos.cloud.controller.util.CloudControllerConstants; import org.jclouds.collect.IterableWithMarker; @@ -110,10 +106,6 @@ public class GCEIaas extends Iaas { // set image id specified templateBuilder.imageId(iaasInfo.getImage()); - if(!(iaasInfo instanceof IaasProvider)) { - templateBuilder.locationId(iaasInfo.getType()); - } - String zone = iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE); if(zone != null) { Set<? extends Location> locations = iaasInfo.getComputeService().listAssignableLocations(); @@ -366,7 +358,6 @@ public class GCEIaas extends Iaas { @Override public void detachVolume(String instanceId, String volumeId) { - DiskApi diskApi = getGCEDiskApi(); InstanceApi instApi = getGCEInstanceApi(); String zone = getZone(); Instance inst = instApi.getInZone(zone, instanceId);
