From b15c2576a7963cda3e3882f5a4ca1141a17c51c4 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 11 Jul 2012 14:51:05 -0700 Subject: [PATCH] VPC: fixed listStaticRoutes when search by gatewayId --- server/src/com/cloud/network/NetworkManagerImpl.java | 3 +-- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index a80ba56aedf..d39526a566d 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 { diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 43a8ab4a498..5381029cb3f 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);