OVN plugin: health-check Northbound endpoint at addOvnProvider

addOvnProvider now opens a transient OVSDB connection during request validation and rejects the registration with InvalidParameterValueException if the endpoint is unreachable or does not advertise the OVN_Northbound database. This catches typos, missing TLS material and routing problems before persisting a broken provider row. Also reorders the order-of-evaluation of two pre-existing tests that constructed Mockito stubs inside thenReturn() arguments, and rewrites AddOvnProviderCmdTest to set the service field by reflection — the prior @InjectMocks-driven setup was ambiguous because BaseCmd has an Object-typed _responseObject field that matched any of the @mock fields.
shapeblue · msinhore · Apr 22, 2026 · Apr 22, 2026 · Apr 25, 2026 · Apr 25, 2026
commit 839af0e8b2433ab234cf01dfe2aa16dfdcd2a94e
diff --git a/...work-elements/ovn/src/main/java/org/apache/cloudstack/service/OvnProviderServiceImpl.java b/...work-elements/ovn/src/main/java/org/apache/cloudstack/service/OvnProviderServiceImpl.java
@@ -100,6 +100,12 @@ protected void validateProvider(AddOvnProviderCmd cmd) {
         if (sslRequired && StringUtils.isAnyBlank(cmd.getCaCertPath(), cmd.getClientCertPath(), cmd.getClientPrivateKeyPath())) {
             throw new InvalidParameterValueException("OVN SSL connections require CA certificate, client certificate, and client private key paths");
         }
+        try {
+            ovnService.verifyNbConnection(cmd.getNbConnection(), cmd.getCaCertPath(), cmd.getClientCertPath(), cmd.getClientPrivateKeyPath());
+        } catch (CloudRuntimeException e) {
+            logger.warn("OVN NB health check failed for zone {}: {}", cmd.getZoneId(), e.getMessage());
+            throw new InvalidParameterValueException("OVN NB endpoint is unreachable: " + e.getMessage());
+        }
     }
 
     @Override

diff --git a/...k-elements/ovn/src/test/java/org/apache/cloudstack/api/command/AddOvnProviderCmdTest.java b/...k-elements/ovn/src/test/java/org/apache/cloudstack/api/command/AddOvnProviderCmdTest.java
@@ -27,36 +27,35 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
+
+import java.lang.reflect.Field;
 
 public class AddOvnProviderCmdTest {
-    @Mock
     private OvnProviderService ovnProviderService;
-    @Mock
     private CallContext callContext;
-
     private MockedStatic<CallContext> callContextMockedStatic;
-
-    @InjectMocks
     private AddOvnProviderCmd cmd;
 
-    private AutoCloseable closeable;
-
     @Before
-    public void setup() {
-        closeable = MockitoAnnotations.openMocks(this);
+    public void setup() throws Exception {
+        ovnProviderService = Mockito.mock(OvnProviderService.class);
+        callContext = Mockito.mock(CallContext.class);
         callContextMockedStatic = Mockito.mockStatic(CallContext.class);
         callContextMockedStatic.when(CallContext::current).thenReturn(callContext);
+
+        cmd = new AddOvnProviderCmd();
+        Field svc = AddOvnProviderCmd.class.getDeclaredField("ovnProviderService");
+        svc.setAccessible(true);
+        svc.set(cmd, ovnProviderService);
     }
 
     @After
     public void tearDown() throws Exception {
-        callContextMockedStatic.close();
-        closeable.close();
+        if (callContextMockedStatic != null) {
+            callContextMockedStatic.close();
+        }
     }
 
     @Test

diff --git a/...-elements/ovn/src/test/java/org/apache/cloudstack/service/OvnProviderServiceImplTest.java b/...-elements/ovn/src/test/java/org/apache/cloudstack/service/OvnProviderServiceImplTest.java
@@ -96,6 +96,7 @@ public void testAddProviderPersistsProvider() throws Exception {
         Mockito.when(ovnProviderDao.findByZoneId(ZONE_ID)).thenReturn(null);
         Mockito.when(ovnService.isValidConnectionString(NB_CONNECTION)).thenReturn(true);
         Mockito.when(ovnService.isValidConnectionString(SB_CONNECTION)).thenReturn(true);
+        Mockito.doNothing().when(ovnService).verifyNbConnection(Mockito.eq(NB_CONNECTION), Mockito.any(), Mockito.any(), Mockito.any());
         Mockito.when(ovnProviderDao.persist(Mockito.any(OvnProviderVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
         transactionMockedStatic.when(() -> Transaction.execute(Mockito.<TransactionCallback<OvnProviderVO>>any())).thenAnswer(invocation -> {
             TransactionCallback<OvnProviderVO> callback = invocation.getArgument(0);
@@ -126,9 +127,10 @@ public void testAddProviderRejectsInvalidNbConnection() throws Exception {
     @Test
     public void testListOvnProvidersWithZoneId() {
         OvnProviderVO providerVO = Mockito.mock(OvnProviderVO.class);
-        Mockito.when(ovnProviderDao.findByZoneId(ZONE_ID)).thenReturn(providerVO);
         Mockito.when(providerVO.getZoneId()).thenReturn(ZONE_ID);
-        Mockito.when(dataCenterDao.findById(ZONE_ID)).thenReturn(getZone());
+        Mockito.when(ovnProviderDao.findByZoneId(ZONE_ID)).thenReturn(providerVO);
+        DataCenterVO zone = getZone();
+        Mockito.when(dataCenterDao.findById(ZONE_ID)).thenReturn(zone);
 
         List<BaseResponse> result = ovnProviderService.listOvnProviders(ZONE_ID);
 
@@ -174,7 +176,8 @@ public void testCreateOvnProviderResponse() {
         Mockito.when(provider.getName()).thenReturn(NAME);
         Mockito.when(provider.getNbConnection()).thenReturn(NB_CONNECTION);
         Mockito.when(provider.getSbConnection()).thenReturn(SB_CONNECTION);
-        Mockito.when(dataCenterDao.findById(ZONE_ID)).thenReturn(getZone());
+        DataCenterVO zone = getZone();
+        Mockito.when(dataCenterDao.findById(ZONE_ID)).thenReturn(zone);
 
         OvnProviderResponse response = ovnProviderService.createOvnProviderResponse(provider);