Use the previously assigned vNet for Netris Network when it transitions to Implemented state after gc

* Use the previously assigned vNet for Netris Network when it transitions to Implemented state after gc

* Fix unit tests

---------

Co-authored-by: nvazquez <[email protected]>

Author: Pearl1594

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -1187,6 +1187,7 @@ public class ApiConstants {
     public static final String NSX_DETAIL_KEY = "forNsx";
     public static final String NETRIS_DETAIL_KEY = "forNetris";
     public static final String NETRIS_TAG = "netristag";
+    public static final String NETRIS_VXLAN_ID = "netrisvxlanid";
     public static final String DISK_PATH = "diskpath";
     public static final String IMPORT_SOURCE = "importsource";
     public static final String TEMP_PATH = "temppath";

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisGuestNetworkGuru.java

@@ -32,6 +32,8 @@
 import com.cloud.network.Networks;
 import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.PublicIpAddress;
+import com.cloud.network.dao.NetworkDetailVO;
+import com.cloud.network.dao.NetworkDetailsDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkVO;
 import com.cloud.network.guru.GuestNetworkGuru;
@@ -47,6 +49,7 @@
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.context.CallContext;
 
 import javax.inject.Inject;
@@ -61,6 +64,8 @@ public class NetrisGuestNetworkGuru  extends GuestNetworkGuru implements Network
     private NetrisService netrisService;
     @Inject
     NetworkModel networkModel;
+    @Inject
+    NetworkDetailsDao networkDetailsDao;
 
     public NetrisGuestNetworkGuru() {
         super();
@@ -203,14 +208,21 @@ public Network implement(Network network, NetworkOffering offering, DeployDestin
     @Override
     protected void allocateVnet(Network network, NetworkVO implemented, long dcId, long physicalNetworkId, String reservationId)
             throws InsufficientVirtualNetworkCapacityException {
+        String vnet = null;
+        Long networkId = implemented.getId() > 0 ? implemented.getId() : network.getId();
         if (network.getBroadcastUri() == null) {
-            String vnet = _dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), reservationId, UseSystemGuestVlans.valueIn(network.getAccountId()));
-            if (vnet == null) {
-                throw new InsufficientVirtualNetworkCapacityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class,
-                        dcId);
+            NetworkDetailVO netrisVnetDetail = networkDetailsDao.findDetail(networkId, ApiConstants.NETRIS_VXLAN_ID);
+            if (nonNull(netrisVnetDetail)) {
+                vnet = netrisVnetDetail.getValue();
+            } else {
+                vnet = _dcDao.allocateVnet(dcId, physicalNetworkId, network.getAccountId(), reservationId, UseSystemGuestVlans.valueIn(network.getAccountId()));
+                if (vnet == null) {
+                    throw new InsufficientVirtualNetworkCapacityException("Unable to allocate vnet as a " + "part of network " + network + " implement ", DataCenter.class,
+                            dcId);
+                }
+                networkDetailsDao.addDetail(networkId, ApiConstants.NETRIS_VXLAN_ID, vnet, true);
             }
             implemented.setBroadcastUri(Networks.BroadcastDomainType.Netris.toUri(vnet));
-            Long networkId = implemented.getId() > 0 ? implemented.getId() : network.getId();
             ActionEventUtils.onCompletedActionEvent(CallContext.current().getCallingUserId(), network.getAccountId(), EventVO.LEVEL_INFO, EventTypes.EVENT_ZONE_VXLAN_ASSIGN,
                     "Assigned Zone vNet: " + vnet + " Network Id: " + networkId, networkId, ApiCommandResourceType.Network.toString(), 0);
         } else {

plugins/network-elements/netris/src/test/java/org/apache/cloudstack/service/NetrisGuestNetworkGuruTest.java

@@ -28,6 +28,7 @@
 import com.cloud.network.Network;
 import com.cloud.network.NetworkModel;
 import com.cloud.network.Networks;
+import com.cloud.network.dao.NetworkDetailsDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.dao.PhysicalNetworkDao;
 import com.cloud.network.dao.PhysicalNetworkVO;
@@ -78,6 +79,8 @@ public class NetrisGuestNetworkGuruTest {
     private VpcDao vpcDao;
     @Mock
     private NetrisService netrisService;
+    @Mock
+    private NetworkDetailsDao networkDetailsDao;
 
     @Spy
     @InjectMocks
@@ -219,6 +222,7 @@ public void testImplementNetrisVpcNetwork() throws InsufficientVirtualNetworkCap
         Mockito.when(dataCenterDao.allocateVnet(Mockito.eq(zoneId), Mockito.eq(physicalNetworkId),
                 Mockito.eq(accountId), Mockito.nullable(String.class), Mockito.anyBoolean())).thenReturn(vnet);
         actionEventUtilsMocked.when(() -> ActionEventUtils.onCompletedActionEvent(Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyString(), Mockito.anyString(), Mockito.anyLong(), Mockito.anyString(), Mockito.anyLong())).thenReturn(1L);
+        Mockito.when(networkDetailsDao.findDetail(Mockito.anyLong(), Mockito.anyString())).thenReturn(null);
         Network implemented = guru.implement(network, networkOffering, destination, context);
         Assert.assertEquals(String.format("netris://%s", vnet), implemented.getBroadcastUri().toString());
         Assert.assertEquals(Network.State.Implemented, implemented.getState());