You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/10/06 06:29:15 UTC
[1/2] git commit: Fixing sonar reported issues for OpenstackNovaIaaS
class.
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 <ni...@gmail.com>
Authored: Mon Oct 6 09:21:27 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
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;
}
[2/2] git commit: Remove unnecessary localtion id settings.
Posted by ni...@apache.org.
Remove unnecessary localtion id settings.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5b5f1352
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5b5f1352
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5b5f1352
Branch: refs/heads/master
Commit: 5b5f135201910304968f873fc2221bd0fd698879
Parents: f6d1eea
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Mon Oct 6 09:58:47 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Mon Oct 6 09:58:47 2014 +0530
----------------------------------------------------------------------
.../org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5b5f1352/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 a637edc..435df18 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
@@ -95,10 +95,6 @@ public class AWSEC2Iaas extends Iaas {
// set image id specified
templateBuilder.imageId(iaasInfo.getImage());
- if(!(iaasInfo instanceof IaasProvider)) {
- templateBuilder.locationId(iaasInfo.getType());
- }
-
if(iaasInfo.getProperty(CloudControllerConstants.AVAILABILITY_ZONE) != null) {
Set<? extends Location> locations = iaasInfo.getComputeService().listAssignableLocations();
for(Location location : locations) {