(cloudstack) branch nsx-integration updated: NSX: Fix VR public NIC allocation (#8166)

[nvazquez]

This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a commit to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/nsx-integration by this push:
     new d0fe7b269f9 NSX: Fix VR public NIC allocation (#8166)
d0fe7b269f9 is described below

commit d0fe7b269f9d128368baad125cfa1f874e572a83
Author: Nicolas Vazquez <nicovazque...@gmail.com>
AuthorDate: Tue Oct 31 20:34:56 2023 -0300

    NSX: Fix VR public NIC allocation (#8166)
---
 .../nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java | 4 ++++
 .../cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
 
b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
index 6b2bacc6858..497eccb4ec8 100644
--- 
a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
+++ 
b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxApiClient.java
@@ -294,6 +294,10 @@ public class NsxApiClient {
     public void deleteTier1Gateway(String tier1Id) {
         com.vmware.nsx_policy.infra.tier_1s.LocaleServices localeService = 
(com.vmware.nsx_policy.infra.tier_1s.LocaleServices)
                 
nsxService.apply(com.vmware.nsx_policy.infra.tier_1s.LocaleServices.class);
+        if (getTier1Gateway(tier1Id) == null) {
+            LOGGER.warn(String.format("The Tier 1 Gateway %s does not exist, 
cannot be removed", tier1Id));
+            return;
+        }
         removeTier1GatewayNatRules(tier1Id);
         localeService.delete(tier1Id, Tier_1_LOCALE_SERVICE_ID);
         Tier1s tier1service = (Tier1s) nsxService.apply(Tier1s.class);
diff --git 
a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
 
b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 86027357d46..cb5c96a001c 100644
--- 
a/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/main/java/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -387,7 +387,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends 
VirtualNetworkApplian
                             _routerDao.update(routerVO.getId(), routerVO);
                         }
                     }
-                    final PlugNicCommand plugNicCmd = new 
PlugNicCommand(_nwHelper.getNicTO(domainRouterVO, publicNic.getNetworkId(), 
publicNic.getBroadcastUri().toString()),
+                    String broadcastURI = publicNic.getBroadcastUri() != null 
? publicNic.getBroadcastUri().toString() : null;
+                    final PlugNicCommand plugNicCmd = new 
PlugNicCommand(_nwHelper.getNicTO(domainRouterVO, publicNic.getNetworkId(), 
broadcastURI),
                             domainRouterVO.getInstanceName(), 
domainRouterVO.getType(), details);
                     cmds.addCommand(plugNicCmd);
                     final VpcVO vpc = 
_vpcDao.findById(domainRouterVO.getVpcId());