Skip to content

NMS-18277 OpenConfig Flow Streaming: Enable / Disable on Nodes #8058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

NMS-18277 OpenConfig Flow Streaming: Enable / Disable on Nodes #8058

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32b2c22
NMS-18277 do changes for enable and disable openconfig on node
Mohammad-Junid Oct 22, 2025
21fb2be
NMS-18277 review changes
Mohammad-Junid Oct 28, 2025
30e61cf
NMS-18277 review changes
Mohammad-Junid Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions opennms-model/src/main/java/org/opennms/netmgt/model/OnmsIpInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,15 +667,15 @@ public void mergeMonitoredServices(OnmsIpInterface scannedIface, EventForwarder
for (OnmsMonitoredService svc : scannedIface.getMonitoredServices()) {
serviceTypeMap.put(svc.getServiceType(), svc);
}

// for each service in the database
for (Iterator<OnmsMonitoredService> it = getMonitoredServices().iterator(); it.hasNext();) {
OnmsMonitoredService svc = it.next();

// find the corresponding scanned service
OnmsMonitoredService imported = serviceTypeMap.get(svc.getServiceType());
if (imported == null) {
if (deleteMissing) {
if (deleteMissing || isExplicitlyAdded(svc)) {
// there is no scanned service... delete it from the database
it.remove();
svc.visit(new DeleteEventVisitor(eventForwarder));
Expand All @@ -700,6 +700,18 @@ public void mergeMonitoredServices(OnmsIpInterface scannedIface, EventForwarder
}
}

private boolean isExplicitlyAdded(OnmsMonitoredService svc) {
if (svc.getMetaData() == null) {
return false;
}
Optional<OnmsMetaData> meta = svc.getMetaData().stream()
.filter(x -> "requisition".equalsIgnoreCase(x.getContext()))
.filter(x -> "user-added".equalsIgnoreCase(x.getKey()))
.findFirst();
return meta.map(x -> Boolean.parseBoolean(x.getValue())).orElse(false);
}


public void mergeMetaData(OnmsIpInterface scanned) {
if (!getMetaData().equals(scanned.getMetaData())) {
setMetaData(scanned.getMetaData());
Expand Down