CLOUDSTACK-494: Loose the limition of same ip used by site-to-site vpn

Sheng Yang · Sheng Yang · commit 86bbe211f234 · 2013-07-16T17:26:51.000-07:00
Different account can have same remote side IP now. Of course the remote side need
to identify them and configured properly to handle it.
diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDao.java
@@ -21,7 +21,7 @@
 import com.cloud.utils.db.GenericDao;
 
 public interface Site2SiteCustomerGatewayDao extends GenericDao<Site2SiteCustomerGatewayVO, Long> {
-    Site2SiteCustomerGatewayVO findByGatewayIp(String ip);
+    Site2SiteCustomerGatewayVO findByGatewayIpAndAccountId(String ip, long accountId);
     Site2SiteCustomerGatewayVO findByNameAndAccountId(String name, long accountId);
     List<Site2SiteCustomerGatewayVO> listByAccountId(long accountId);
 }
diff --git a/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/dao/Site2SiteCustomerGatewayDaoImpl.java
@@ -43,9 +43,10 @@ protected Site2SiteCustomerGatewayDaoImpl() {
     }
     
     @Override
-    public Site2SiteCustomerGatewayVO findByGatewayIp(String ip) {
+    public Site2SiteCustomerGatewayVO findByGatewayIpAndAccountId(String ip, long accountId) {
         SearchCriteria<Site2SiteCustomerGatewayVO> sc = AllFieldsSearch.create();
         sc.setParameters("gatewayIp", ip);
+        sc.setParameters("accountId", accountId);
         return findOneBy(sc);
     }
 
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -208,7 +208,7 @@ public Site2SiteCustomerGateway createCustomerGateway(CreateVpnCustomerGatewayCm
         }
 
         long accountId = owner.getAccountId();
-        if (_customerGatewayDao.findByGatewayIp(gatewayIp) != null) {
+        if (_customerGatewayDao.findByGatewayIpAndAccountId(gatewayIp, accountId) != null) {
             throw new InvalidParameterValueException("The customer gateway with ip " + gatewayIp + " already existed in the system!");
         }
         if (_customerGatewayDao.findByNameAndAccountId(name, accountId) != null) {
@@ -454,7 +454,7 @@ public Site2SiteCustomerGateway updateCustomerGateway(UpdateVpnCustomerGatewayCm
         checkCustomerGatewayCidrList(guestCidrList);
 
         long accountId = gw.getAccountId();
-        Site2SiteCustomerGatewayVO existedGw = _customerGatewayDao.findByGatewayIp(gatewayIp);
+        Site2SiteCustomerGatewayVO existedGw = _customerGatewayDao.findByGatewayIpAndAccountId(gatewayIp, accountId);
         if (existedGw != null && existedGw.getId() != gw.getId()) {
             throw new InvalidParameterValueException("The customer gateway with ip " + gatewayIp + " already existed in the system!");
         }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`import com.cloud.utils.db.GenericDao;`
`22`	`22`
`23`	`23`	`public interface Site2SiteCustomerGatewayDao extends GenericDao<Site2SiteCustomerGatewayVO, Long> {`
`24`		`- Site2SiteCustomerGatewayVO findByGatewayIp(String ip);`
	`24`	`+ Site2SiteCustomerGatewayVO findByGatewayIpAndAccountId(String ip, long accountId);`
`25`	`25`	`Site2SiteCustomerGatewayVO findByNameAndAccountId(String name, long accountId);`
`26`	`26`	`List<Site2SiteCustomerGatewayVO> listByAccountId(long accountId);`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,9 +43,10 @@ protected Site2SiteCustomerGatewayDaoImpl() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public Site2SiteCustomerGatewayVO findByGatewayIp(String ip) {`
	`46`	`+ public Site2SiteCustomerGatewayVO findByGatewayIpAndAccountId(String ip, long accountId) {`
`47`	`47`	`SearchCriteria<Site2SiteCustomerGatewayVO> sc = AllFieldsSearch.create();`
`48`	`48`	`sc.setParameters("gatewayIp", ip);`
	`49`	`+ sc.setParameters("accountId", accountId);`
`49`	`50`	`return findOneBy(sc);`
`50`	`51`	`}`
`51`	`52`
Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public Site2SiteCustomerGateway createCustomerGateway(CreateVpnCustomerGatewayCm`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`long accountId = owner.getAccountId();`
`211`		`- if (_customerGatewayDao.findByGatewayIp(gatewayIp) != null) {`
	`211`	`+ if (_customerGatewayDao.findByGatewayIpAndAccountId(gatewayIp, accountId) != null) {`
`212`	`212`	`throw new InvalidParameterValueException("The customer gateway with ip " + gatewayIp + " already existed in the system!");`
`213`	`213`	`}`
`214`	`214`	`if (_customerGatewayDao.findByNameAndAccountId(name, accountId) != null) {`
`@@ -454,7 +454,7 @@ public Site2SiteCustomerGateway updateCustomerGateway(UpdateVpnCustomerGatewayCm`
`454`	`454`	`checkCustomerGatewayCidrList(guestCidrList);`
`455`	`455`
`456`	`456`	`long accountId = gw.getAccountId();`
`457`		`- Site2SiteCustomerGatewayVO existedGw = _customerGatewayDao.findByGatewayIp(gatewayIp);`
	`457`	`+ Site2SiteCustomerGatewayVO existedGw = _customerGatewayDao.findByGatewayIpAndAccountId(gatewayIp, accountId);`
`458`	`458`	`if (existedGw != null && existedGw.getId() != gw.getId()) {`
`459`	`459`	`throw new InvalidParameterValueException("The customer gateway with ip " + gatewayIp + " already existed in the system!");`
`460`	`460`	`}`