VPC: fixed listStaticRoutes when search by gatewayId
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b15c2576 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b15c2576 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b15c2576 Branch: refs/heads/vpc Commit: b15c2576a7963cda3e3882f5a4ca1141a17c51c4 Parents: a848eca Author: Alena Prokharchyk <[email protected]> Authored: Wed Jul 11 14:51:05 2012 -0700 Committer: Alena Prokharchyk <[email protected]> Committed: Fri Jul 13 13:25:47 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 3 +-- .../src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b15c2576/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index a80ba56..d39526a 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -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 { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b15c2576/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 43a8ab4..5381029 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -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);
