fixed ambiguity on neighbor monitoring activation

nttgin · Jan 4, 2025 · c0d0ee8 · c0d0ee8
1 parent c64848c
commit c0d0ee8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 35 deletions.
diff --git a/src/monitors/monitorAS.js b/src/monitors/monitorAS.js
@@ -34,7 +34,7 @@ import Monitor from "./monitor";
 
 export default class MonitorAS extends Monitor {
 
-    constructor(name, channel, params, env, input){
+    constructor(name, channel, params, env, input) {
         super(name, channel, params, env, input);
         this.thresholdMinPeers = params?.thresholdMinPeers ?? 3;
         this.skipPrefixMatch = !!params?.skipPrefixMatch;
@@ -46,7 +46,7 @@ export default class MonitorAS extends Monitor {
     };
 
     filter = (message) => {
-        return message.type === 'announcement';
+        return message.type === "announcement";
     };
 
     squashAlerts = (alerts) => {
@@ -67,7 +67,7 @@ export default class MonitorAS extends Monitor {
         }
 
         if (prefixesOut.length > 1) {
-            return `${matchedMessages[0].originAS} is announcing some prefixes which are not in the configured list of announced prefixes: ${prefixesOut}`
+            return `${matchedMessages[0].originAS} is announcing some prefixes which are not in the configured list of announced prefixes: ${prefixesOut}`;
         } else if (prefixesOut.length === 1) {
             return `${matchedMessages[0].originAS} is announcing ${matchedMessages[0].prefix} but this prefix is not in the configured list of announced prefixes`;
         }

diff --git a/src/monitors/monitorPathNeighbors.js b/src/monitors/monitorPathNeighbors.js
@@ -34,7 +34,7 @@ import Monitor from "./monitor";
 
 export default class MonitorPathNeighbors extends Monitor {
 
-    constructor(name, channel, params, env, input){
+    constructor(name, channel, params, env, input) {
         super(name, channel, params, env, input);
         this.thresholdMinPeers = params?.thresholdMinPeers ?? 0;
         this.updateMonitoredResources();
@@ -45,7 +45,7 @@ export default class MonitorPathNeighbors extends Monitor {
     };
 
     filter = (message) => {
-        return message.type === 'announcement';
+        return message.type === "announcement";
     };
 
     squashAlerts = (alerts) => {
@@ -67,36 +67,24 @@ export default class MonitorPathNeighbors extends Monitor {
             const path = message.path;
 
             for (let monitoredAs of this.monitored) {
-                if (monitoredAs.upstreams || monitoredAs.downstreams) {
+                if (monitoredAs.upstreams !== undefined || monitoredAs.downstreams !== undefined) {
                     const [left, _, right] = path.getNeighbors(monitoredAs.asn);
 
                     if (!!left || !!right) {
                         let match = false;
                         let side = null;
                         let id = null;
 
-                        if (left) {
-                            if (monitoredAs.upstreams === null) {
-                                side = "upstream";
-                                id = left.getId();
-                                match = true;
-                            } else if (monitoredAs.upstreams && !monitoredAs.upstreams.includes(left)) {
-                                side = "upstream";
-                                id = left.getId();
-                                match = true;
-                            }
+                        if (left && (monitoredAs.upstreams !== undefined && !monitoredAs.upstreams?.includes(left))) {
+                            side = "upstream";
+                            id = left.getId();
+                            match = true;
                         }
 
-                        if (right) {
-                            if (monitoredAs.downstreams === null) {
-                                side = "downstream";
-                                id = right.getId();
-                                match = true;
-                            } else if (monitoredAs.downstreams && !monitoredAs.downstreams.includes(right)) {
-                                side = "downstream";
-                                id = right.getId();
-                                match = true;
-                            }
+                        if (right && (monitoredAs.downstreams !== undefined && !monitoredAs.downstreams?.includes(right))) {
+                            side = "downstream";
+                            id = right.getId();
+                            match = true;
                         }
 
 

diff --git a/tests/neighbor_tests/prefixes.test.yml b/tests/neighbor_tests/prefixes.test.yml
@@ -11,13 +11,13 @@
 options:
   monitorASns:
     101:
-      groupd: default
+      group: default
       upstreams:
         - 100
       downstreams:
         - 104
     80:
-      groupd: default
+      group: default
       upstreams:
         - 99
       downstreams:
diff --git a/tests/neighbor_tests/tests.js b/tests/neighbor_tests/tests.js
@@ -32,7 +32,7 @@
 
 const chai = require("chai");
 const fs = require("fs");
-const chaiSubset = require('chai-subset');
+const chaiSubset = require("chai-subset");
 chai.use(chaiSubset);
 const expect = chai.expect;
 const volume = "volumetests/";
@@ -42,10 +42,10 @@ global.EXTERNAL_CONFIG_FILE = volume + "config.test.yml";
 
 // Prepare test environment
 if (!fs.existsSync(volume)) {
-    fs.mkdirSync(volume, { recursive: true });
+    fs.mkdirSync(volume, {recursive: true});
 } else {
-    fs.rmdirSync(volume, { recursive: true });
-    fs.mkdirSync(volume, { recursive: true });
+    fs.rmdirSync(volume, {recursive: true});
+    fs.mkdirSync(volume, {recursive: true});
 }
 fs.copyFileSync("tests/neighbor_tests/config.test.yml", volume + "config.test.yml");
 fs.copyFileSync("tests/neighbor_tests/prefixes.test.yml", volume + "prefixes.test.yml");
@@ -71,7 +71,6 @@ describe("Alerting", function () {
                     "matchedRule": {
                         "asn": [101],
                         "group": ["default"],
-                        "groupd": "default",
                         "upstreams": [100],
                         "downstreams": [104]
                     },
@@ -100,7 +99,6 @@ describe("Alerting", function () {
                     "matchedRule": {
                         "asn": [80],
                         "group": ["default"],
-                        "groupd": "default",
                         "upstreams": [99],
                         "downstreams": null
                     },
@@ -129,7 +127,6 @@ describe("Alerting", function () {
                     "matchedRule": {
                         "asn": [101],
                         "group": ["default"],
-                        "groupd": "default",
                         "upstreams": [100],
                         "downstreams": [104]
                     },