[NSX] Fix DHCP relay config deletion was missing zone name (#8068)

nvazquez · web-flow · commit 7332e6dbda05 · 2023-10-10T12:05:19.000-03:00
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxSegmentCommand.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/agent/api/DeleteNsxSegmentCommand.java
@@ -19,7 +19,7 @@
 import com.cloud.network.dao.NetworkVO;
 
 public class DeleteNsxSegmentCommand extends CreateNsxSegmentCommand {
-    public DeleteNsxSegmentCommand(String accountName, String vpcName, NetworkVO network) {
-        super(null, network.getDataCenterId(), accountName, network.getAccountId(), vpcName, network);
+    public DeleteNsxSegmentCommand(String zoneName, String accountName, String vpcName, NetworkVO network) {
+        super(zoneName, network.getDataCenterId(), accountName, network.getAccountId(), vpcName, network);
     }
 }
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
@@ -417,9 +417,12 @@ private NsxAnswer executeRequest(DeleteNsxSegmentCommand cmd) {
             Thread.sleep(30*1000);
             String segmentName = getSegmentName(cmd.getAccountName(), cmd.getTierNetwork().getName(), cmd.getVpcName());
             Segments segmentService = (Segments) nsxService.apply(Segments.class);
+            LOGGER.debug(String.format("Removing the segment with ID %s", segmentName));
             segmentService.delete(segmentName);
             DhcpRelayConfigs dhcpRelayConfig = (DhcpRelayConfigs) nsxService.apply(DhcpRelayConfigs.class);
-            dhcpRelayConfig.delete(getDhcpRelayId(cmd.getZoneName(), cmd.getAccountName(), cmd.getVpcName(), cmd.getTierNetwork().getName()));
+            String dhcpRelayId = getDhcpRelayId(cmd.getZoneName(), cmd.getAccountName(), cmd.getVpcName(), cmd.getTierNetwork().getName());
+            LOGGER.debug(String.format("Removing the DHCP relay config with ID %s", dhcpRelayId));
+            dhcpRelayConfig.delete(dhcpRelayId);
         } catch (Exception e) {
             LOGGER.error(String.format("Failed to delete NSX segment: %s", getSegmentName(cmd.getAccountName(), cmd.getTierNetwork().getName(), cmd.getVpcName())));
             return new NsxAnswer(cmd, new CloudRuntimeException(e.getMessage()));
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
@@ -59,6 +59,7 @@
 import com.cloud.user.AccountManager;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
 import com.cloud.vm.VirtualMachineProfile;
@@ -195,7 +196,13 @@ public boolean shutdown(Network network, ReservationContext context, boolean cle
     public boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException {
         Account account = accountMgr.getAccount(network.getAccountId());
         NetworkVO networkVO = networkDao.findById(network.getId());
-        return nsxService.deleteNetwork(account.getAccountName(), networkVO);
+        DataCenterVO zone = dataCenterDao.findById(network.getDataCenterId());
+        if (Objects.isNull(zone)) {
+            String msg = String.format("Cannot fing zone with ID %s", network.getDataCenterId());
+            LOGGER.error(msg);
+            throw new CloudRuntimeException(msg);
+        }
+        return nsxService.deleteNetwork(zone.getName(), account.getAccountName(), networkVO);
     }
 
     @Override
diff --git a/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java b/plugins/network-elements/nsx/src/main/java/org/apache/cloudstack/service/NsxServiceImpl.java
@@ -47,13 +47,13 @@ public boolean deleteVpcNetwork(Long zoneId, String zoneName, Long accountId, St
         return result.getResult();
     }
 
-    public boolean deleteNetwork(String accountName, NetworkVO network) {
+    public boolean deleteNetwork(String zoneName, String accountName, NetworkVO network) {
         String vpcName = null;
         if (Objects.nonNull(network.getVpcId())) {
             VpcVO vpc = vpcDao.findById(network.getVpcId());
             vpcName = Objects.nonNull(vpc) ? vpc.getName() : null;
         }
-        DeleteNsxSegmentCommand deleteNsxSegmentCommand = new DeleteNsxSegmentCommand(accountName, vpcName, network);
+        DeleteNsxSegmentCommand deleteNsxSegmentCommand = new DeleteNsxSegmentCommand(zoneName, accountName, vpcName, network);
         NsxAnswer result = nsxControllerUtils.sendNsxCommand(deleteNsxSegmentCommand, network.getDataCenterId());
         return result.getResult();
     }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`import com.cloud.network.dao.NetworkVO;`
`20`	`20`
`21`	`21`	`public class DeleteNsxSegmentCommand extends CreateNsxSegmentCommand {`
`22`		`- public DeleteNsxSegmentCommand(String accountName, String vpcName, NetworkVO network) {`
`23`		`- super(null, network.getDataCenterId(), accountName, network.getAccountId(), vpcName, network);`
	`22`	`+ public DeleteNsxSegmentCommand(String zoneName, String accountName, String vpcName, NetworkVO network) {`
	`23`	`+ super(zoneName, network.getDataCenterId(), accountName, network.getAccountId(), vpcName, network);`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,13 +47,13 @@ public boolean deleteVpcNetwork(Long zoneId, String zoneName, Long accountId, St`
`47`	`47`	`return result.getResult();`
`48`	`48`	`}`
`49`	`49`
`50`		`- public boolean deleteNetwork(String accountName, NetworkVO network) {`
	`50`	`+ public boolean deleteNetwork(String zoneName, String accountName, NetworkVO network) {`
`51`	`51`	`String vpcName = null;`
`52`	`52`	`if (Objects.nonNull(network.getVpcId())) {`
`53`	`53`	`VpcVO vpc = vpcDao.findById(network.getVpcId());`
`54`	`54`	`vpcName = Objects.nonNull(vpc) ? vpc.getName() : null;`
`55`	`55`	`}`
`56`		`- DeleteNsxSegmentCommand deleteNsxSegmentCommand = new DeleteNsxSegmentCommand(accountName, vpcName, network);`
	`56`	`+ DeleteNsxSegmentCommand deleteNsxSegmentCommand = new DeleteNsxSegmentCommand(zoneName, accountName, vpcName, network);`
`57`	`57`	`NsxAnswer result = nsxControllerUtils.sendNsxCommand(deleteNsxSegmentCommand, network.getDataCenterId());`
`58`	`58`	`return result.getResult();`
`59`	`59`	`}`