Skip to content
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

Add new /iot/groups API route #1648

Merged
merged 7 commits into from
Aug 26, 2024
Merged

Add new /iot/groups API route #1648

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c42cebe
Code + tests
mapedraza Aug 23, 2024
936d78c
Fix code
mapedraza Aug 26, 2024
517cdb7
Add FIXME message to routes
mapedraza Aug 26, 2024
b94b414
Fix DOC
mapedraza Aug 26, 2024
e07371d
Apply suggestions from code review
mapedraza Aug 26, 2024
24f421a
Apply suggestions from code review
mapedraza Aug 26, 2024
6b5d5cb
Add CNR entry
mapedraza Aug 26, 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
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: Fermín Galán Márquez <fgalan@users.noreply.github.com>
  • Loading branch information
@mapedraza @fgalan
mapedraza and fgalan authored Aug 26, 2024
commit e07371da683fd847dbbe8ec642759c9ef4e544a7
2 changes: 1 addition & 1 deletion lib/services/northBound/deviceGroupAdministrationServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const mandatoryHeaders = ['fiware-service', 'fiware-servicepath'];
const mandatoryParameters = ['resource', 'apikey'];
const constants = require('../../constants');

// Create new templeate for configuration groups replacing services by CONFIGGROUP_TERM
// Create new template for configuration groups replacing services by CONFIGGROUP_TERM
const templateGroup = JSON.parse(JSON.stringify(templateGroupService));
templateGroup.properties[constants.CONFIGGROUP_TERM] = templateGroup.properties.services;
delete templateGroup.properties.services;
Expand Down
4 changes: 2 additions & 2 deletions test/unit/general/deviceService-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
async.series([iotAgentLib.clearAll, iotAgentLib.deactivate], done);
});

//FIXME: this test will be removed if at the end /iot/services API (now Deprecated) is removed
// #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
describe('When an existing device tries to be retrieved with retrieveOrCreate()', function () {
beforeEach(function (done) {
contextBrokerMock = nock('http://192.168.1.1:1026')
Expand Down Expand Up @@ -277,7 +277,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
});
});

//FIXME: this test will be removed if at the end /iot/services API (now Deprecated) is removed
// #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed

describe('When an unexisting device tries to be retrieved for an existing APIKey', function () {
beforeEach(function (done) {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/mongodb/mongodb-configGroup-registry-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2015 Telefonica Investigación y Desarrollo, S.A.U
* Copyright 2024 Telefonica Investigación y Desarrollo, S.A.U
*
* This file is part of fiware-iotagent-lib
*
Expand Down
2 changes: 1 addition & 1 deletion test/unit/mongodb/mongodb-group-registry-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* Modified by: Daniel Calvo - ATOS Research & Innovation
*/

// FIXME: parallel tests in mongodb-configGroup-registry-test.js. Remove this file if at the end /iot/services API (now Deprecated) is removed
// #FIXME1649: parallel tests in mongodb-configGroup-registry-test.js. Remove this file if at the end /iot/services API (now Deprecated) is removed
/* eslint-disable no-unused-vars */

const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
Expand Down
4 changes: 2 additions & 2 deletions test/unit/ngsiv2/general/deviceService-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
nock.cleanAll();
async.series([iotAgentLib.clearAll, iotAgentLib.deactivate], done);
});
//FIXME: this test will be removed if at the end /iot/services API (now Deprecated) is removed
// #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
describe('When an existing device tries to be retrieved with retrieveOrCreate()', function () {
beforeEach(function (done) {
// This mock does not check the payload since the aim of the test is not to verify
Expand Down Expand Up @@ -272,7 +272,7 @@ describe('NGSI-v2 - Device Service: utils', function () {
});
});
});
//FIXME: this test will be removed if at the end /iot/services API (now Deprecated) is removed
// #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
describe('When an unexisting device tries to be retrieved for an existing APIKey', function () {
beforeEach(function (done) {
// This mock does not check the payload since the aim of the test is not to verify
Expand Down
6 changes: 3 additions & 3 deletions test/unit/ngsiv2/general/iotam-autoregistration-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ describe('NGSI-v2 - IoT Manager autoregistration', function () {
});
});

//FIXME: this test will be removed if at the end /iot/services API (now Deprecated) is removed
// #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
describe('When a new service is created in the IoT Agent', function () {
beforeEach(function (done) {
nock.cleanAll();
Expand Down Expand Up @@ -422,7 +422,7 @@ describe('NGSI-v2 - IoT Manager autoregistration', function () {
});
});

//FIXME: this test will be removed if at the end /iot/services API (now Deprecated) is removed
// #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
describe('When a service is removed from the IoT Agent', function () {
beforeEach(function (done) {
nock.cleanAll();
Expand Down Expand Up @@ -493,7 +493,7 @@ describe('NGSI-v2 - IoT Manager autoregistration', function () {
});
});

//FIXME: this test will be removed if at the end /iot/services API (now Deprecated) is removed
// #FIXME1649: this test will be removed if at the end /iot/services API (now Deprecated) is removed
describe('When a new service with static attributes is created in the IoT Agent', function () {
beforeEach(function (done) {
nock.cleanAll();
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/provisioning/device-group-api-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/* eslint-disable no-unused-vars */

// FIXME: parallel tests in device-provisioning-configGroup-api_test.js.
// #FIXME1649: parallel tests in device-provisioning-configGroup-api_test.js.

const iotAgentLib = require('../../../../lib/fiware-iotagent-lib');
const _ = require('underscore');
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ngsiv2/provisioning/device-provisioning-configGroup-api_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2014 Telefonica Investigación y Desarrollo, S.A.U
* Copyright 2024 Telefonica Investigación y Desarrollo, S.A.U
*
* This file is part of fiware-iotagent-lib
*
Expand Down
Loading