apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing Summary:Coverity findings for brocade-plugin

Browse Source
This commit is contained in:
Ritu Sabharwal 2014-08-05 14:59:15 +05:30 committed by Santhosh Edukulla
parent 1bfb1f6503
commit cc725e53e3
2 changed files with 61 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/network-elements/brocade-vcs/src/com/cloud/api/response/BrocadeVcsDeviceResponse.java
View File

@ -51,6 +51,26 @@ public class BrocadeVcsDeviceResponse extends BaseResponse {
@Param(description = "the principal switch Ip address") @Param(description = "the principal switch Ip address")
private String hostName; private String hostName;
public String getId() {
return id;
}
public String getPhysicalNetworkId() {
return physicalNetworkId;
}
public String getProviderName() {
return providerName;
}
public String getDeviceName() {
return deviceName;
}
public String getHostName() {
return hostName;
}
public void setId(String vcsDeviceId) { public void setId(String vcsDeviceId) {
this.id = vcsDeviceId; this.id = vcsDeviceId;
} }

56
plugins/network-elements/brocade-vcs/src/com/cloud/network/brocade/BrocadeVcsApi.java
View File

@ -334,7 +334,15 @@ public class BrocadeVcsApi {
HttpResponse response = executeMethod(pm); HttpResponse response = executeMethod(pm);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_NO_CONTENT) { if (response.getStatusLine().getStatusCode() != HttpStatus.SC_NO_CONTENT) {
String errorMessage = responseToErrorMessage(response);
String errorMessage;
try {
errorMessage = responseToErrorMessage(response);
} catch (IOException e) {
s_logger.error("Failed to update object : " + e.getMessage());
throw new BrocadeVcsApiException("Failed to update object : " + e.getMessage());
}
pm.releaseConnection(); pm.releaseConnection();
s_logger.error("Failed to update object : " + errorMessage); s_logger.error("Failed to update object : " + errorMessage);
throw new BrocadeVcsApiException("Failed to update object : " + errorMessage); throw new BrocadeVcsApiException("Failed to update object : " + errorMessage);
@ -405,7 +413,15 @@ public class BrocadeVcsApi {
HttpResponse response = executeMethod(pm); HttpResponse response = executeMethod(pm);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_CREATED) { if (response.getStatusLine().getStatusCode() != HttpStatus.SC_CREATED) {
String errorMessage = responseToErrorMessage(response);
String errorMessage;
try {
errorMessage = responseToErrorMessage(response);
} catch (IOException e) {
s_logger.error("Failed to create object : " + e.getMessage());
throw new BrocadeVcsApiException("Failed to create object : " + e.getMessage());
}
pm.releaseConnection(); pm.releaseConnection();
s_logger.error("Failed to create object : " + errorMessage); s_logger.error("Failed to create object : " + errorMessage);
throw new BrocadeVcsApiException("Failed to create object : " + errorMessage); throw new BrocadeVcsApiException("Failed to create object : " + errorMessage);
@ -421,7 +437,6 @@ public class BrocadeVcsApi {
throw new BrocadeVcsApiException("Hostname/credentials are null or empty"); throw new BrocadeVcsApiException("Hostname/credentials are null or empty");
} }
BufferedReader br = null;
String readLine = null; String readLine = null;
StringBuffer sb = null; StringBuffer sb = null;
@ -432,14 +447,21 @@ public class BrocadeVcsApi {
HttpResponse response = executeMethod(pm); HttpResponse response = executeMethod(pm);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
String errorMessage = responseToErrorMessage(response);
String errorMessage;
try {
errorMessage = responseToErrorMessage(response);
} catch (IOException e) {
s_logger.error("Failed to retreive status : " + e.getMessage());
throw new BrocadeVcsApiException("Failed to retreive status : " + e.getMessage());
}
pm.releaseConnection(); pm.releaseConnection();
s_logger.error("Failed to retreive status : " + errorMessage); s_logger.error("Failed to retreive status : " + errorMessage);
throw new BrocadeVcsApiException("Failed to retreive status : " + errorMessage); throw new BrocadeVcsApiException("Failed to retreive status : " + errorMessage);
} }
try { try (BufferedReader br = new BufferedReader(new InputStreamReader(response.getEntity().getContent(), Charset.forName("UTF-8")))) {
br = new BufferedReader(new InputStreamReader(response.getEntity().getContent(), Charset.forName("UTF-8")));
sb = new StringBuffer(); sb = new StringBuffer();
while (((readLine = br.readLine()) != null)) { while (((readLine = br.readLine()) != null)) {
@ -448,8 +470,8 @@ public class BrocadeVcsApi {
} }
} catch (Exception e) { } catch (Exception e) {
s_logger.error("Failed to get object : " + e.getMessage()); s_logger.error("Failed to retreive status : " + e.getMessage());
throw new BrocadeVcsApiException("Failed to get object : " + e.getMessage()); throw new BrocadeVcsApiException("Failed to retreive status : " + e.getMessage());
} }
pm.releaseConnection(); pm.releaseConnection();
@ -468,7 +490,15 @@ public class BrocadeVcsApi {
HttpResponse response = executeMethod(dm); HttpResponse response = executeMethod(dm);
if (response.getStatusLine().getStatusCode() != HttpStatus.SC_NO_CONTENT) { if (response.getStatusLine().getStatusCode() != HttpStatus.SC_NO_CONTENT) {
String errorMessage = responseToErrorMessage(response);
String errorMessage;
try {
errorMessage = responseToErrorMessage(response);
} catch (IOException e) {
s_logger.error("Failed to delete object : " + e.getMessage());
throw new BrocadeVcsApiException("Failed to delete object : " + e.getMessage());
}
dm.releaseConnection(); dm.releaseConnection();
s_logger.error("Failed to delete object : " + errorMessage); s_logger.error("Failed to delete object : " + errorMessage);
throw new BrocadeVcsApiException("Failed to delete object : " + errorMessage); throw new BrocadeVcsApiException("Failed to delete object : " + errorMessage);
@ -497,22 +527,18 @@ public class BrocadeVcsApi {
return response; return response;
} }
private String responseToErrorMessage(HttpResponse response) { private String responseToErrorMessage(HttpResponse response) throws IOException {
if ("text/html".equals(response.getEntity().getContentType().getValue())) { if ("text/html".equals(response.getEntity().getContentType().getValue())) {
try {
BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent(), Charset.forName("UTF-8"))); try (BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent(), Charset.forName("UTF-8")))) {
StringBuffer result = new StringBuffer(); StringBuffer result = new StringBuffer();
String line = ""; String line = "";
while ((line = rd.readLine()) != null) { while ((line = rd.readLine()) != null) {
result.append(line); result.append(line);
} }
return result.toString(); return result.toString();
} catch (IOException e) {
s_logger.debug("Error while loading response body", e);
} }
} }
return null; return null;