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

VPC: fixed listStaticRoutes when search by gatewayId

This commit is contained in:
Alena Prokharchyk 2012-07-11 14:51:05 -07:00
parent a848ecae8b
commit b15c2576a7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4446,8 +4446,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
// remote access vpn can be enabled only for static nat ip, so this part should never be executed under normal
// conditions
// only when ip address failed to be cleaned up as a part of account destroy and was marked as Releasing, this
// part of
// only when ip address failed to be cleaned up as a part of account destroy and was marked as Releasing, this part of
// the code would be triggered
s_logger.debug("Cleaning up remote access vpns as a part of public IP id=" + ipId + " release...");
try {

2
server/src/com/cloud/network/vpc/VpcManagerImpl.java
View File

@ -1491,7 +1491,7 @@ public class VpcManagerImpl implements VpcManager, Manager{
}
if (gatewayId != null) {
sc.addAnd("vpcGatewayId", Op.EQ, vpcId);
sc.addAnd("vpcGatewayId", Op.EQ, gatewayId);
}
return _staticRouteDao.search(sc, searchFilter);