diff --git a/server/controllers/Core.js b/server/controllers/Core.js index ccf125a..c2e3854 100644 --- a/server/controllers/Core.js +++ b/server/controllers/Core.js @@ -6,16 +6,17 @@ var responseCodeEnum = require('onf-core-model-ap/applicationPattern/rest/server var Core = require('../service/CoreService'); var oamLogService = require('onf-core-model-ap/applicationPattern/services/OamLogService'); -module.exports.getControlConstruct = async function getControlConstruct(req, res, next) { +module.exports.getControlConstruct = async function getControlConstruct(req, res, next, pippo, pluto, topolino) { let responseCode = responseCodeEnum.code.OK; - await Core.getControlConstruct().then(function (response) { - let sentResp = responseBuilder.buildResponse(res, responseCode, response); - }) + await Core.getControlConstruct() + .then(function (response) { + responseBuilder.buildResponse(res, responseCode, response); + }) .catch(function (response) { let sentResp = responseBuilder.buildResponse(res, undefined, response); responseCode = sentResp.code; }); - //oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method); + oamLogService.recordOamRequest(req.url, req.body, responseCode, req.headers.authorization, req.method); }; module.exports.getProfileInstance = async function getProfileInstance(req, res, next, uuid) { diff --git a/server/service/CoreService.js b/server/service/CoreService.js index 10ae421..5761197 100644 --- a/server/service/CoreService.js +++ b/server/service/CoreService.js @@ -2,8 +2,6 @@ var fileOperation = require('onf-core-model-ap/applicationPattern/databaseDriver/JSONDriver'); const { elasticsearchService } = require('onf-core-model-ap/applicationPattern/services/ElasticsearchService'); - - /** * Returns entire data tree * @@ -11,112 +9,17 @@ const { elasticsearchService } = require('onf-core-model-ap/applicationPattern/s **/ exports.getControlConstruct = function () { return new Promise(async function (resolve, reject) { - var examples = {}; - examples['application/json'] = { - "core-model-1-4:control-construct": { - "profile-collection": { - "profile": [{ - "uuid": "ro-2-0-1-integer-p-000", - "profile-name": "integer-profile-1-0:PROFILE_NAME_TYPE_INTEGER_PROFILE", - "integer-profile-1-0:integer-profile-pac": { - "integer-profile-capability": { - "integer-name": "maximumNumberOfEntries", - "unit": "records", - "minimum": 0, - "maximum": 1000000 - }, - "integer-profile-configuration": { - "integer-value": 1000000 - } - } - }] - }, - "forwarding-domain": [{ - "uuid": "ro-2-0-1-op-fd-000", - "forwarding-construct": [{ - "uuid": "ro-2-0-1-op-fc-bm-003", - "name": [{ - "value-name": "ForwardingKind", - "value": "core-model-1-4:FORWARDING_KIND_TYPE_INVARIANT_PROCESS_SNIPPET" - }, { - "value-name": "ForwardingName", - "value": "OamRequestCausesLoggingRequest" - }], - "fc-port": [{ - "local-id": "000", - "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_MANAGEMENT", - "logical-termination-point": "ro-2-0-1-op-s-bm-003" - }, { - "local-id": "200", - "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_OUTPUT", - "logical-termination-point": "ro-2-0-1-op-c-bs-ol-2-0-1-000" - }] - }, { - "uuid": "ro-2-0-1-op-fc-bm-004", - "name": [{ - "value-name": "ForwardingKind", - "value": "core-model-1-4:FORWARDING_KIND_TYPE_INVARIANT_PROCESS_SNIPPET" - }, { - "value-name": "ForwardingName", - "value": "OamRequestCausesInquiryForAuthentication" - }], - "fc-port": [{ - "local-id": "000", - "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_MANAGEMENT", - "logical-termination-point": "ro-2-0-1-op-s-bm-005" - }, { - "local-id": "200", - "port-direction": "core-model-1-4:PORT_DIRECTION_TYPE_OUTPUT", - "logical-termination-point": "ro-2-0-1-op-c-bs-aa-2-0-1-000" - }] - }] - }], - "logical-termination-point": [{ - "uuid": "ro-2-0-1-op-c-bm-ro-2-0-1-000", - "ltp-direction": "core-model-1-4:TERMINATION_DIRECTION_SINK", - "client-ltp": [], - "server-ltp": ["ro-2-0-1-http-c-ro-2-0-1-000"], - "layer-protocol": [{ - "local-id": "0", - "layer-protocol-name": "operation-client-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_OPERATION_LAYER", - "operation-client-interface-1-0:operation-client-interface-pac": { - "operation-client-interface-configuration": { - "operation-name": "/v1/register-application", - "operation-key": "Operation key not yet provided." - }, - "operation-client-interface-status": { - "operational-state": "operation-client-interface-1-0:OPERATIONAL_STATE_TYPE_NOT_YET_DEFINED", - "life-cycle-state": "operation-client-interface-1-0:LIFE_CYCLE_STATE_TYPE_NOT_YET_DEFINED" - } - } - }] - }, { - "uuid": "ro-2-0-1-http-c-ro-2-0-1-000", - "ltp-direction": "core-model-1-4:TERMINATION_DIRECTION_SINK", - "client-ltp": ["ro-2-0-1-op-c-bm-ro-2-0-1-000"], - "server-ltp": ["ro-2-0-1-tcp-c-ro-2-0-1-000"], - "layer-protocol": [{ - "local-id": "0", - "layer-protocol-name": "http-client-interface-1-0:LAYER_PROTOCOL_NAME_TYPE_HTTP_LAYER", - "http-client-interface-1-0:http-client-interface-pac": { - "http-client-interface-configuration": { - "application-name": "RegistryOffice", - "release-number": "2.0.1" - } - } - }] - }], - "uuid": "ro-1-0-0" - } - }; - if (Object.keys(examples).length > 0) { - resolve(examples[Object.keys(examples)[0]]); - } else { - resolve(); - } - }); - + let value = await fileOperation.readFromDatabaseAsync("core-model-1-4:control-construct"); + let response = { + "core-model-1-4:control-construct": value + }; + if (Object.keys(response).length > 0) { + resolve(response[Object.keys(response)[0]]); + } else { + resolve(); + } + }); /*let client1 = await elasticsearchService.getClient(false); @@ -158,17 +61,6 @@ exports.getControlConstruct = function () { * returns inline_response_200_9 **/ exports.getProfileInstance = function (url) { - /*return new Promise(function (resolve, reject) { - var examples = {}; - examples['application/json'] = { - "core-model-1-4:profile": "" - }; - if (Object.keys(examples).length > 0) { - resolve(examples[Object.keys(examples)[0]]); - } else { - resolve(); - } - });*/ return new Promise(async function (resolve, reject) { try { var value = await fileOperation.readFromDatabaseAsync(url); diff --git a/server/service/IndividualServicesService.js b/server/service/IndividualServicesService.js index aa47831..7a261f8 100644 --- a/server/service/IndividualServicesService.js +++ b/server/service/IndividualServicesService.js @@ -753,7 +753,7 @@ exports.provideListOfNetworkElementInterfacesOnPathInGenericRepresentation = asy let operationServerName = req; if (inputValueList && inputValueList.length > 0) { -- // Build an array with "field-value" values + // Build an array with "field-value" values fieldValues = inputValueList.map(item => item["field-value"]); }