-
Notifications
You must be signed in to change notification settings - Fork 576
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
NMS-15776: Parallelize DNS lookups during audit phase
- Loading branch information
1 parent
021d516
commit 6505114
Showing
4 changed files
with
342 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
159 changes: 159 additions & 0 deletions
159
...visiond/src/test/java/org/opennms/netmgt/provision/service/RequisitionAccountantTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,159 @@ | ||
| /******************************************************************************* | ||
| * This file is part of OpenNMS(R). | ||
| * | ||
| * Copyright (C) 2023 The OpenNMS Group, Inc. | ||
| * OpenNMS(R) is Copyright (C) 1999-2023 The OpenNMS Group, Inc. | ||
| * | ||
| * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. | ||
| * | ||
| * OpenNMS(R) is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published | ||
| * by the Free Software Foundation, either version 3 of the License, | ||
| * or (at your option) any later version. | ||
| * | ||
| * OpenNMS(R) is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with OpenNMS(R). If not, see: | ||
| * http://www.gnu.org/licenses/ | ||
| * | ||
| * For more information contact: | ||
| * OpenNMS(R) Licensing <[email protected]> | ||
| * http://www.opennms.org/ | ||
| * http://www.opennms.com/ | ||
| *******************************************************************************/ | ||
|
|
||
| package org.opennms.netmgt.provision.service; | ||
|
|
||
| import static org.awaitility.Awaitility.await; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Date; | ||
| import java.util.List; | ||
| import java.util.concurrent.CompletableFuture; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
| import org.mockito.Mockito; | ||
| import org.opennms.core.utils.InetAddressUtils; | ||
| import org.opennms.netmgt.model.PrimaryType; | ||
| import org.opennms.netmgt.provision.persist.requisition.Requisition; | ||
| import org.opennms.netmgt.provision.persist.requisition.RequisitionInterface; | ||
| import org.opennms.netmgt.provision.persist.requisition.RequisitionNode; | ||
| import org.opennms.netmgt.provision.service.operations.ImportOperationsManager; | ||
| import org.opennms.netmgt.provision.service.operations.InsertOperation; | ||
| import org.opennms.netmgt.snmp.proxy.LocationAwareSnmpClient; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
|
|
||
| public class RequisitionAccountantTest { | ||
| private boolean blocked = false; | ||
|
|
||
| private RequisitionAccountant createRequisitionAccountant() { | ||
| final ProvisionService provisionService = Mockito.mock(ProvisionService.class); | ||
| final LocationAwareSnmpClient locationAwareSnmpClient = Mockito.mock(LocationAwareSnmpClient.class); | ||
| Mockito.when(provisionService.getLocationAwareSnmpClient()).thenReturn(locationAwareSnmpClient); | ||
| Mockito.when(provisionService.getHostnameResolver()).thenReturn((addr, location) -> { | ||
| while (blocked) { | ||
| try { | ||
| Thread.sleep(250); | ||
| } catch (InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
| return location + InetAddressUtils.str(addr); | ||
| }); | ||
|
|
||
| final ImportOperationsManager importOperationsManager = Mockito.mock(ImportOperationsManager.class); | ||
| Mockito.when(importOperationsManager.foundNode("node1", "node1", "MINION", "", "", "monitorKey")).thenReturn(new InsertOperation("foreignSource", "node1", "node1", "MINION", "","", provisionService, "monitorKey")); | ||
| Mockito.when(importOperationsManager.foundNode("node2", "node2", "MINION", "", "", "monitorKey")).thenReturn(new InsertOperation("foreignSource", "node2", "node1", "MINION", "","", provisionService, "monitorKey")); | ||
| Mockito.when(importOperationsManager.foundNode("node3", "node3", "MINION", "", "", "monitorKey")).thenReturn(new InsertOperation("foreignSource", "node3", "node1", "MINION", "","", provisionService, "monitorKey")); | ||
|
|
||
| return new RequisitionAccountant(importOperationsManager, "monitorKey"); | ||
| } | ||
|
|
||
| private RequisitionNode createNode(final String foreignId, final String ... ipAddresses) { | ||
| final RequisitionNode requisitionNode = new RequisitionNode(); | ||
| requisitionNode.setLocation("MINION"); | ||
| requisitionNode.setNodeLabel(foreignId); | ||
| requisitionNode.setForeignId(foreignId); | ||
| requisitionNode.setBuilding(""); | ||
| requisitionNode.setCity(""); | ||
|
|
||
| final List<RequisitionInterface> requisitionInterfaces = new ArrayList<>(); | ||
|
|
||
| for(final String ipAddress : ipAddresses) { | ||
| final RequisitionInterface requisitionInterface = new RequisitionInterface(); | ||
| requisitionInterface.setIpAddr(ipAddress); | ||
| requisitionInterface.setManaged(true); | ||
| requisitionInterface.setStatus(1); | ||
| requisitionInterface.setSnmpPrimary(requisitionInterfaces.size() == 0 ? PrimaryType.PRIMARY : PrimaryType.SECONDARY); | ||
| requisitionInterfaces.add(requisitionInterface); | ||
| } | ||
|
|
||
| requisitionNode.setInterfaces(requisitionInterfaces); | ||
|
|
||
| return requisitionNode; | ||
| } | ||
|
|
||
| private Requisition createRequisition() { | ||
| final Requisition requisition = new Requisition(); | ||
| requisition.setForeignSource("foreignSource"); | ||
| requisition.setDate(new Date()); | ||
|
|
||
| requisition.setNodes(Lists.newArrayList( | ||
| createNode("node1", "10.32.29.11"), | ||
| createNode("node2", "10.32.30.22", "10.32.29.22"), | ||
| createNode("node3", "10.32.29.33", "10.32.30.33", "10.32.28.33") | ||
| )); | ||
|
|
||
| return requisition; | ||
| } | ||
|
|
||
| @Test | ||
| public void testRequisitionAccountant() { | ||
| blocked = true; | ||
|
|
||
| // create requisition with three nodes, first with one, second with two, third with three interfaces | ||
| final Requisition requisition = createRequisition(); | ||
|
|
||
| // create visitor | ||
| final RequisitionAccountant requisitionAccountant = createRequisitionAccountant(); | ||
|
|
||
| // no DNS lookups scheduled since visit() wasn't called | ||
| Assert.assertEquals(0, requisitionAccountant.dnsLookupsTotal()); | ||
| Assert.assertEquals(0, requisitionAccountant.dnsLookupsPending()); | ||
| Assert.assertEquals(0, requisitionAccountant.dnsLookupsCompleted()); | ||
|
|
||
| final CompletableFuture<Void> completableFuture = CompletableFuture.runAsync(new Runnable() { | ||
| @Override | ||
| public void run() { | ||
| requisition.visit(requisitionAccountant); | ||
| } | ||
| }); | ||
|
|
||
| // wait for lookups to be scheduled | ||
| await().atMost(1, TimeUnit.MINUTES).until(() -> { | ||
| return requisitionAccountant.dnsLookupsTotal() == 6; | ||
| }); | ||
|
|
||
| // check for all six lookups | ||
| Assert.assertEquals(6, requisitionAccountant.dnsLookupsTotal()); | ||
| Assert.assertEquals(6, requisitionAccountant.dnsLookupsPending()); | ||
| Assert.assertEquals(0, requisitionAccountant.dnsLookupsCompleted()); | ||
|
|
||
| // unblock | ||
| blocked = false; | ||
|
|
||
| // wait till lookups are completed | ||
| await().atMost(1, TimeUnit.MINUTES).until(() -> requisitionAccountant.dnsLookupsPending() == 0); | ||
|
|
||
| Assert.assertEquals(6, requisitionAccountant.dnsLookupsTotal()); | ||
| Assert.assertEquals(0, requisitionAccountant.dnsLookupsPending()); | ||
| Assert.assertEquals(6, requisitionAccountant.dnsLookupsCompleted()); | ||
| } | ||
| } |
Oops, something went wrong.