Skip to content

Fixes #979, #903 #1011

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

Merged
PrathibaJee merged 2 commits into from
Sep 3, 2024
Merged

Fixes #979, #903 #1011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88e37e5
Update IpAddresses.md
openBackhaul Aug 28, 2024
4e27a20
Fixes #979, #903
IswaryaaS Sep 3, 2024
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
10 changes: 5 additions & 5 deletions doc/TestingApplications/Infrastructure/SdnLaboratory/FakeAddresses/IpAddresses.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion server/applicationPattern/applicationPattern/rest/client/eventDispatcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 9 additions & 0 deletions server/applicationPattern/applicationPattern/rest/server/ResponseBuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down