Repository: stratos Updated Branches: refs/heads/master d69791a63 -> 5b5f13520
Fixing sonar reported issues for OpenstackNovaIaaS class. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f6d1eea7 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f6d1eea7 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f6d1eea7 Branch: refs/heads/master Commit: f6d1eea780358fa409811c27e6c4c2a84963008c Parents: d69791a Author: Nirmal Fernando <[email protected]> Authored: Mon Oct 6 09:21:27 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Mon Oct 6 09:21:27 2014 +0530 ---------------------------------------------------------------------- .../controller/iaases/OpenstackNovaIaas.java | 21 +++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/f6d1eea7/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 caa7816..b77be8a 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 @@ -103,9 +103,6 @@ public class OpenstackNovaIaas extends Iaas { TemplateBuilder templateBuilder = iaasInfo.getComputeService() .templateBuilder(); templateBuilder.imageId(iaasInfo.getImage()); - if(!(iaasInfo instanceof IaasProvider)) { - templateBuilder.locationId(iaasInfo.getType()); - } // to avoid creation of template objects in each and every time, we // create all at once! @@ -516,11 +513,17 @@ public class OpenstackNovaIaas extends Iaas { @Override public String createVolume(int sizeGB, String snapshotId) { IaasProvider iaasInfo = getIaasProvider(); + + if (iaasInfo == null) { + log.fatal(String.format("Cannot create a new volume with snapshot ID : %s", snapshotId)); + return null; + } + String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo); String zone = ComputeServiceBuilderUtil.extractZone(iaasInfo); - if (region == null || iaasInfo == null) { - log.fatal(String.format("Cannot create a new volume in the [region] : %s of Iaas : %s", region, iaasInfo)); + if (region == null) { + log.fatal(String.format("Cannot create a new volume. Extracted region is null for Iaas : %s", iaasInfo)); return null; } ComputeServiceContext context = iaasInfo.getComputeService().getContext(); @@ -567,7 +570,7 @@ public class OpenstackNovaIaas extends Iaas { } private boolean waitForStatus(String volumeId, Volume.Status expectedStatus, int timeoutInMins) throws TimeoutException { - long timeout = 1000 * 60 * timeoutInMins; + int timeout = 1000 * 60 * timeoutInMins; long timout = System.currentTimeMillis() + timeout; IaasProvider iaasInfo = getIaasProvider(); @@ -620,7 +623,7 @@ public class OpenstackNovaIaas extends Iaas { String device = deviceName == null ? "/dev/vdc" : deviceName; if (region == null) { - log.fatal(String.format("Cannot attach the volume [id]: %s in the [region] : %s of Iaas : %s", volumeId, region, iaasInfo)); + log.fatal(String.format("Cannot attach the volume [id]: %s. Extracted region is null for Iaas : %s", volumeId, iaasInfo)); return null; } @@ -686,7 +689,7 @@ public class OpenstackNovaIaas extends Iaas { String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo); if(region == null) { - log.fatal(String.format("Cannot detach the volume [id]: %s from the instance [id]: %s of the [region] : %s of Iaas : %s", volumeId, instanceId, region, iaasInfo)); + log.fatal(String.format("Cannot detach the volume [id]: %s from the instance [id]: %s. Extracted region is null for Iaas : %s", volumeId, instanceId, iaasInfo)); return; } if(log.isDebugEnabled()) { @@ -713,7 +716,7 @@ public class OpenstackNovaIaas extends Iaas { String region = ComputeServiceBuilderUtil.extractRegion(iaasInfo); if(region == null) { - log.fatal(String.format("Cannot delete the volume [id]: %s of the [region] : %s of Iaas : %s", volumeId, region, iaasInfo)); + log.fatal(String.format("Cannot delete the volume [id]: %s. Extracted region is null for Iaas : %s", volumeId, iaasInfo)); return; }
