CLOUDSTACK-4193: don't let privateGateway to be created with NULL networkId

Alena Prokharchyk · Alena Prokharchyk · commit 4976a67bfc0f · 2013-08-08T10:49:12.000-07:00
diff --git a/api/src/com/cloud/network/vpc/VpcGateway.java b/api/src/com/cloud/network/vpc/VpcGateway.java
@@ -56,7 +56,7 @@ public enum State {
     /**
      * @return
      */
-    Long getNetworkId();
+    long getNetworkId();
 
     /**
      * @return
diff --git a/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java b/engine/schema/src/com/cloud/network/vpc/VpcGatewayVO.java
@@ -63,7 +63,7 @@ public class VpcGatewayVO implements VpcGateway {
     long zoneId;
     
     @Column(name="network_id")
-    Long networkId;
+    long networkId;
     
     @Column(name=GenericDao.CREATED_COLUMN)
     Date created;
@@ -110,7 +110,7 @@ protected VpcGatewayVO(){
      * @param account_id
      * @param sourceNat
      */
-    public VpcGatewayVO(String ip4Address, Type type, Long vpcId, long zoneId, Long networkId, String vlanTag, 
+    public VpcGatewayVO(String ip4Address, Type type, long vpcId, long zoneId, long networkId, String vlanTag, 
             String gateway, String netmask, long accountId, long domainId, boolean sourceNat, long networkACLId) {
         this.ip4Address = ip4Address;
         this.type = type;
@@ -160,7 +160,7 @@ public long getZoneId() {
     }
 
     @Override
-    public Long getNetworkId() {
+    public long getNetworkId() {
         return networkId;
     }
     
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
@@ -16,16 +16,15 @@
 // under the License.
 package com.cloud.network.vpc.dao;
 
+import java.util.List;
+
 import com.cloud.network.vpc.VpcGateway;
 import com.cloud.network.vpc.VpcGatewayVO;
 import com.cloud.utils.db.GenericDao;
 
-import java.util.List;
-
 
 public interface VpcGatewayDao extends GenericDao<VpcGatewayVO, Long>{
     VpcGatewayVO getPrivateGatewayForVpc(long vpcId);
-    VpcGatewayVO getVpnGatewayForVpc(long vpcId);
 
     Long getNetworkAclIdForPrivateIp(long vpcId, long networkId, String ipaddr);
 
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
@@ -55,14 +55,6 @@ public VpcGatewayVO getPrivateGatewayForVpc(long vpcId) {
         return findOneBy(sc);
     }
 
-    @Override
-    public VpcGatewayVO getVpnGatewayForVpc(long vpcId) {
-        SearchCriteria<VpcGatewayVO> sc = AllFieldsSearch.create();
-        sc.setParameters("vpcId", vpcId);
-        sc.setParameters("type", VpcGateway.Type.Vpn);
-
-        return findOneBy(sc);
-    }
 
     @Override
     public Long getNetworkAclIdForPrivateIp (long vpcId, long networkId, String ipaddr) {
diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -448,7 +448,6 @@ public boolean applyStaticRoutes(Vpc vpc, List<StaticRouteProfile> routes) throw
 
     @Override
     public boolean applyACLItemsToPrivateGw(PrivateGateway gateway,List<? extends NetworkACLItem> rules) throws ResourceUnavailableException {
-        VpcGatewayVO vpcGatewayVo = _vpcGatewayDao.findById(gateway.getId());
         Network config = _networkDao.findById(gateway.getNetworkId());
         boolean isPrivateGateway = true;
 
diff --git a/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java b/server/src/com/cloud/network/vpc/PrivateGatewayProfile.java
@@ -57,7 +57,7 @@ public long getZoneId() {
     }
 
     @Override
-    public Long getNetworkId() {
+    public long getNetworkId() {
         return vpcGateway.getNetworkId();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public long getZoneId() {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`60`		`- public Long getNetworkId() {`
	`60`	`+ public long getNetworkId() {`
`61`	`61`	`return vpcGateway.getNetworkId();`
`62`	`62`	`}`
`63`	`63`