Skip to content

Latta-siae/issue282 #299

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
latta-siae merged 4 commits into from
Mar 4, 2025
Merged

Latta-siae/issue282 #299

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55ff787
Update core services without dummy data
latta-siae Feb 20, 2025
14e2d55
Unable to retrieve the response for API:/core-model-1-4:control-const…
latta-siae Mar 3, 2025
7c390be
Merge branch 'develop' into latta-siae/issue282
latta-siae Mar 4, 2025
a195840
fix small issue
latta-siae Mar 4, 2025
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
11 changes: 6 additions & 5 deletions server/controllers/Core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
128 changes: 10 additions & 118 deletions server/service/CoreService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,121 +2,24 @@
var fileOperation = require('onf-core-model-ap/applicationPattern/databaseDriver/JSONDriver');
const { elasticsearchService } = require('onf-core-model-ap/applicationPattern/services/ElasticsearchService');



/**
* Returns entire data tree
*
* returns inline_response_200_8
**/
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);
Expand Down Expand Up @@ -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);
Expand Down
Loading