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

Fixed revokeRule method to set FirewallRule state to Revoke in the DB.

Browse Source
This commit is contained in:
alena 2010-12-16 12:19:53 -08:00
parent d427cdae1e
commit 0d1c529175
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/network/rules/RulesManagerImpl.java
View File

@ -280,7 +280,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
s_logger.debug("Found a rule that is still in stage state so just removing it: " + rule);
}
_firewallDao.remove(rule.getId());
} else if (rule.getState() == State.Add) {
} else if (rule.getState() == State.Add || rule.getState() == State.Active) {
rule.setState(State.Revoke);
_firewallDao.update(rule.getId(), rule);
}
@ -310,6 +310,8 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
event.setDescription(description.toString());
event.setLevel(EventVO.LEVEL_INFO);
_eventDao.persist(event);
txn.commit();
}
@Override
@ -410,7 +412,7 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
return applyPortForwardingRules(ip, false, caller);
}
@Override @DB
@Override
public boolean revokeAllRules(Ip ip, long userId) throws ResourceUnavailableException {
List<PortForwardingRuleVO> rules = _forwardingDao.listByIpAndNotRevoked(ip);
if (s_logger.isDebugEnabled()) {