etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12332: use short type for "accountType" field in EventVO object 

status 12332: resolved fixed
This commit is contained in:
Alena Prokharchyk 2011-12-05 15:56:06 -08:00
parent 8c0be2e34a
commit d747801144
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/event/Event.java
View File

@ -45,5 +45,5 @@ public interface Event extends ControlledEntity{
String getLevel();
long getStartId();
String getParameters();
String getAccountType();
Short getAccountType();
}

4
core/src/com/cloud/event/EventVO.java
View File

@ -72,7 +72,7 @@ public class EventVO implements Event, Identity {
private String accountName;
@Column(name="type", table="account", insertable=false, updatable=false)
private String accountType;
private short accountType;
@Column(name="removed", table="account", insertable=false, updatable=false)
private Date removed;
@ -198,7 +198,7 @@ public class EventVO implements Event, Identity {
}
@Override
public String getAccountType() {
public Short getAccountType() {
return accountType;
}

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

@ -4476,7 +4476,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
success = false;
}
// Mark all static rules as revoked and apply them on the backend (not in the DB)
// Mark all static rules as revoked and apply them on the backend (not in the DB)
List<FirewallRuleVO> firewallStaticNatRules = _firewallDao.listByNetworkAndPurpose(networkId, Purpose.StaticNat);
List<StaticNatRule> staticNatRules = new ArrayList<StaticNatRule>();
if (s_logger.isDebugEnabled()) {
@ -4556,15 +4556,13 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
success = false;
}
// Get all ip addresses, mark as releasing and release them on the backend (except for source nat) - DONE
// Get all ip addresses, mark as releasing and release them on the backend
Network network = getNetwork(networkId);
List<IPAddressVO> userIps = _ipAddressDao.listByAssociatedNetwork(networkId, null);
List<PublicIp> publicIpsToRelease = new ArrayList<PublicIp>();
if (userIps != null && !userIps.isEmpty()) {
for (IPAddressVO userIp : userIps) {
if (!userIp.isSourceNat()) {
userIp.setState(State.Releasing);
}
userIp.setState(State.Releasing);
PublicIp publicIp = new PublicIp(userIp, _vlanDao.findById(userIp.getVlanId()), NetUtils.createSequenceBasedMacAddress(userIp.getMacAddress()));
publicIpsToRelease.add(publicIp);
}

4
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -2360,6 +2360,10 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
if (ipList == null) {
ipList = new ArrayList<PublicIpAddress>();
}
//domR doesn't support release for sourceNat IP address
if (ipAddress.isSourceNat() && ipAddress.getState() == IpAddress.State.Releasing) {
continue;
}
ipList.add(ipAddress);
vlanIpMap.put(vlanTag, ipList);
}