Skip to content

To include null pointer check for the fields filter #56

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 1 commit into from
Dec 8, 2023
Merged

To include null pointer check for the fields filter #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var oas3Tools = require('openbackhaul-oas3-tools');
var appCommons = require('onf-core-model-ap/applicationPattern/commons/AppCommons');
var apiKeyAuth = require('./utils/apiKeyAuth');

var serverPort = 8080;
var serverPort = 4014;

// uncomment if you do not want to validate security e.g. operation-key, basic auth, etc
//appCommons.openApiValidatorOptions.validateSecurity = false;
Expand Down
32 changes: 20 additions & 12 deletions server/service/IndividualServicesService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ exports.bequeathYourDataAndDie = function (body, user, originator, xCorrelator,
exports.postMacInterfaceRpcForProvidingLearnedMacAdresses = async function (mountName, user, originator, xCorrelator, traceIndicator, customerJourney) {
let response = {};
let mountNamevalue = mountName;
let fieldsFilter;
try {
/****************************************************************************************
* Setting up request header object for making eatl request
Expand Down Expand Up @@ -78,7 +79,7 @@ exports.postMacInterfaceRpcForProvidingLearnedMacAdresses = async function (moun
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.postToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.postToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
let responseCode = responseFromODL.responseCode
if (responseCode) {
response["response-code"] = responseCode;
Expand Down Expand Up @@ -159,6 +160,7 @@ exports.provideListOfConnectedDevices = function (user, originator, xCorrelator,
exports.putLiveAirInterfacePerformanceMonitoringIsOn = async function (body, mountName, uuid, localId, user, originator, xCorrelator, traceIndicator, customerJourney) {
let response = {};
let mountNamevalue = mountName;
let fieldsFilter;
let requestBody = body;
let ltpUuid = uuid;
if (ltpUuid.includes('+')) {
Expand Down Expand Up @@ -192,7 +194,7 @@ exports.putLiveAirInterfacePerformanceMonitoringIsOn = async function (body, mou
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
if (responseFromODL.responseCode) {
response["response-code"] = responseFromODL.responseCode;
} else {
Expand Down Expand Up @@ -226,6 +228,7 @@ exports.putLiveAirInterfacePerformanceMonitoringIsOn = async function (body, mou
exports.putLiveAirInterfaceTransimitterIsOn = async function (body, mountName, uuid, localId, user, originator, xCorrelator, traceIndicator, customerJourney) {
let response = {};
let mountNamevalue = mountName;
let fieldsFilter;
let requestBody = body;
let ltpUuid = uuid;
if (ltpUuid.includes('+')) {
Expand Down Expand Up @@ -259,7 +262,7 @@ exports.putLiveAirInterfaceTransimitterIsOn = async function (body, mountName, u
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
if (responseFromODL.responseCode) {
response["response-code"] = responseFromODL.responseCode;
} else {
Expand Down Expand Up @@ -292,6 +295,7 @@ exports.putLiveControlConstructExternalLabel = async function (body, mountName,
let response = {};
let mountNamevalue = mountName;
let requestBody = body;
let fieldsFilter;
try {
/****************************************************************************************
* Setting up request header object for making eatl request
Expand Down Expand Up @@ -319,7 +323,7 @@ exports.putLiveControlConstructExternalLabel = async function (body, mountName,
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
if (responseFromODL.responseCode) {
response["response-code"] = responseFromODL.responseCode;
} else {
Expand Down Expand Up @@ -358,6 +362,7 @@ exports.putLiveEthernetContainerPerformanceMonitoringIsOn = async function (body
ltpUuid = ltpUuid.split('+')[1]
}
let ltpLocalId = localId;
let fieldsFilter;
try {
/****************************************************************************************
* Setting up request header object for making eatl request
Expand Down Expand Up @@ -385,7 +390,7 @@ exports.putLiveEthernetContainerPerformanceMonitoringIsOn = async function (body
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
if (responseFromODL.responseCode) {
response["response-code"] = responseFromODL.responseCode;
} else {
Expand Down Expand Up @@ -425,6 +430,7 @@ exports.putLiveHybridMwStructurePerformanceMonitoringIsOn = async function (body
ltpUuid = ltpUuid.split('+')[1]
}
let ltpLocalId = localId;
let fieldsFilter;
try {
/****************************************************************************************
* Setting up request header object for making eatl request
Expand Down Expand Up @@ -452,7 +458,7 @@ exports.putLiveHybridMwStructurePerformanceMonitoringIsOn = async function (body
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
if (responseFromODL.responseCode) {
response["response-code"] = responseFromODL.responseCode;
} else {
Expand Down Expand Up @@ -490,7 +496,7 @@ exports.putLiveLtpExternalLabel = async function (body, mountName, uuid, user, o
if (ltpUuid.includes('+')) {
ltpUuid = ltpUuid.split('+')[1]
}

let fieldsFilter;
try {
/****************************************************************************************
* Setting up request header object for making eatl request
Expand Down Expand Up @@ -518,7 +524,7 @@ exports.putLiveLtpExternalLabel = async function (body, mountName, uuid, user, o
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
if (responseFromODL.responseCode) {
response["response-code"] = responseFromODL.responseCode;
} else {
Expand Down Expand Up @@ -557,7 +563,8 @@ exports.putLivePureEthernetStructurePerformanceMonitoringIsOn = async function (
if (ltpUuid.includes('+')) {
ltpUuid = ltpUuid.split('+')[1]
}
let ltpLocalid = localId
let ltpLocalid = localId;
let fieldsFilter;
try {
/****************************************************************************************
* Setting up request header object for making eatl request
Expand Down Expand Up @@ -585,7 +592,7 @@ exports.putLivePureEthernetStructurePerformanceMonitoringIsOn = async function (
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
if (responseFromODL.responseCode) {
response["response-code"] = responseFromODL.responseCode;
} else {
Expand Down Expand Up @@ -624,7 +631,8 @@ exports.putLiveWireInterfacePerformanceMonitoringIsOn = async function (body, mo
if (ltpUuid.includes('+')) {
ltpUuid = ltpUuid.split('+')[1]
}
let ltpLocalid = localId
let ltpLocalid = localId;
let fieldsFilter;
try {
/****************************************************************************************
* Setting up request header object for making eatl request
Expand Down Expand Up @@ -652,7 +660,7 @@ exports.putLiveWireInterfacePerformanceMonitoringIsOn = async function (body, mo
* Perform ODL request and formulate final response
****************************************************************************************/

let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, stringName, eatlRequestHeaders);
let responseFromODL = await ODLOperations.writeToLive(requestBody, forwardingName, pathParams, fieldsFilter, eatlRequestHeaders);
if (responseFromODL.responseCode) {
response["response-code"] = responseFromODL.responseCode;
} else {
Expand Down