jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

system: merge info and dmi routes

Browse Source 
also return uptimeSecs instead of abstract date
This commit is contained in:
Girish Ramakrishnan
2023-12-04 01:09:42 +01:00
parent eb64bd296a
commit cbf1b47332
5 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/routes/system.js
View File

@@ -12,7 +12,6 @@ exports = module.exports = {
getSystemGraphs,
getBlockDevices,
getCpus,
getDmi
};
const assert = require('assert'),
@@ -152,10 +151,3 @@ async function getCpus(req, res, next) {
next(new HttpSuccess(200, { cpus }));
}
async function getDmi(req, res, next) {
const [error, dmi] = await safe(system.getDmi());
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, { dmi }));
}

12
src/routes/test/system-test.js
View File

@@ -33,16 +33,18 @@ describe('System', function () {
});
});
describe('dmi', function () {
describe('info', function () {
it('succeeds', async function () {
const response = await superagent.get(`${serverUrl}/api/v1/system/dmi`)
const response = await superagent.get(`${serverUrl}/api/v1/system/info`)
.query({ access_token: owner.token });
expect(response.statusCode).to.equal(200);
expect(response.body.dmi).to.be.ok();
expect(response.body.info).to.be.ok();
expect(response.body.dmi.sysVendor).to.be.a('string');
expect(response.body.dmi.productName).to.be.a('string');
expect(response.body.info.sysVendor).to.be.a('string');
expect(response.body.info.productName).to.be.a('string');
expect(response.body.info.uptimeSecs).to.be.a('number');
expect(response.body.info.rebootRequired).to.be.a('boolean');
});
});