From 17abb3e5d4e99b06996c130ea14800d631ffb657 Mon Sep 17 00:00:00 2001
From: keshav <keshav@cloud.com>
Date: Tue, 10 May 2011 15:47:46 -0700
Subject: [PATCH] Added a method to look up public IPs that are used for static
 NAT rules.

---
 server/src/com/cloud/network/dao/IPAddressDao.java     | 2 ++
 server/src/com/cloud/network/dao/IPAddressDaoImpl.java | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/server/src/com/cloud/network/dao/IPAddressDao.java b/server/src/com/cloud/network/dao/IPAddressDao.java
index 7a6b45f0293..8c8d858f480 100644
--- a/server/src/com/cloud/network/dao/IPAddressDao.java
+++ b/server/src/com/cloud/network/dao/IPAddressDao.java
@@ -37,6 +37,8 @@ public interface IPAddressDao extends GenericDao<IPAddressVO, Long> {
 	List<IPAddressVO> listByDcIdIpAddress(long dcId, String ipAddress);
 	
 	List<IPAddressVO> listByAssociatedNetwork(long networkId, Boolean isSourceNat);
+	
+	List<IPAddressVO> listStaticNatPublicIps(long networkId);
 	
 	int countIPs(long dcId, long vlanDbId, boolean onlyCountAllocated);
 	
diff --git a/server/src/com/cloud/network/dao/IPAddressDaoImpl.java b/server/src/com/cloud/network/dao/IPAddressDaoImpl.java
index 9effc087e8f..d1248972cc3 100644
--- a/server/src/com/cloud/network/dao/IPAddressDaoImpl.java
+++ b/server/src/com/cloud/network/dao/IPAddressDaoImpl.java
@@ -206,6 +206,14 @@ public class IPAddressDaoImpl extends GenericDaoBase<IPAddressVO, Long> implemen
         return listBy(sc);
     }
     
+    @Override 
+    public List<IPAddressVO> listStaticNatPublicIps(long networkId) {
+        SearchCriteria<IPAddressVO> sc = AllFieldsSearch.create();
+        sc.setParameters("network", networkId);
+        sc.setParameters("oneToOneNat", true);
+        return listBy(sc);        
+    }
+    
     @Override
     public IPAddressVO findByAssociatedVmId(long vmId) {
         SearchCriteria<IPAddressVO> sc = AllFieldsSearch.create();