apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

changing the logging and error msgs from 1:1 NAT to static NAT (in accordance with the feature being called static and not 1:1 NAT)

Browse Source
This commit is contained in:
abhishek 2010-12-02 13:54:39 -08:00
parent e353b7ac2d
commit dd9fd57514
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -3040,7 +3040,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
ipAddress = _ipAddressDao.acquireInLockTable(ipAddress.getAddress());
if(ipAddress == null){
s_logger.warn("Unable to acquire lock on ipAddress for creating 1-1 NAT rule");
s_logger.warn("Unable to acquire lock on ipAddress for creating static NAT rule");
return rule;
}else{
locked = true;
@ -3106,7 +3106,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
userVM = _vmDao.acquireInLockTable(userVM.getId());
if(userVM == null){
s_logger.warn("Unable to acquire lock on user vm for creating 1-1 NAT rule");
s_logger.warn("Unable to acquire lock on user vm for creating static NAT rule");
return newFwRule;
}else{
locked = true;
@ -3171,9 +3171,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
_rulesDao.persist(newFwRule);
txn.commit();
} catch (Exception e) {
s_logger.warn("Unable to create new firewall rule for 1:1 NAT");
s_logger.warn("Unable to create new firewall rule for static NAT");
txn.rollback();
throw new ServerApiException(BaseCmd.INTERNAL_ERROR,"Unable to create new firewall rule for 1:1 NAT:"+e.getMessage());
throw new ServerApiException(BaseCmd.INTERNAL_ERROR,"Unable to create new firewall rule for static NAT:"+e.getMessage());
}finally{
if(locked) {
_vmDao.releaseFromLockTable(userVM.getId());