Fixes

nvazquez · nvazquez · commit 80f6a5b9709f · 2023-10-24T07:41:50.000-03:00
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/resource/NsxResource.java
@@ -214,7 +214,7 @@ private Answer executeRequest(CreateNsxDhcpRelayConfigCommand cmd) {
         long zoneId = cmd.getZoneId();
         long domainId = cmd.getDomainId();
         long accountId = cmd.getAccountId();
-        long vpcId = cmd.getVpcId();
+        Long vpcId = cmd.getVpcId();
         long networkId = cmd.getNetworkId();
         String vpcName = cmd.getVpcName();
         String networkName = cmd.getNetworkName();
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxGuestNetworkGuru.java
@@ -207,9 +207,8 @@ public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfil
             }
             VpcVO vpc = _vpcDao.findById(network.getVpcId());
             if (Objects.isNull(vpc)) {
-                String msg = String.format("Unable to find VPC with id: %s", network.getVpcId());
-                LOGGER.error(msg);
-                throw new CloudRuntimeException(msg);
+                String msg = String.format("Unable to find VPC with id: %s, allocating for network %s", network.getVpcId(), network.getName());
+                LOGGER.debug(msg);
             }
 
             DomainVO domain = domainDao.findById(account.getDomainId());
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/utils/NsxHelper.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/utils/NsxHelper.java
@@ -31,8 +31,10 @@
 public class NsxHelper {
 
     public static CreateNsxDhcpRelayConfigCommand createNsxDhcpRelayConfigCommand(DomainVO domain, Account account, DataCenter zone, VpcVO vpc, Network network, List<String> addresses) {
+        Long vpcId = vpc != null ? vpc.getId() : null;
+        String vpcName = vpc != null ? vpc.getName() : null;
         return new CreateNsxDhcpRelayConfigCommand(domain.getId(), account.getId(), zone.getId(),
-                vpc.getId(), vpc.getName(), network.getId(), network.getName(), addresses);
+                vpcId, vpcName, network.getId(), network.getName(), addresses);
     }
 
     public static CreateNsxSegmentCommand createNsxSegmentCommand(DomainVO domain, Account account, DataCenter zone, String vpcName, NetworkVO networkVO) {

Original file line number	Diff line number	Diff line change
`@@ -207,9 +207,8 @@ public NicProfile allocate(Network network, NicProfile nic, VirtualMachineProfil`
`207`	`207`	`}`
`208`	`208`	`VpcVO vpc = _vpcDao.findById(network.getVpcId());`
`209`	`209`	`if (Objects.isNull(vpc)) {`
`210`		`- String msg = String.format("Unable to find VPC with id: %s", network.getVpcId());`
`211`		`- LOGGER.error(msg);`
`212`		`- throw new CloudRuntimeException(msg);`
	`210`	`+ String msg = String.format("Unable to find VPC with id: %s, allocating for network %s", network.getVpcId(), network.getName());`
	`211`	`+ LOGGER.debug(msg);`
`213`	`212`	`}`
`214`	`213`
`215`	`214`	`DomainVO domain = domainDao.findById(account.getDomainId());`