From 69ff931ecbaf4f3ec5f62151a9ffc117b3fc4eb7 Mon Sep 17 00:00:00 2001 From: Massimo Candela Date: Wed, 16 Feb 2022 22:28:27 +0100 Subject: [PATCH] refactoring of roa tests --- .../rpki_tests/config.rpki.test.external-roas.yml | 4 ++-- tests/rpki_tests/config.rpki.test.external.yml | 6 +++--- tests/rpki_tests/tests.external-missing-roas.js | 4 ++-- tests/rpki_tests/tests.external-roas.js | 14 +++++++------- tests/rpki_tests/tests.external.js | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/rpki_tests/config.rpki.test.external-roas.yml b/tests/rpki_tests/config.rpki.test.external-roas.yml index 31cc77e..92862d3 100644 --- a/tests/rpki_tests/config.rpki.test.external-roas.yml +++ b/tests/rpki_tests/config.rpki.test.external-roas.yml @@ -8,8 +8,8 @@ connectors: monitors: - file: monitorROAS - channel: rpki - name: rpki-monitor + channel: roa + name: roa-monitor params: enableDiffAlerts: true enableExpirationAlerts: true diff --git a/tests/rpki_tests/config.rpki.test.external.yml b/tests/rpki_tests/config.rpki.test.external.yml index bffbcc3..b5fa019 100644 --- a/tests/rpki_tests/config.rpki.test.external.yml +++ b/tests/rpki_tests/config.rpki.test.external.yml @@ -8,12 +8,12 @@ connectors: monitors: - file: monitorRPKI - channel: rpki - name: rpki-monitor + channel: roa + name: roa-monitor params: checkDisappearing: true thresholdMinPeers: 1 - checkUncovered: true + checkUncovered: false cacheValidPrefixesSeconds: 3600 diff --git a/tests/rpki_tests/tests.external-missing-roas.js b/tests/rpki_tests/tests.external-missing-roas.js index 474324c..d8a5260 100644 --- a/tests/rpki_tests/tests.external-missing-roas.js +++ b/tests/rpki_tests/tests.external-missing-roas.js @@ -51,7 +51,7 @@ describe("RPKI monitoring external", function() { "a82_112_100_0_24-2914-null": { id: 'a82_112_100_0_24-2914-null', - origin: 'rpki-monitor', + origin: 'roa-monitor', affected: '82.112.100.0/24', message: 'The route 82.112.100.0/24 announced by AS2914 is no longer covered by a ROA' } @@ -61,7 +61,7 @@ describe("RPKI monitoring external", function() { let rpkiTestCompletedExternal = false; let started = false; - pubSub.subscribe("rpki", function (message, type) { + pubSub.subscribe("roa", function (message, type) { try { if (started && !rpkiTestCompletedExternal) { message = JSON.parse(JSON.stringify(message)); diff --git a/tests/rpki_tests/tests.external-roas.js b/tests/rpki_tests/tests.external-roas.js index e19d377..6f7e76f 100644 --- a/tests/rpki_tests/tests.external-roas.js +++ b/tests/rpki_tests/tests.external-roas.js @@ -59,7 +59,7 @@ describe("RPKI monitoring external", function() { "disappeared-ripe": { id: 'disappeared-ripe', truncated: false, - origin: 'rpki-monitor', + origin: 'roa-monitor', affected: 'ripe', message: 'Possible TA malfunction or incomplete VRP file: 60.00% of the ROAs disappeared from ripe', data: [ @@ -72,7 +72,7 @@ describe("RPKI monitoring external", function() { "expiring-ripe": { id: 'expiring-ripe', truncated: false, - origin: 'rpki-monitor', + origin: 'roa-monitor', affected: 'ripe', message: 'Possible TA malfunction or incomplete VRP file: 50.00% of the ROAs are expiring in ripe', data: [ @@ -87,7 +87,7 @@ describe("RPKI monitoring external", function() { "28c7aa78b6286e0e3c6583797f7df47c": { id: '28c7aa78b6286e0e3c6583797f7df47c', truncated: false, - origin: 'rpki-monitor', + origin: 'roa-monitor', affected: 2914, message: 'The following ROAs will expire in less than 2 hours: <1.2.3.0/24, 2914, 24, ripe>', @@ -95,28 +95,28 @@ describe("RPKI monitoring external", function() { "47807c7558dbe001b4aad9f3a87eb427": { id: '47807c7558dbe001b4aad9f3a87eb427', truncated: false, - origin: 'rpki-monitor', + origin: 'roa-monitor', affected: '94.5.4.3/22', message: 'ROAs change detected: removed <94.5.4.3/22, 2914, 22, ripe>' }, "de3bd9a6cdeeb05e1c2c7c04f7220485" : { id: 'de3bd9a6cdeeb05e1c2c7c04f7220485', truncated: false, - origin: 'rpki-monitor', + origin: 'roa-monitor', affected: '2001:db8:123::/48', message: 'ROAs change detected: removed <2001:db8:123::/48, 65000, 48, ripe>' }, "129aafe3c8402fb045b71e810a73d425": { id: '129aafe3c8402fb045b71e810a73d425', truncated: false, - origin: 'rpki-monitor', + origin: 'roa-monitor', affected: 2914, message: 'ROAs change detected: removed <2.3.4.0/24, 2914, 24, ripe>' } }; let rpkiTestCompletedExternal = false; - pubSub.subscribe("rpki", function (message, type) { + pubSub.subscribe("roa", function (message, type) { try { if (!rpkiTestCompletedExternal) { diff --git a/tests/rpki_tests/tests.external.js b/tests/rpki_tests/tests.external.js index 1e8e808..80a3261 100644 --- a/tests/rpki_tests/tests.external.js +++ b/tests/rpki_tests/tests.external.js @@ -55,7 +55,7 @@ describe("RPKI monitoring external", function() { "a82_112_100_0_24-2914-false" : { id: 'a82_112_100_0_24-2914-false', - origin: 'rpki-monitor', + origin: 'roa-monitor', affected: '82.112.100.0/24', message: 'The route 82.112.100.0/24 announced by AS2914 is not RPKI valid. Valid ROAs: 82.112.100.0/24|AS1234|maxLength:24' } @@ -64,7 +64,7 @@ describe("RPKI monitoring external", function() { let rpkiTestCompletedExternal = false; let started = false; - pubSub.subscribe("rpki", function (message, type) { + pubSub.subscribe("roa", function (message, type) { try { if (started && !rpkiTestCompletedExternal) { message = JSON.parse(JSON.stringify(message));