mirror of
https://github.com/apache/cloudstack.git
synced 2025-11-03 04:12:31 +01:00
CS-15241: static NAT is not working when provider is set to Juniper SRX
Description: Checking in fix for the exception seen due to the absence of the AsyncCommandQueued exception in the map of CSExceptionErrorCode which is used to look up the error code corresponding to a cloudstack exception. Also printing the stack trace in case an exception is not found in the map. Conflicts: utils/src/com/cloud/utils/exception/CSExceptionErrorCode.java
This commit is contained in:
Vijayendra Bhamidipati
Alena Prokharchyk
parent
c82885021b
commit
e177b8d6f6
@ -14,110 +14,115 @@
|
||||
// KIND, either express or implied. See the License for the
|
||||
// specific language governing permissions and limitations
|
||||
// under the License.
|
||||
package com.cloud.utils.exception;
|
||||
|
||||
|
||||
|
||||
package com.cloud.utils.exception;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.apache.log4j.Logger;
|
||||
|
||||
/**
|
||||
* CSExceptionErrorCode lists the CloudStack error codes that correspond
|
||||
* to each exception thrown by the CloudStack API.
|
||||
*/
|
||||
|
||||
public class CSExceptionErrorCode {
|
||||
|
||||
public static final Logger s_logger = Logger.getLogger(CSExceptionErrorCode.class.getName());
|
||||
|
||||
// Declare a hashmap of CloudStack Error Codes for Exceptions.
|
||||
protected static final HashMap<String, Integer> ExceptionErrorCodeMap;
|
||||
|
||||
static {
|
||||
try {
|
||||
ExceptionErrorCodeMap = new HashMap<String, Integer>();
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.CloudRuntimeException", 4250);
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.ExceptionUtil", 4255);
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.ExecutionException", 4260);
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.HypervisorVersionChangedException", 4265);
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.RuntimeCloudException", 4270);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudException", 4275);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.AccountLimitException", 4280);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.AgentUnavailableException", 4285);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudAuthenticationException", 4290);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudExecutionException", 4295);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConcurrentOperationException", 4300);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConflictingNetworkSettingsException", 4305);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.DiscoveredWithErrorException", 4310);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.HAStateException", 4315);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientAddressCapacityException", 4320);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientCapacityException", 4325);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientNetworkCapacityException", 4330);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientServerCapacityException", 4335);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientStorageCapacityException", 4340);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InternalErrorException", 4345);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InvalidParameterValueException", 4350);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ManagementServerException", 4355);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.NetworkRuleConflictException", 4360);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.PermissionDeniedException", 4365);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceAllocationException", 4370);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceInUseException", 4375);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceUnavailableException", 4380);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.StorageUnavailableException", 4385);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.UnsupportedServiceException", 4390);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.VirtualMachineMigrationException", 4395);
|
||||
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.AccountLimitException", 4400);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.AgentUnavailableException", 4405);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudAuthenticationException", 4410);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudException", 4415);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudExecutionException", 4420);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConcurrentOperationException", 4425);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConflictingNetworkSettingsException", 4430);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConnectionException", 4435);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.DiscoveredWithErrorException", 4440);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.DiscoveryException", 4445);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.HAStateException", 4450);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientAddressCapacityException", 4455);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientCapacityException", 4460);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientNetworkCapacityException", 4465);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientServerCapacityException", 4470);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientStorageCapacityException", 4475);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientVirtualNetworkCapcityException", 4480);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InternalErrorException", 4485);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InvalidParameterValueException", 4490);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ManagementServerException", 4495);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.NetworkRuleConflictException", 4500);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.PermissionDeniedException", 4505);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceAllocationException", 4510);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceInUseException", 4515);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceUnavailableException", 4520);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.StorageUnavailableException", 4525);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.UnsupportedServiceException", 4530);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.VirtualMachineMigrationException", 4535);
|
||||
|
||||
// Have a special error code for ServerApiException when it is
|
||||
// thrown in a standalone manner when failing to detect any of the above
|
||||
// standard exceptions.
|
||||
ExceptionErrorCodeMap.put("com.cloud.api.ServerApiException", 9999);
|
||||
} catch (Exception e) {
|
||||
throw new ExceptionInInitializerError(e);
|
||||
}
|
||||
}
|
||||
|
||||
public static HashMap<String, Integer> getErrCodeList() {
|
||||
return ExceptionErrorCodeMap;
|
||||
}
|
||||
|
||||
public static int getCSErrCode(String exceptionName) {
|
||||
if (ExceptionErrorCodeMap.containsKey(exceptionName)) {
|
||||
return ExceptionErrorCodeMap.get(exceptionName);
|
||||
} else {
|
||||
s_logger.info("Could not find exception: " + exceptionName + " in error code list for exceptions");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
public static String getCurMethodName() {
|
||||
StackTraceElement stackTraceCalls[] = (new Throwable()).getStackTrace();
|
||||
return stackTraceCalls[1].toString();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* CSExceptionErrorCode lists the CloudStack error codes that correspond
|
||||
* to a each exception thrown by the CloudStack API.
|
||||
*/
|
||||
|
||||
public class CSExceptionErrorCode {
|
||||
|
||||
public static final Logger s_logger = Logger.getLogger(CSExceptionErrorCode.class.getName());
|
||||
|
||||
// Declare a hashmap of CloudStack Error Codes for Exceptions.
|
||||
protected static final HashMap<String, Integer> ExceptionErrorCodeMap;
|
||||
|
||||
static {
|
||||
try {
|
||||
ExceptionErrorCodeMap = new HashMap<String, Integer>();
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.CloudRuntimeException", 4250);
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.ExceptionUtil", 4255);
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.ExecutionException", 4260);
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.HypervisorVersionChangedException", 4265);
|
||||
ExceptionErrorCodeMap.put("com.cloud.utils.exception.RuntimeCloudException", 4270);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudException", 4275);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.AccountLimitException", 4280);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.AgentUnavailableException", 4285);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudAuthenticationException", 4290);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudExecutionException", 4295);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConcurrentOperationException", 4300);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConflictingNetworkSettingsException", 4305);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.DiscoveredWithErrorException", 4310);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.HAStateException", 4315);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientAddressCapacityException", 4320);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientCapacityException", 4325);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientNetworkCapacityException", 4330);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientServerCapacityException", 4335);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientStorageCapacityException", 4340);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InternalErrorException", 4345);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InvalidParameterValueException", 4350);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ManagementServerException", 4355);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.NetworkRuleConflictException", 4360);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.PermissionDeniedException", 4365);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceAllocationException", 4370);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceInUseException", 4375);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceUnavailableException", 4380);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.StorageUnavailableException", 4385);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.UnsupportedServiceException", 4390);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.VirtualMachineMigrationException", 4395);
|
||||
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.AccountLimitException", 4400);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.AgentUnavailableException", 4405);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudAuthenticationException", 4410);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudException", 4415);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.CloudExecutionException", 4420);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConcurrentOperationException", 4425);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConflictingNetworkSettingsException", 4430);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ConnectionException", 4435);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.DiscoveredWithErrorException", 4440);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.DiscoveryException", 4445);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.HAStateException", 4450);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientAddressCapacityException", 4455);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientCapacityException", 4460);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientNetworkCapacityException", 4465);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientServerCapacityException", 4470);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientStorageCapacityException", 4475);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InsufficientVirtualNetworkCapcityException", 4480);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InternalErrorException", 4485);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.InvalidParameterValueException", 4490);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ManagementServerException", 4495);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.NetworkRuleConflictException", 4500);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.PermissionDeniedException", 4505);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceAllocationException", 4510);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceInUseException", 4515);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.ResourceUnavailableException", 4520);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.StorageUnavailableException", 4525);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.UnsupportedServiceException", 4530);
|
||||
ExceptionErrorCodeMap.put("com.cloud.exception.VirtualMachineMigrationException", 4535);
|
||||
ExceptionErrorCodeMap.put("com.cloud.async.AsyncCommandQueued", 4540);
|
||||
|
||||
// Have a special error code for ServerApiException when it is
|
||||
// thrown in a standalone manner when failing to detect any of the above
|
||||
// standard exceptions.
|
||||
ExceptionErrorCodeMap.put("com.cloud.api.ServerApiException", 9999);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new ExceptionInInitializerError(e);
|
||||
}
|
||||
}
|
||||
|
||||
public static HashMap<String, Integer> getErrCodeList() {
|
||||
return ExceptionErrorCodeMap;
|
||||
}
|
||||
|
||||
public static int getCSErrCode(String exceptionName) {
|
||||
if (ExceptionErrorCodeMap.containsKey(exceptionName)) {
|
||||
return ExceptionErrorCodeMap.get(exceptionName);
|
||||
} else {
|
||||
s_logger.info("Could not find exception: " + exceptionName + " in error code list for exceptions");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
public static String getCurMethodName() {
|
||||
StackTraceElement stackTraceCalls[] = (new Throwable()).getStackTrace();
|
||||
return stackTraceCalls[1].toString();
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user