From 88e37e525e3f2cff6ba8f7570deeeae7098af236 Mon Sep 17 00:00:00 2001 From: Thorsten Heinze <46722892+openBackhaul@users.noreply.github.com> Date: Wed, 28 Aug 2024 17:23:09 +0200 Subject: [PATCH 1/2] Update IpAddresses.md --- .../SdnLaboratory/FakeAddresses/IpAddresses.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/TestingApplications/Infrastructure/SdnLaboratory/FakeAddresses/IpAddresses.md b/doc/TestingApplications/Infrastructure/SdnLaboratory/FakeAddresses/IpAddresses.md index 670b4cd2..2be52212 100644 --- a/doc/TestingApplications/Infrastructure/SdnLaboratory/FakeAddresses/IpAddresses.md +++ b/doc/TestingApplications/Infrastructure/SdnLaboratory/FakeAddresses/IpAddresses.md @@ -34,16 +34,16 @@ Both changes shall be applied on applications that did not yet reach milestone v | | CC | CurrentController | 1.0.0 | 127.0.0.1 | 4001 | | RESO | Resolver | 1.0.0 | 127.0.0.1 | 4002 | | A2LT | Accessport2LtpTranslator | 1.0.0 | 127.0.0.1 | 4003 -| | MATR | MacAddressTableRecorder | 1.0.0 | 1.1.4.5 | 4005 | 1.2.4.5 | 4205 +| | MATR | MacAddressTableRecorder | 1.0.0 | 127.0.0.1 | 4005 | 1.2.4.5 | 4205 | | MM | MediatorManager | 1.0.0 | 127.0.0.1 | 4006 | | L2LT | Linkid2LtpTranslator | 1.0.0 | 127.0.0.1 | 4008 | | MO | MountingOrchestrator | 1.0.0 | 127.0.0.1 | 4010 -| | NP | NotificationProxy | 1.0.1 | 1.1.4.11 | 4011 | 1.2.4.11 | 4211 +| | NP | NotificationProxy | 1.0.1 | 127.0.0.1 | 4011 | 1.2.4.11 | 4211 | | MWPP | MicroWavePerformanceProxy | 1.0.0 | 127.0.0.1 | 4012 | | | HMWDI | HistoricalMicroWaveDeviceInventory | 1.0.0 | 127.0.0.1 | 4013 -| | MWDG | MicroWaveDeviceGatekeeper | 1.0.0 | 1.1.4.14 | 4014 -| | MWDI | MicroWaveDeviceInventory  | 1.1.1 | 1.1.4.15 | 4015 -| | MDIP | MultiDomainInventoryProxy | 1.0.0 | 1.1.4.16 | 4016 | 1.2.4.16 | 4216 +| | MWDG | MicroWaveDeviceGatekeeper | 1.0.0 | 127.0.0.1 | 4014 +| | MWDI | MicroWaveDeviceInventory  | 1.1.2 | 127.0.0.1 | 4015 +| | MDIP | MultiDomainInventoryProxy | 1.0.0 | 127.0.0.1 | 4016 | 1.2.4.16 | 4216 | | AIPS | AirInterfacePowerSaver | 0.0.9 | 127.0.0.1 | 4017 | | NEP | NetExplorerProxy | 1.0.0 | 127.0.0.1 | 4018 | | NDLP | NetworkDataLakeProxy | 1.0.0 | 127.0.0.1 | 4019 From 4e27a20b6b01f26231493a537a571abf77a7e075 Mon Sep 17 00:00:00 2001 From: IswaryaaS Date: Tue, 3 Sep 2024 10:05:34 +0530 Subject: [PATCH 2/2] Fixes #979, #903 --- .../applicationPattern/rest/client/eventDispatcher.js | 2 +- .../applicationPattern/rest/server/ResponseBuilder.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/applicationPattern/applicationPattern/rest/client/eventDispatcher.js b/server/applicationPattern/applicationPattern/rest/client/eventDispatcher.js index 8c6df9ae..72a3e7ff 100644 --- a/server/applicationPattern/applicationPattern/rest/client/eventDispatcher.js +++ b/server/applicationPattern/applicationPattern/rest/client/eventDispatcher.js @@ -63,7 +63,7 @@ exports.dispatchEvent = function (operationClientUuid, httpRequestBody, user, xC let responseCode = response.status; if (responseCode.toString().startsWith("2")) { result = true; - } else if (responseCode == 408) { + } else if (responseCode == 408 || responseCode == 500) { recordServiceRequestFromClient( serverApplicationName, serverApplicationReleaseNumber, diff --git a/server/applicationPattern/applicationPattern/rest/server/ResponseBuilder.js b/server/applicationPattern/applicationPattern/rest/server/ResponseBuilder.js index 281df02c..9d8da954 100644 --- a/server/applicationPattern/applicationPattern/rest/server/ResponseBuilder.js +++ b/server/applicationPattern/applicationPattern/rest/server/ResponseBuilder.js @@ -6,6 +6,10 @@ const createHttpError = require("http-errors"); const OnfAttributeFormatter = require("../../onfModel/utility/OnfAttributeFormatter"); +/** + * when a response header is given -1, it means it is not valid. + * The corresponding header will be removed. + **/ exports.buildResponse = function (response, responseCode, responseBody, responseHeader) { if (createHttpError.isHttpError(responseBody)) { responseCode = responseBody.statusCode; @@ -22,6 +26,11 @@ exports.buildResponse = function (response, responseCode, responseBody, response } let headers = undefined; if (responseHeader != undefined) { + Object.keys(responseHeader).forEach((header) => { + if (responseHeader[header] == -1) { + delete responseHeader[header]; + } + }) headers = OnfAttributeFormatter.modifyJsonObjectKeysToKebabCase(responseHeader); response.set(headers); }