Add missing design to NSX public guru

nvazquez · nvazquez · commit de16411811fc · 2023-10-31T00:04:14.000-03:00
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxPublicNetworkGuru.java
@@ -18,15 +18,20 @@
 
 import com.cloud.dc.VlanDetailsVO;
 import com.cloud.dc.dao.VlanDetailsDao;
+import com.cloud.deploy.DeploymentPlan;
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientAddressCapacityException;
 import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
 import com.cloud.network.Network;
+import com.cloud.network.Networks;
 import com.cloud.network.dao.IPAddressVO;
+import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.guru.PublicNetworkGuru;
 import com.cloud.network.vpc.VpcVO;
 import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.network.vpc.dao.VpcOfferingServiceMapDao;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.user.Account;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.VirtualMachineProfile;
@@ -58,6 +63,26 @@ public NsxPublicNetworkGuru() {
         super();
     }
 
+    protected boolean canHandle(NetworkOffering offering) {
+        return isMyTrafficType(offering.getTrafficType()) && offering.isSystemOnly() && offering.isForNsx();
+    }
+
+    @Override
+    public Network design(NetworkOffering offering, DeploymentPlan plan, Network network, String name, Long vpcId, Account owner) {
+        if (!canHandle(offering)) {
+            return null;
+        }
+
+        if (offering.getTrafficType() == Networks.TrafficType.Public) {
+            NetworkVO ntwk =
+                    new NetworkVO(offering.getTrafficType(), Networks.Mode.Static, network.getBroadcastDomainType(), offering.getId(), Network.State.Setup, plan.getDataCenterId(),
+                            plan.getPhysicalNetworkId(), offering.isRedundantRouter());
+            return ntwk;
+        } else {
+            return null;
+        }
+    }
+
     @Override
     public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfile vm) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException {
         s_logger.debug("NSX Public network guru: allocate");
diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1172,6 +1172,9 @@ public Vpc createVpc(CreateVPCCmd cmd) throws ResourceAllocationException {
     }
 
     private boolean isVpcForNsx(Vpc vpc) {
+        if (vpc == null) {
+            return false;
+        }
         VpcOfferingServiceMapVO mapVO = _vpcOffSvcMapDao.findByServiceProviderAndOfferingId(Service.SourceNat.getName(), Provider.Nsx.getName(), vpc.getVpcOfferingId());
         if (mapVO != null) {
             s_logger.debug(String.format("The VPC %s is NSX-based and supports the %s service", vpc.getName(), Service.SourceNat.getName()));

Original file line number	Diff line number	Diff line change
`@@ -1172,6 +1172,9 @@ public Vpc createVpc(CreateVPCCmd cmd) throws ResourceAllocationException {`
`1172`	`1172`	`}`
`1173`	`1173`
`1174`	`1174`	`private boolean isVpcForNsx(Vpc vpc) {`
	`1175`	`+ if (vpc == null) {`
	`1176`	`+ return false;`
	`1177`	`+ }`
`1175`	`1178`	`VpcOfferingServiceMapVO mapVO = _vpcOffSvcMapDao.findByServiceProviderAndOfferingId(Service.SourceNat.getName(), Provider.Nsx.getName(), vpc.getVpcOfferingId());`
`1176`	`1179`	`if (mapVO != null) {`
`1177`	`1180`	`s_logger.debug(String.format("The VPC %s is NSX-based and supports the %s service", vpc.getName(), Service.SourceNat.getName()));`