Skip to content

Commit

Permalink
Merge branch 'master' into task/remove_domain
Browse files Browse the repository at this point in the history
  • Loading branch information
AlvaroVega committed Feb 23, 2024
2 parents b46d312 + 7e320dd commit 897d791
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 7 deletions.
3 changes: 1 addition & 2 deletions CHANGES_NEXT_RELEASE
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@


- Add: support `POST /iot/op/delete` operation at iotAgent API to delete multiple devices at once (iota-node-lib#1578)
5 changes: 5 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
3.1.0 (January 8th, 2024)

- Add: transport and endpoint to Group model (iotagent-node-lib#1542)
- Upgrade iotagent-node-lib dependency from 4.0.0 to 4.1.0

3.0.0 (November 24th, 2023)

- Add: payloadType to device and groups model (iotagent-json#778)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ In order to run the docker image, first you must have a MongoDB instance running
following command:

```console
docker run --name mongodb -d mongo
docker run -d -p 27017:27017 --hostname mongo --name mongo mongo:6.0.12
```

### Build your own Docker image
Expand Down
7 changes: 7 additions & 0 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: "3"

services:
mongo:
image: mongo:6.0.12
ports:
- "27017:27017"
4 changes: 3 additions & 1 deletion lib/model/Configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ const Configuration = new Schema({
timestamp: Boolean,
explicitAttrs: ExplicitAttrsType,
entityNameExp: String,
payloadType: String
payloadType: String,
endpoint: String,
transport: String
});

function load(db) {
Expand Down
8 changes: 6 additions & 2 deletions lib/services/configurations.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ const retrievingAPITranslation = {
description: 'description',
explicitAttrs: 'explicitAttrs',
entityNameExp: 'entityNameExp',
payloadType: 'payloadType'
payloadType: 'payloadType',
transport: 'transport',
endpoint: 'endpoint'
};

function isInvalidParameter(param) {
Expand Down Expand Up @@ -83,7 +85,9 @@ function translateToApi(logger, configurations) {
'timestamp',
'explicitAttrs',
'entityNameExp',
'payloadType'
'payloadType',
'endpoint',
'transport'
];

logger.debug('configurations %j', configurations);
Expand Down
1 change: 1 addition & 0 deletions lib/services/iotaRedirector.js
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ function loadContextRoutes(router) {
router.get('/iot/devices', middlewareList);
router.get('/iot/devices/:id', middlewareList);
router.put('/iot/devices/:id', middlewareList);
router.post('/iot/op/delete', middlewareList);
router.delete('/iot/devices/:id', middlewareList);
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "iotagent-manager",
"description": "IoT Agent Manager proxy",
"version": "3.0.0-next",
"version": "3.1.0-next",
"homepage": "https://github.com/telefonicaid/iotagent-manager",
"author": {
"name": "Daniel Moran",
Expand Down

0 comments on commit 897d791

Please sign in to comment.