Update 8772: fix bean issue nsxService

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

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/api/src/main/java/com/cloud/network/element/VpcProvider.java b/api/src/main/java/com/cloud/network/element/VpcProvider.java
@@ -22,6 +22,7 @@
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.IpAddress;
 import com.cloud.network.vpc.NetworkACLItem;
 import com.cloud.network.vpc.PrivateGateway;
 import com.cloud.network.vpc.StaticRouteProfile;
@@ -52,4 +53,6 @@ boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext context
     boolean applyStaticRoutes(Vpc vpc, List<StaticRouteProfile> routes) throws ResourceUnavailableException;
 
     boolean applyACLItemsToPrivateGw(PrivateGateway gateway, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException;
+
+    boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address);
 }
diff --git a/...c/main/java/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java b/...c/main/java/org/apache/cloudstack/network/contrail/management/ContrailVpcElementImpl.java
@@ -31,6 +31,7 @@
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.Network.Provider;
 import com.cloud.network.element.NetworkACLServiceProvider;
@@ -196,4 +197,8 @@ public boolean applyACLItemsToPrivateGw(PrivateGateway privateGateway,
         return true;
     }
 
+    @Override
+    public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
+        return true;
+    }
 }
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxElement.java
@@ -39,6 +39,7 @@
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
+import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.Networks;
@@ -899,4 +900,9 @@ public List<Class<?>> getCommands() {
         cmdList.add(ListInternalLoadBalancerElementsCmd.class);
         return cmdList;
     }
+
+    @Override
+    public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
+        return nsxService.updateVpcSourceNatIp(vpc, address);
+    }
 }
diff --git a/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/main/java/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -716,4 +716,9 @@ public boolean stopVpn(final RemoteAccessVpn vpn) throws ResourceUnavailableExce
         }
         return result;
     }
+
+    @Override
+    public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
+        return true;
+    }
 }
diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -42,7 +42,6 @@
 import javax.naming.ConfigurationException;
 
 import com.cloud.configuration.ConfigurationManager;
-import com.cloud.network.nsx.NsxService;
 import org.apache.cloudstack.acl.ControlledEntity.ACLType;
 import org.apache.cloudstack.alert.AlertService;
 import org.apache.cloudstack.annotation.AnnotationService;
@@ -265,9 +264,6 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
     @Autowired
     @Qualifier("networkHelper")
     protected NetworkHelper networkHelper;
-    @Inject
-    private NsxService nsxService;
-
     @Inject
     private VpcPrivateGatewayTransactionCallable vpcTxCallable;
 
@@ -1433,7 +1429,8 @@ private boolean checkAndUpdateRouterSourceNatIp(Vpc vpc, String sourceNatIp) {
             try {
                 _ipAddrMgr.updateSourceNatIpAddress(requestedIp, userIps);
                 if (isVpcForNsx(vpc)) {
-                    nsxService.updateVpcSourceNatIp(vpc, requestedIp);
+                    VpcProvider nsxElement = (VpcProvider) _ntwkModel.getElementImplementingProvider(Provider.Nsx.getName());
+                    nsxElement.updateVpcSourceNatIp(vpc, requestedIp);
                     // The NSX source NAT IP change does not require to update the VPC VR
                     return false;
                 }