Update 8772: fix Fail to add a provider to physical network

weizhouapache · Mar 12, 2024 · bea790f · bea790f
1 parent 6c07f33
commit bea790f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -4109,7 +4109,13 @@ public PhysicalNetworkVO doInTransaction(TransactionStatus status) {
 
                     // Add the config drive provider
                     addConfigDriveToPhysicalNetwork(pNetwork.getId());
-                    addNSXProviderToPhysicalNetwork(pNetwork.getId());
+
+                    // Add NSX provider
+                    try {
+                        addNSXProviderToPhysicalNetwork(pNetwork.getId());
+                    } catch (Exception ex) {
+                        logger.warn("Failed to add NSX provider to physical network due to:", ex.getMessage());
+                    }
 
                     CallContext.current().putContextParameter(PhysicalNetwork.class, pNetwork.getUuid());
 
@@ -5510,7 +5516,7 @@ private PhysicalNetworkServiceProvider addNSXProviderToPhysicalNetwork(long phys
         DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId());
         if (dvo.getNetworkType() == NetworkType.Advanced) {
 
-            Provider provider = Network.Provider.getProvider("Nsx");
+            Provider provider = Network.Provider.getProvider(Provider.Nsx.getName());
             if (provider == null) {
                 return null;
             }

diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1430,6 +1430,9 @@ private boolean checkAndUpdateRouterSourceNatIp(Vpc vpc, String sourceNatIp) {
                 _ipAddrMgr.updateSourceNatIpAddress(requestedIp, userIps);
                 if (isVpcForNsx(vpc)) {
                     VpcProvider nsxElement = (VpcProvider) _ntwkModel.getElementImplementingProvider(Provider.Nsx.getName());
+                    if (nsxElement == null) {
+                        return true;
+                    }
                     nsxElement.updateVpcSourceNatIp(vpc, requestedIp);
                     // The NSX source NAT IP change does not require to update the VPC VR
                     return false;