iotagent-node-lib 2.15.1 → 2.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/ci.yml +17 -1
- package/.readthedocs.yml +7 -0
- package/CHANGES_NEXT_RELEASE +0 -1
- package/README.md +1 -0
- package/doc/Contribution.md +60 -1
- package/doc/advanced-topics.md +136 -14
- package/doc/api.md +38 -22
- package/doc/apiary/iotagent.apib +1 -3
- package/doc/architecture.md +2 -2
- package/doc/config-basic-example.js +0 -1
- package/doc/deprecated.md +2 -2
- package/doc/development.md +13 -6
- package/doc/expressionLanguage.md +519 -277
- package/doc/getting-started.md +0 -1
- package/doc/howto.md +13 -17
- package/doc/installationguide.md +67 -69
- package/doc/usermanual.md +48 -16
- package/docker/Mosquitto/Dockerfile +4 -9
- package/docker/Mosquitto/README.md +2 -0
- package/docker/Mosquitto/startMosquitto.sh +18 -1
- package/lib/command/commandLine.js +1 -1
- package/lib/commonConfig.js +5 -14
- package/lib/errors.js +0 -16
- package/lib/fiware-iotagent-lib.js +5 -0
- package/lib/jexlTranformsMap.js +71 -0
- package/lib/model/Command.js +1 -1
- package/lib/model/Device.js +5 -2
- package/lib/model/Group.js +20 -2
- package/lib/model/dbConn.js +7 -1
- package/lib/plugins/attributeAlias.js +6 -13
- package/lib/plugins/bidirectionalData.js +2 -27
- package/lib/plugins/expressionParser.js +41 -17
- package/lib/plugins/expressionPlugin.js +21 -27
- package/lib/plugins/jexlParser.js +71 -67
- package/lib/plugins/multiEntity.js +68 -147
- package/lib/plugins/pluginUtils.js +12 -48
- package/lib/plugins/timestampProcessPlugin.js +1 -46
- package/lib/request-shim.js +111 -0
- package/lib/services/common/domain.js +2 -2
- package/lib/services/common/genericMiddleware.js +6 -2
- package/lib/services/common/iotManagerService.js +1 -1
- package/lib/services/common/securityServiceKeystone.js +1 -1
- package/lib/services/common/securityServiceOAuth2.js +3 -2
- package/lib/services/devices/deviceRegistryMongoDB.js +29 -22
- package/lib/services/devices/deviceService.js +56 -33
- package/lib/services/devices/devices-NGSI-LD.js +42 -14
- package/lib/services/devices/devices-NGSI-mixed.js +3 -3
- package/lib/services/devices/devices-NGSI-v2.js +48 -24
- package/lib/services/devices/registrationUtils.js +1 -134
- package/lib/services/groups/groupRegistryMemory.js +2 -0
- package/lib/services/groups/groupRegistryMongoDB.js +58 -76
- package/lib/services/groups/groupService.js +1 -1
- package/lib/services/ngsi/entities-NGSI-LD.js +205 -124
- package/lib/services/ngsi/entities-NGSI-v2.js +142 -32
- package/lib/services/ngsi/ngsiService.js +4 -6
- package/lib/services/ngsi/ngsiUtils.js +0 -21
- package/lib/services/ngsi/subscription-NGSI-LD.js +14 -5
- package/lib/services/ngsi/subscriptionService.js +1 -4
- package/lib/services/northBound/contextServer-NGSI-LD.js +7 -2
- package/lib/services/northBound/contextServer-NGSI-v2.js +25 -13
- package/lib/services/northBound/contextServer.js +1 -4
- package/lib/services/northBound/contextServerUtils.js +0 -81
- package/lib/services/northBound/deviceProvisioningServer.js +36 -9
- package/lib/services/northBound/northboundServer.js +2 -0
- package/lib/services/northBound/restUtils.js +2 -39
- package/lib/templates/updateDevice.json +4 -0
- package/lib/templates/updateDeviceLax.json +4 -0
- package/package.json +13 -13
- package/test/tools/utils.js +2 -0
- package/test/unit/examples/deviceProvisioningRequests/provisionAnotherDevice.json +1 -1
- package/test/unit/examples/deviceProvisioningRequests/provisionDeviceMissingParameters.json +1 -1
- package/test/unit/examples/deviceProvisioningRequests/provisionDuplicatedDev.json +1 -1
- package/test/unit/examples/deviceProvisioningRequests/provisionFullDevice.json +1 -1
- package/test/unit/examples/deviceProvisioningRequests/provisionNewDeviceMalformed1.json +1 -1
- package/test/unit/examples/groupProvisioningRequests/multipleGroupsCreation.json +1 -1
- package/test/unit/examples/iotamRequests/registrationEmpty.json +1 -1
- package/test/unit/examples/iotamRequests/registrationWithGroups.json +2 -2
- package/test/unit/examples/iotamRequests/registrationWithGroupsWithoutCB.json +2 -2
- package/test/unit/examples/iotamRequests/registrationWithStaticGroups.json +2 -2
- package/test/unit/expressions/jexlExpression-test.js +119 -0
- package/test/unit/general/config-multi-core-test.js +1 -1
- package/test/unit/general/contextBrokerKeystoneSecurityAccess-test.js +30 -77
- package/test/unit/general/deviceService-test.js +19 -35
- package/test/unit/general/loglevel-api_test.js +8 -13
- package/test/unit/general/migration-test.js +1 -0
- package/test/unit/general/startup-test.js +3 -2
- package/test/unit/general/statistics-persistence_test.js +2 -2
- package/test/unit/general/statistics-service_test.js +2 -2
- package/test/unit/lazyAndCommands/commandRegistry_test.js +18 -18
- package/test/unit/memoryRegistry/deviceRegistryMemory_test.js +16 -24
- package/test/unit/mongodb/mongodb-connectionoptions-test.js +2 -2
- package/test/unit/mongodb/mongodb-group-registry-test.js +11 -11
- package/test/unit/mongodb/mongodb-registry-test.js +55 -131
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent1.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent2.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgent4.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerIoTAgentCommands.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDevice.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDevice2.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup2.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup3.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/updateCommands1.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/updateIoTAgent1.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/updateIoTAgent2.json +1 -1
- package/test/unit/ngsi-ld/examples/contextAvailabilityRequests/updateIoTAgent3.json +1 -1
- package/test/unit/ngsi-ld/examples/contextRequests/createMinimumProvisionedDevice.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/createProvisionedDevice.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/createProvisionedDeviceMultientity.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/createProvisionedDeviceWithGroupAndStatic.json +0 -14
- package/test/unit/ngsi-ld/examples/contextRequests/createProvisionedDeviceWithGroupAndStatic2.json +0 -14
- package/test/unit/ngsi-ld/examples/contextRequests/createProvisionedDeviceWithGroupAndStatic3.json +1 -15
- package/test/unit/ngsi-ld/examples/contextRequests/createTimeInstantMinimumDevice.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextAliasPlugin6.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextAutocast5.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin12a.json +7 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin13.json +13 -13
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin16.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin17.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin1a.json +18 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin29.json +18 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin31.json +15 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin32.json +17 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin33.json +18 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin34.json +17 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin4a.json +36 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin5.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin7.json +16 -16
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin8a.json +18 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextGeoproperties3.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityPlugin15.json +25 -0
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin1.json +6 -6
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextMultientityTimestampPlugin2.json +3 -3
- package/test/unit/ngsi-ld/examples/contextRequests/updateProvisionActiveAttributes1.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateProvisionCommands1.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateProvisionDeviceStatic.json +0 -7
- package/test/unit/ngsi-ld/examples/contextRequests/updateProvisionMinimumDevice.json +0 -7
- package/test/unit/ngsi-ld/examples/subscriptionRequests/bidirectionalSubscriptionRequest.json +20 -17
- package/test/unit/ngsi-ld/examples/subscriptionRequests/simpleSubscriptionRequest.json +18 -15
- package/test/unit/ngsi-ld/examples/subscriptionRequests/simpleSubscriptionRequest2.json +18 -15
- package/test/unit/ngsi-ld/expressions/expressionBasedTransformations-test.js +21 -21
- package/test/unit/ngsi-ld/expressions/jexlBasedTransformations-test.js +1018 -0
- package/test/unit/ngsi-ld/general/config-jsonld-contexts-test.js +2 -2
- package/test/unit/ngsi-ld/general/contextBrokerOAuthSecurityAccess-test.js +24 -24
- package/test/unit/ngsi-ld/general/deviceService-test.js +7 -7
- package/test/unit/ngsi-ld/general/https-support-test.js +14 -13
- package/test/unit/ngsi-ld/general/iotam-autoregistration-test.js +8 -7
- package/test/unit/ngsi-ld/general/startup-test.js +2 -1
- package/test/unit/ngsi-ld/lazyAndCommands/active-devices-attribute-update-test.js +10 -8
- package/test/unit/ngsi-ld/lazyAndCommands/command-test.js +11 -12
- package/test/unit/ngsi-ld/lazyAndCommands/lazy-devices-test.js +25 -29
- package/test/unit/ngsi-ld/lazyAndCommands/polling-commands-test.js +16 -15
- package/test/unit/ngsi-ld/ngsiService/active-devices-test.js +18 -17
- package/test/unit/ngsi-ld/ngsiService/autocast-test.js +13 -12
- package/test/unit/ngsi-ld/ngsiService/geoproperties-test.js +10 -9
- package/test/unit/ngsi-ld/ngsiService/staticAttributes-test.js +3 -3
- package/test/unit/ngsi-ld/ngsiService/subscriptions-test.js +25 -24
- package/test/unit/ngsi-ld/plugins/alias-plugin_test.js +13 -12
- package/test/unit/ngsi-ld/plugins/bidirectional-plugin_test.js +27 -26
- package/test/unit/ngsi-ld/plugins/compress-timestamp-plugin_test.js +5 -5
- package/test/unit/ngsi-ld/plugins/event-plugin_test.js +3 -3
- package/test/unit/ngsi-ld/plugins/multientity-plugin_test.js +75 -14
- package/test/unit/ngsi-ld/plugins/timestamp-processing-plugin_test.js +3 -3
- package/test/unit/ngsi-ld/provisioning/device-provisioning-api_test.js +54 -53
- package/test/unit/ngsi-ld/provisioning/device-registration_test.js +20 -19
- package/test/unit/ngsi-ld/provisioning/device-update-registration_test.js +23 -22
- package/test/unit/ngsi-ld/provisioning/listProvisionedDevices-test.js +58 -70
- package/test/unit/ngsi-ld/provisioning/provisionDeviceMultientity-test.js +8 -7
- package/test/unit/ngsi-ld/provisioning/removeProvisionedDevice-test.js +19 -19
- package/test/unit/ngsi-ld/provisioning/singleConfigurationMode-test.js +18 -20
- package/test/unit/ngsi-ld/provisioning/updateProvisionedDevices-test.js +43 -49
- package/test/unit/ngsi-mixed/provisioning/ngsi-versioning-test.js +16 -14
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent1.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent2.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent3.json +19 -0
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent4.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent5.json +19 -0
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgentCommands.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerProvisionedDevice.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerProvisionedDevice2.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup2.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup3.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/updateCommands1.json +3 -3
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/updateIoTAgent1.json +3 -3
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/updateIoTAgent2.json +1 -1
- package/test/unit/ngsiv2/examples/contextAvailabilityRequests/updateIoTAgent3.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin1.json +17 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin11.json +5 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin12.json +2 -2
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin15.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin16.json +14 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin17.json +14 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin18.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin19.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin2.json +13 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin20.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin21.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin22.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin23.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin24.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin25.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin26.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin27.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin28.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin29.json +22 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin3.json +5 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin30.json +6 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin31.json +18 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin32.json +16 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin33.json +22 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin34.json +12 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin4.json +12 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin5.json +5 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin6.json +5 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin7.json +5 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin8.json +17 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextExpressionPlugin9.json +5 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMiddleware1.json +10 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMiddleware2.json +10 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin1.json +2 -2
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin10.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin11.json +13 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin12.json +33 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin13.json +33 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin14.json +33 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin15.json +25 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin16.json +25 -0
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin2.json +2 -2
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin3.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin4.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin5.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin6.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin7.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin8.json +2 -2
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityPlugin9.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityTimestampPlugin1.json +8 -8
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityTimestampPlugin2.json +4 -4
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityTimestampPlugin3.json +1 -1
- package/test/unit/ngsiv2/examples/contextRequests/updateContextMultientityTimestampPlugin4.json +2 -2
- package/test/unit/ngsiv2/examples/contextRequests/updateProvisionDevice.json +20 -0
- package/test/unit/ngsiv2/examples/subscriptionRequests/bidirectionalSubscriptionRequest.json +1 -1
- package/test/unit/ngsiv2/examples/subscriptionRequests/simpleSubscriptionRequest.json +1 -1
- package/test/unit/ngsiv2/examples/subscriptionRequests/simpleSubscriptionRequest2.json +1 -1
- package/test/unit/ngsiv2/expressions/expressionBasedTransformations-test.js +93 -60
- package/test/unit/ngsiv2/expressions/expressionCombinedTransformations-test.js +16 -16
- package/test/unit/ngsiv2/expressions/jexlBasedTransformations-test.js +548 -164
- package/test/unit/ngsiv2/general/contextBrokerOAuthSecurityAccess-test.js +34 -33
- package/test/unit/ngsiv2/general/deviceService-test.js +15 -14
- package/test/unit/ngsiv2/general/https-support-test.js +14 -13
- package/test/unit/ngsiv2/general/iotam-autoregistration-test.js +8 -7
- package/test/unit/ngsiv2/general/startup-test.js +2 -1
- package/test/unit/ngsiv2/lazyAndCommands/active-devices-attribute-update-test.js +9 -7
- package/test/unit/ngsiv2/lazyAndCommands/command-test.js +13 -12
- package/test/unit/ngsiv2/lazyAndCommands/lazy-devices-test.js +323 -51
- package/test/unit/ngsiv2/lazyAndCommands/polling-commands-test.js +22 -20
- package/test/unit/ngsiv2/ngsiService/active-devices-test.js +114 -26
- package/test/unit/ngsiv2/ngsiService/autocast-test.js +16 -16
- package/test/unit/ngsiv2/ngsiService/geoproperties-test.js +39 -38
- package/test/unit/{ngsiService → ngsiv2/ngsiService}/queryDeviceInformationInCb-test.js +25 -54
- package/test/unit/ngsiv2/ngsiService/staticAttributes-test.js +5 -5
- package/test/unit/ngsiv2/ngsiService/subscriptions-test.js +25 -24
- package/test/unit/ngsiv2/plugins/alias-plugin_test.js +22 -22
- package/test/unit/ngsiv2/plugins/bidirectional-plugin_test.js +27 -26
- package/test/unit/ngsiv2/plugins/compress-timestamp-plugin_test.js +7 -7
- package/test/unit/ngsiv2/plugins/event-plugin_test.js +4 -4
- package/test/unit/ngsiv2/plugins/multientity-plugin_test.js +549 -24
- package/test/unit/ngsiv2/plugins/timestamp-processing-plugin_test.js +4 -4
- package/test/unit/{plugins → ngsiv2/plugins}/translation-inPlugins_test.js +25 -25
- package/test/unit/{provisioning → ngsiv2/provisioning}/device-group-api-test.js +44 -75
- package/test/unit/{provisioning/device-group-utils_test.js → ngsiv2/provisioning/device-group-utils-test.js} +15 -14
- package/test/unit/ngsiv2/provisioning/device-provisioning-api_test.js +74 -73
- package/test/unit/ngsiv2/provisioning/device-registration_test.js +20 -19
- package/test/unit/ngsiv2/provisioning/device-update-registration_test.js +30 -29
- package/test/unit/ngsiv2/provisioning/listProvisionedDevices-test.js +58 -69
- package/test/unit/ngsiv2/provisioning/provisionDeviceMultientity-test.js +8 -7
- package/test/unit/ngsiv2/provisioning/removeProvisionedDevice-test.js +19 -19
- package/test/unit/ngsiv2/provisioning/singleConfigurationMode-test.js +18 -19
- package/test/unit/ngsiv2/provisioning/updateProvisionedDevices-test.js +49 -52
- package/test/unit/plugins/capture-configuration-inPlugins_test.js +6 -4
- package/test/unit/plugins/capture-provision-inPlugins_test.js +13 -23
- package/.nyc_output/016aca19-69bf-4681-9b41-2835c5131681.json +0 -1
- package/.nyc_output/processinfo/016aca19-69bf-4681-9b41-2835c5131681.json +0 -1
- package/.nyc_output/processinfo/index.json +0 -1
- package/lib/services/devices/devices-NGSI-v1.js +0 -293
- package/lib/services/devices/registrationUtils.js_avega +0 -589
- package/lib/services/ngsi/entities-NGSI-v1.js +0 -300
- package/lib/services/ngsi/subscription-NGSI-v1.js +0 -234
- package/lib/services/northBound/contextServer-NGSI-v1.js +0 -526
- package/lib/templates/notificationTemplateNgsi1.json +0 -75
- package/lib/templates/updateContextNgsi1.json +0 -50
- package/test/unit/examples/contextAvailabilityRequests/registerIoTAgent1.json +0 -21
- package/test/unit/examples/contextAvailabilityRequests/registerIoTAgent2.json +0 -21
- package/test/unit/examples/contextAvailabilityRequests/registerIoTAgent3.json +0 -25
- package/test/unit/examples/contextAvailabilityRequests/registerIoTAgent4.json +0 -22
- package/test/unit/examples/contextAvailabilityRequests/registerIoTAgentAttributeUpdates.json +0 -16
- package/test/unit/examples/contextAvailabilityRequests/registerIoTAgentCommands.json +0 -21
- package/test/unit/examples/contextAvailabilityRequests/registerNewDevice1.json +0 -21
- package/test/unit/examples/contextAvailabilityRequests/registerNewDevice2.json +0 -21
- package/test/unit/examples/contextAvailabilityRequests/registerProvisionedDevice.json +0 -25
- package/test/unit/examples/contextAvailabilityRequests/registerProvisionedDevice2.json +0 -21
- package/test/unit/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup.json +0 -33
- package/test/unit/examples/contextAvailabilityRequests/registerProvisionedDeviceWithGroup2.json +0 -33
- package/test/unit/examples/contextAvailabilityRequests/unregisterDevice1.json +0 -22
- package/test/unit/examples/contextAvailabilityRequests/unregisterDevice3.json +0 -26
- package/test/unit/examples/contextAvailabilityRequests/unregisterProvisionedDevice.json +0 -26
- package/test/unit/examples/contextAvailabilityRequests/updateCommands1.json +0 -22
- package/test/unit/examples/contextAvailabilityRequests/updateIoTAgent1.json +0 -22
- package/test/unit/examples/contextAvailabilityRequests/updateIoTAgent2.json +0 -26
- package/test/unit/examples/contextAvailabilityRequests/updateIoTAgent3.json +0 -22
- package/test/unit/examples/contextAvailabilityResponses/registerIoTAgent1Failed.json +0 -8
- package/test/unit/examples/contextAvailabilityResponses/registerIoTAgent1Success.json +0 -4
- package/test/unit/examples/contextAvailabilityResponses/registerNewDevice1Success.json +0 -4
- package/test/unit/examples/contextAvailabilityResponses/registerNewDevice2Success.json +0 -4
- package/test/unit/examples/contextAvailabilityResponses/registerProvisionedDeviceSuccess.json +0 -4
- package/test/unit/examples/contextAvailabilityResponses/unregisterDevice1Failed.json +0 -8
- package/test/unit/examples/contextAvailabilityResponses/unregisterDevice1Success.json +0 -4
- package/test/unit/examples/contextAvailabilityResponses/updateCommands1Success.json +0 -4
- package/test/unit/examples/contextAvailabilityResponses/updateIoTAgent1Success.json +0 -6
- package/test/unit/examples/contextProviderResponses/queryInformationResponse.json +0 -22
- package/test/unit/examples/contextProviderResponses/queryInformationResponseEmptyAttributes.json +0 -22
- package/test/unit/examples/contextProviderResponses/queryInformationStaticAttributesResponse.json +0 -27
- package/test/unit/examples/contextProviderResponses/updateInformationResponse.json +0 -22
- package/test/unit/examples/contextProviderResponses/updateInformationResponse2.json +0 -22
- package/test/unit/examples/contextRequests/contextSubscriptionRequest.json +0 -20
- package/test/unit/examples/contextRequests/contextSubscriptionRequest2.json +0 -20
- package/test/unit/examples/contextRequests/createBidirectionalDevice.json +0 -17
- package/test/unit/examples/contextRequests/createDatetimeProvisionedDevice.json +0 -17
- package/test/unit/examples/contextRequests/createGeopointProvisionedDevice.json +0 -17
- package/test/unit/examples/contextRequests/createMinimumProvisionedDevice.json +0 -17
- package/test/unit/examples/contextRequests/createProvisionedDevice.json +0 -32
- package/test/unit/examples/contextRequests/createProvisionedDeviceMultientity.json +0 -32
- package/test/unit/examples/contextRequests/createProvisionedDeviceWithGroup.json +0 -47
- package/test/unit/examples/contextRequests/createProvisionedDeviceWithGroupAndStatic.json +0 -52
- package/test/unit/examples/contextRequests/createProvisionedDeviceWithGroupAndStatic2.json +0 -52
- package/test/unit/examples/contextRequests/createTimeinstantDevice.json +0 -17
- package/test/unit/examples/contextRequests/queryContext1.json +0 -13
- package/test/unit/examples/contextRequests/queryContext2.json +0 -13
- package/test/unit/examples/contextRequests/queryContextAliasPlugin1.json +0 -10
- package/test/unit/examples/contextRequests/queryContextCompressTimestamp1.json +0 -13
- package/test/unit/examples/contextRequests/updateActiveAttributes.json +0 -11
- package/test/unit/examples/contextRequests/updateContext1.json +0 -22
- package/test/unit/examples/contextRequests/updateContext2.json +0 -22
- package/test/unit/examples/contextRequests/updateContext3.json +0 -17
- package/test/unit/examples/contextRequests/updateContext3WithStatic.json +0 -22
- package/test/unit/examples/contextRequests/updateContext4.json +0 -22
- package/test/unit/examples/contextRequests/updateContext5.json +0 -19
- package/test/unit/examples/contextRequests/updateContextAliasPlugin.json +0 -22
- package/test/unit/examples/contextRequests/updateContextAliasPlugin2.json +0 -17
- package/test/unit/examples/contextRequests/updateContextAppendMode.json +0 -22
- package/test/unit/examples/contextRequests/updateContextCommandError.json +0 -22
- package/test/unit/examples/contextRequests/updateContextCommandExpired.json +0 -22
- package/test/unit/examples/contextRequests/updateContextCommandFinish.json +0 -22
- package/test/unit/examples/contextRequests/updateContextCommandStatus.json +0 -17
- package/test/unit/examples/contextRequests/updateContextCompressTimestamp1.json +0 -22
- package/test/unit/examples/contextRequests/updateContextCompressTimestamp2.json +0 -29
- package/test/unit/examples/contextRequests/updateContextExpressionPlugin1.json +0 -17
- package/test/unit/examples/contextRequests/updateContextExpressionPlugin2.json +0 -27
- package/test/unit/examples/contextRequests/updateContextExpressionPlugin3.json +0 -17
- package/test/unit/examples/contextRequests/updateContextExpressionPlugin4.json +0 -17
- package/test/unit/examples/contextRequests/updateContextExpressionPlugin5.json +0 -27
- package/test/unit/examples/contextRequests/updateContextMiddleware1.json +0 -22
- package/test/unit/examples/contextRequests/updateContextMultiEntityPlugin3.json +0 -35
- package/test/unit/examples/contextRequests/updateContextMultientityPlugin1.json +0 -30
- package/test/unit/examples/contextRequests/updateContextMultientityPlugin2.json +0 -30
- package/test/unit/examples/contextRequests/updateContextProcessTimestamp1.json +0 -29
- package/test/unit/examples/contextRequests/updateContextStaticAttributes.json +0 -22
- package/test/unit/examples/contextRequests/updateContextTimestamp.json +0 -41
- package/test/unit/examples/contextRequests/updateContextTimestampOverride.json +0 -22
- package/test/unit/examples/contextRequests/updateContextTimestampOverrideWithoutMilis.json +0 -22
- package/test/unit/examples/contextRequests/updateContextTimestampTimezone.json +0 -41
- package/test/unit/examples/contextRequests/updateProvisionActiveAttributes1.json +0 -17
- package/test/unit/examples/contextRequests/updateProvisionCommands1.json +0 -27
- package/test/unit/examples/contextRequests/updateProvisionDeviceStatic.json +0 -38
- package/test/unit/examples/contextRequests/updateProvisionMinimumDevice.json +0 -17
- package/test/unit/examples/contextResponses/contextSubscriptionRequest2Success.json +0 -7
- package/test/unit/examples/contextResponses/contextSubscriptionRequestSuccess.json +0 -7
- package/test/unit/examples/contextResponses/createBidirectionalDeviceSuccess.json +0 -22
- package/test/unit/examples/contextResponses/createDatetimeProvisionedDeviceSuccess.json +0 -22
- package/test/unit/examples/contextResponses/createGeopointProvisionedDeviceSuccess.json +0 -22
- package/test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json +0 -22
- package/test/unit/examples/contextResponses/createTimeinstantSuccess.json +0 -22
- package/test/unit/examples/contextResponses/queryContext1Success.json +0 -27
- package/test/unit/examples/contextResponses/queryContext2Error.json +0 -7
- package/test/unit/examples/contextResponses/queryContext2UnknownError.json +0 -6
- package/test/unit/examples/contextResponses/queryContext3Error.json +0 -34
- package/test/unit/examples/contextResponses/queryContextAliasPlugin1Success.json +0 -27
- package/test/unit/examples/contextResponses/queryContextCompressTimestamp1Success.json +0 -27
- package/test/unit/examples/contextResponses/updateActiveAttributesSuccess.json +0 -16
- package/test/unit/examples/contextResponses/updateContext1Failed.json +0 -7
- package/test/unit/examples/contextResponses/updateContext1Success.json +0 -27
- package/test/unit/examples/contextResponses/updateContext2Failed.json +0 -35
- package/test/unit/examples/contextResponses/updateContextAliasPlugin2Success.json +0 -27
- package/test/unit/examples/contextResponses/updateContextAliasPluginSuccess.json +0 -27
- package/test/unit/examples/contextResponses/updateContextCommandFinishSuccess.json +0 -27
- package/test/unit/examples/contextResponses/updateContextCommandStatusSuccess.json +0 -22
- package/test/unit/examples/contextResponses/updateContextCompressTimestamp1Success.json +0 -27
- package/test/unit/examples/contextResponses/updateContextCompressTimestamp2Success.json +0 -34
- package/test/unit/examples/contextResponses/updateContextEvents1Success.json +0 -27
- package/test/unit/examples/contextResponses/updateContextExpressionPlugin1Success.json +0 -22
- package/test/unit/examples/contextResponses/updateContextExpressionPlugin2Success.json +0 -22
- package/test/unit/examples/contextResponses/updateContextExpressionPlugin3Success.json +0 -22
- package/test/unit/examples/contextResponses/updateContextExpressionPlugin5Success.json +0 -32
- package/test/unit/examples/contextResponses/updateContextMultientityPlugin1Success.json +0 -40
- package/test/unit/examples/contextResponses/updateContextMultientityPlugin2Success.json +0 -40
- package/test/unit/examples/contextResponses/updateContextMultientityPlugin3Success.json +0 -40
- package/test/unit/examples/contextResponses/updateContextProcessTimestamp1Success.json +0 -27
- package/test/unit/examples/contextResponses/updateProvisionActiveAttributes1Success.json +0 -22
- package/test/unit/examples/contextResponses/updateProvisionCommands1Success.json +0 -32
- package/test/unit/examples/contextResponses/updateProvisionMinimumDeviceSuccess.json +0 -22
- package/test/unit/examples/subscriptionRequests/bidirectionalNotification.json +0 -24
- package/test/unit/examples/subscriptionRequests/bidirectionalSubscriptionRemove.json +0 -3
- package/test/unit/examples/subscriptionRequests/bidirectionalSubscriptionRequest.json +0 -22
- package/test/unit/examples/subscriptionRequests/errorNotification.json +0 -24
- package/test/unit/examples/subscriptionRequests/simpleNotification.json +0 -24
- package/test/unit/examples/subscriptionRequests/simpleSubscriptionRemove.json +0 -3
- package/test/unit/examples/subscriptionRequests/simpleSubscriptionRequest.json +0 -19
- package/test/unit/examples/subscriptionRequests/simpleSubscriptionRequest1.json +0 -19
- package/test/unit/examples/subscriptionResponses/bidirectionalSubscriptionSuccess.json +0 -6
- package/test/unit/examples/subscriptionResponses/simpleSubscriptionSuccess.json +0 -6
- package/test/unit/expressions/expressionBasedTransformations-test.js +0 -328
- package/test/unit/expressions/expressionCombinedTransformations-test.js +0 -306
- package/test/unit/expressions/jexlBasedTransformations-test.js +0 -334
- package/test/unit/general/contextBrokerOAuthSecurityAccess-test.js +0 -902
- package/test/unit/general/https-support-test.js +0 -286
- package/test/unit/general/iotam-autoregistration-test.js +0 -368
- package/test/unit/lazyAndCommands/active-devices-attribute-update-test.js +0 -168
- package/test/unit/lazyAndCommands/command-test.js +0 -341
- package/test/unit/lazyAndCommands/lazy-devices-test.js +0 -878
- package/test/unit/lazyAndCommands/polling-commands-test.js +0 -421
- package/test/unit/ngsi-ld/examples/contextRequests/updateContextExpressionPlugin20.json +0 -25
- package/test/unit/ngsiService/active-devices-test.js +0 -692
- package/test/unit/ngsiService/staticAttributes-test.js +0 -148
- package/test/unit/ngsiService/subscriptions-test.js +0 -345
- package/test/unit/plugins/alias-plugin_test.js +0 -158
- package/test/unit/plugins/bidirectional-plugin_test.js +0 -564
- package/test/unit/plugins/compress-timestamp-plugin_test.js +0 -257
- package/test/unit/plugins/event-plugin_test.js +0 -119
- package/test/unit/plugins/multientity-plugin_test.js +0 -248
- package/test/unit/plugins/timestamp-processing-plugin_test.js +0 -119
- package/test/unit/provisioning/device-provisioning-api_test.js +0 -748
- package/test/unit/provisioning/device-registration_test.js +0 -432
- package/test/unit/provisioning/device-update-registration_test.js +0 -326
- package/test/unit/provisioning/listProvisionedDevices-test.js +0 -488
- package/test/unit/provisioning/provisionDeviceMultientity-test.js +0 -123
- package/test/unit/provisioning/removeProvisionedDevice-test.js +0 -244
- package/test/unit/provisioning/singleConfigurationMode-test.js +0 -346
- package/test/unit/provisioning/updateProvisionedDevices-test.js +0 -436
|
@@ -28,6 +28,7 @@ const async = require('async');
|
|
|
28
28
|
const should = require('should');
|
|
29
29
|
const nock = require('nock');
|
|
30
30
|
const utils = require('../../tools/utils');
|
|
31
|
+
const request = utils.request;
|
|
31
32
|
const iotAgentConfig = {
|
|
32
33
|
logLevel: 'FATAL',
|
|
33
34
|
contextBroker: {
|
|
@@ -43,14 +44,14 @@ const iotAgentConfig = {
|
|
|
43
44
|
deviceRegistry: {
|
|
44
45
|
type: 'memory'
|
|
45
46
|
},
|
|
46
|
-
service: '
|
|
47
|
+
service: 'smartgondor',
|
|
47
48
|
subservice: 'gardens',
|
|
48
|
-
providerUrl: 'http://
|
|
49
|
+
providerUrl: 'http://smartgondor.com',
|
|
49
50
|
deviceRegistrationDuration: 'P1M'
|
|
50
51
|
};
|
|
51
52
|
let contextBrokerMock;
|
|
52
53
|
|
|
53
|
-
describe('In memory device registry', function () {
|
|
54
|
+
describe('NGSI-v2 - In memory device registry', function () {
|
|
54
55
|
beforeEach(function (done) {
|
|
55
56
|
iotAgentLib.activate(iotAgentConfig, done);
|
|
56
57
|
});
|
|
@@ -62,14 +63,11 @@ describe('In memory device registry', function () {
|
|
|
62
63
|
describe('When a the registry is queried for a device using an arbitrary attribute', function () {
|
|
63
64
|
beforeEach(function (done) {
|
|
64
65
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
65
|
-
.post('/
|
|
66
|
+
.post('/v2/entities?options=upsert')
|
|
66
67
|
.times(10)
|
|
67
|
-
.matchHeader('fiware-service', '
|
|
68
|
+
.matchHeader('fiware-service', 'smartgondor')
|
|
68
69
|
.matchHeader('fiware-servicepath', 'gardens')
|
|
69
|
-
.reply(
|
|
70
|
-
200,
|
|
71
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
72
|
-
);
|
|
70
|
+
.reply(204);
|
|
73
71
|
|
|
74
72
|
const devices = [];
|
|
75
73
|
|
|
@@ -78,7 +76,7 @@ describe('In memory device registry', function () {
|
|
|
78
76
|
id: 'id' + i,
|
|
79
77
|
type: 'Light' + i,
|
|
80
78
|
internalId: 'internal' + i,
|
|
81
|
-
service: '
|
|
79
|
+
service: 'smartgondor',
|
|
82
80
|
subservice: 'gardens',
|
|
83
81
|
active: [
|
|
84
82
|
{
|
|
@@ -98,7 +96,7 @@ describe('In memory device registry', function () {
|
|
|
98
96
|
iotAgentLib.clearRegistry(done);
|
|
99
97
|
});
|
|
100
98
|
it('should return the appropriate device', function (done) {
|
|
101
|
-
iotAgentLib.getDevicesByAttribute('internalId', 'internal3', '
|
|
99
|
+
iotAgentLib.getDevicesByAttribute('internalId', 'internal3', 'smartgondor', 'gardens', function (
|
|
102
100
|
error,
|
|
103
101
|
devices
|
|
104
102
|
) {
|
|
@@ -114,12 +112,9 @@ describe('In memory device registry', function () {
|
|
|
114
112
|
describe('When a the registry is queried for devices in multiple services', function () {
|
|
115
113
|
beforeEach(function (done) {
|
|
116
114
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
117
|
-
.post('/
|
|
115
|
+
.post('/v2/entities?options=upsert')
|
|
118
116
|
.times(10)
|
|
119
|
-
.reply(
|
|
120
|
-
200,
|
|
121
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
122
|
-
);
|
|
117
|
+
.reply(204);
|
|
123
118
|
|
|
124
119
|
const devices = [];
|
|
125
120
|
|
|
@@ -128,7 +123,7 @@ describe('In memory device registry', function () {
|
|
|
128
123
|
id: 'id' + i,
|
|
129
124
|
type: 'Light' + (i % 2),
|
|
130
125
|
internalId: 'internal' + i,
|
|
131
|
-
service: '
|
|
126
|
+
service: 'smartgondor' + (i % 3),
|
|
132
127
|
subservice: 'gardens',
|
|
133
128
|
active: [
|
|
134
129
|
{
|
|
@@ -160,12 +155,9 @@ describe('In memory device registry', function () {
|
|
|
160
155
|
describe('When a the registry is queried for devices in a particular service', function () {
|
|
161
156
|
beforeEach(function (done) {
|
|
162
157
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
163
|
-
.post('/
|
|
158
|
+
.post('/v2/entities?options=upsert')
|
|
164
159
|
.times(10)
|
|
165
|
-
.reply(
|
|
166
|
-
200,
|
|
167
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
168
|
-
);
|
|
160
|
+
.reply(204);
|
|
169
161
|
|
|
170
162
|
const devices = [];
|
|
171
163
|
|
|
@@ -174,7 +166,7 @@ describe('In memory device registry', function () {
|
|
|
174
166
|
id: 'id' + i,
|
|
175
167
|
type: 'Light',
|
|
176
168
|
internalId: 'internal' + i,
|
|
177
|
-
service: '
|
|
169
|
+
service: 'smartgondor' + (i % 3),
|
|
178
170
|
subservice: 'gardens',
|
|
179
171
|
active: [
|
|
180
172
|
{
|
|
@@ -194,7 +186,7 @@ describe('In memory device registry', function () {
|
|
|
194
186
|
iotAgentLib.clearRegistry(done);
|
|
195
187
|
});
|
|
196
188
|
it('should return all the matching devices in that service', function (done) {
|
|
197
|
-
iotAgentLib.getDevicesByAttribute('type', 'Light', '
|
|
189
|
+
iotAgentLib.getDevicesByAttribute('type', 'Light', 'smartgondor0', 'gardens', function (error, devices) {
|
|
198
190
|
should.not.exist(error);
|
|
199
191
|
should.exist(devices);
|
|
200
192
|
devices.length.should.equal(4);
|
|
@@ -45,9 +45,9 @@ const iotAgentConfig = {
|
|
|
45
45
|
persistence: true
|
|
46
46
|
},
|
|
47
47
|
types: {},
|
|
48
|
-
service: '
|
|
48
|
+
service: 'smartgondor',
|
|
49
49
|
subservice: 'gardens',
|
|
50
|
-
providerUrl: 'http://
|
|
50
|
+
providerUrl: 'http://smartgondor.com',
|
|
51
51
|
deviceRegistrationDuration: 'P1M'
|
|
52
52
|
};
|
|
53
53
|
let oldConfig;
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
|
|
29
29
|
const _ = require('underscore');
|
|
30
30
|
const utils = require('../../tools/utils');
|
|
31
|
+
const request = utils.request;
|
|
31
32
|
const async = require('async');
|
|
32
|
-
const request = require('request');
|
|
33
33
|
const should = require('should');
|
|
34
34
|
const iotAgentConfig = {
|
|
35
35
|
logLevel: 'FATAL',
|
|
@@ -51,9 +51,9 @@ const iotAgentConfig = {
|
|
|
51
51
|
port: '27017',
|
|
52
52
|
db: 'iotagent'
|
|
53
53
|
},
|
|
54
|
-
service: '
|
|
54
|
+
service: 'smartgondor',
|
|
55
55
|
subservice: 'gardens',
|
|
56
|
-
providerUrl: 'http://
|
|
56
|
+
providerUrl: 'http://smartgondor.com',
|
|
57
57
|
deviceRegistrationDuration: 'P1M'
|
|
58
58
|
};
|
|
59
59
|
const mongo = require('mongodb').MongoClient;
|
|
@@ -96,7 +96,7 @@ const optionsCreation = {
|
|
|
96
96
|
]
|
|
97
97
|
},
|
|
98
98
|
headers: {
|
|
99
|
-
'fiware-service': '
|
|
99
|
+
'fiware-service': 'testservice',
|
|
100
100
|
'fiware-servicepath': '/testingPath'
|
|
101
101
|
}
|
|
102
102
|
};
|
|
@@ -105,7 +105,7 @@ const optionsDelete = {
|
|
|
105
105
|
method: 'DELETE',
|
|
106
106
|
json: {},
|
|
107
107
|
headers: {
|
|
108
|
-
'fiware-service': '
|
|
108
|
+
'fiware-service': 'testservice',
|
|
109
109
|
'fiware-servicepath': '/testingPath'
|
|
110
110
|
},
|
|
111
111
|
qs: {
|
|
@@ -118,7 +118,7 @@ const optionsList = {
|
|
|
118
118
|
method: 'GET',
|
|
119
119
|
json: {},
|
|
120
120
|
headers: {
|
|
121
|
-
'fiware-service': '
|
|
121
|
+
'fiware-service': 'testservice',
|
|
122
122
|
'fiware-servicepath': '/*'
|
|
123
123
|
}
|
|
124
124
|
};
|
|
@@ -156,7 +156,7 @@ const optionsUpdate = {
|
|
|
156
156
|
]
|
|
157
157
|
},
|
|
158
158
|
headers: {
|
|
159
|
-
'fiware-service': '
|
|
159
|
+
'fiware-service': 'testservice',
|
|
160
160
|
'fiware-servicepath': '/testingPath'
|
|
161
161
|
},
|
|
162
162
|
qs: {
|
|
@@ -169,7 +169,7 @@ const optionsGet = {
|
|
|
169
169
|
method: 'GET',
|
|
170
170
|
json: {},
|
|
171
171
|
headers: {
|
|
172
|
-
'fiware-service': '
|
|
172
|
+
'fiware-service': 'testservice',
|
|
173
173
|
'fiware-servicepath': '/testingPath'
|
|
174
174
|
}
|
|
175
175
|
};
|
|
@@ -230,7 +230,7 @@ describe('MongoDB Group Registry test', function () {
|
|
|
230
230
|
should.not.exist(err);
|
|
231
231
|
should.exist(docs[0].service);
|
|
232
232
|
should.exist(docs[0].subservice);
|
|
233
|
-
docs[0].service.should.equal('
|
|
233
|
+
docs[0].service.should.equal('testservice');
|
|
234
234
|
docs[0].subservice.should.equal('/testingPath');
|
|
235
235
|
done();
|
|
236
236
|
});
|
|
@@ -373,7 +373,7 @@ describe('MongoDB Group Registry test', function () {
|
|
|
373
373
|
},
|
|
374
374
|
json: {},
|
|
375
375
|
headers: {
|
|
376
|
-
'fiware-service': '
|
|
376
|
+
'fiware-service': 'testservice',
|
|
377
377
|
'fiware-servicepath': '/*'
|
|
378
378
|
}
|
|
379
379
|
};
|
|
@@ -414,7 +414,7 @@ describe('MongoDB Group Registry test', function () {
|
|
|
414
414
|
should.exist(body.services);
|
|
415
415
|
should.exist(body.services.length);
|
|
416
416
|
body.services.length.should.equal(1);
|
|
417
|
-
body.services[0].service.should.equal('
|
|
417
|
+
body.services[0].service.should.equal('testservice');
|
|
418
418
|
done();
|
|
419
419
|
});
|
|
420
420
|
});
|
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
|
|
26
26
|
const iotAgentLib = require('../../../lib/fiware-iotagent-lib');
|
|
27
27
|
const utils = require('../../tools/utils');
|
|
28
|
+
const request = utils.request;
|
|
28
29
|
const should = require('should');
|
|
29
30
|
const logger = require('logops');
|
|
30
31
|
const mongo = require('mongodb').MongoClient;
|
|
@@ -66,7 +67,7 @@ const iotAgentConfig = {
|
|
|
66
67
|
type: 'Vector'
|
|
67
68
|
}
|
|
68
69
|
],
|
|
69
|
-
service: '
|
|
70
|
+
service: 'smartgondor',
|
|
70
71
|
subservice: 'gardens',
|
|
71
72
|
internalAttributes: {
|
|
72
73
|
customAttribute: 'customValue'
|
|
@@ -81,7 +82,7 @@ const iotAgentConfig = {
|
|
|
81
82
|
}
|
|
82
83
|
],
|
|
83
84
|
attributes: [],
|
|
84
|
-
service: '
|
|
85
|
+
service: 'smartgondor',
|
|
85
86
|
subservice: 'gardens'
|
|
86
87
|
}
|
|
87
88
|
},
|
|
@@ -93,15 +94,15 @@ const iotAgentConfig = {
|
|
|
93
94
|
port: '27017',
|
|
94
95
|
db: 'iotagent'
|
|
95
96
|
},
|
|
96
|
-
service: '
|
|
97
|
+
service: 'smartgondor',
|
|
97
98
|
subservice: 'gardens',
|
|
98
|
-
providerUrl: 'http://
|
|
99
|
+
providerUrl: 'http://smartgondor.com',
|
|
99
100
|
deviceRegistrationDuration: 'P1M'
|
|
100
101
|
};
|
|
101
102
|
const device1 = {
|
|
102
103
|
id: 'light1',
|
|
103
104
|
type: 'Light',
|
|
104
|
-
service: '
|
|
105
|
+
service: 'smartgondor',
|
|
105
106
|
subservice: 'gardens',
|
|
106
107
|
endpoint: 'http://testEndpoint.com',
|
|
107
108
|
transport: 'HTTP',
|
|
@@ -139,7 +140,7 @@ const device1 = {
|
|
|
139
140
|
const device2 = {
|
|
140
141
|
id: 'term2',
|
|
141
142
|
type: 'Termometer',
|
|
142
|
-
service: '
|
|
143
|
+
service: 'smartgondor',
|
|
143
144
|
subservice: 'gardens',
|
|
144
145
|
resource: '/',
|
|
145
146
|
apikey: 'dsf8yy789iyushu786',
|
|
@@ -185,7 +186,7 @@ const device3 = {
|
|
|
185
186
|
};
|
|
186
187
|
let iotAgentDb;
|
|
187
188
|
|
|
188
|
-
describe('MongoDB Device Registry', function () {
|
|
189
|
+
describe('NGSI-v2 - MongoDB Device Registry', function () {
|
|
189
190
|
beforeEach(function (done) {
|
|
190
191
|
logger.setLevel('FATAL');
|
|
191
192
|
|
|
@@ -216,25 +217,17 @@ describe('MongoDB Device Registry', function () {
|
|
|
216
217
|
nock.cleanAll();
|
|
217
218
|
|
|
218
219
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
219
|
-
.matchHeader('fiware-service', '
|
|
220
|
+
.matchHeader('fiware-service', 'smartgondor')
|
|
220
221
|
.matchHeader('fiware-servicepath', 'gardens')
|
|
221
222
|
.post(
|
|
222
|
-
'/
|
|
223
|
-
utils.readExampleFile('./test/unit/examples/contextAvailabilityRequests/registerIoTAgent3.json')
|
|
224
|
-
)
|
|
225
|
-
.reply(
|
|
226
|
-
200,
|
|
223
|
+
'/v2/registrations',
|
|
227
224
|
utils.readExampleFile(
|
|
228
|
-
'./test/unit/examples/
|
|
225
|
+
'./test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent3.json'
|
|
229
226
|
)
|
|
230
|
-
)
|
|
227
|
+
)
|
|
228
|
+
.reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
|
|
231
229
|
|
|
232
|
-
contextBrokerMock
|
|
233
|
-
.post('/v1/updateContext')
|
|
234
|
-
.reply(
|
|
235
|
-
200,
|
|
236
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
237
|
-
);
|
|
230
|
+
contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
|
|
238
231
|
|
|
239
232
|
iotAgentLib.activate(iotAgentConfig, function (error) {
|
|
240
233
|
done();
|
|
@@ -286,46 +279,30 @@ describe('MongoDB Device Registry', function () {
|
|
|
286
279
|
nock.cleanAll();
|
|
287
280
|
|
|
288
281
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
289
|
-
.matchHeader('fiware-service', '
|
|
282
|
+
.matchHeader('fiware-service', 'smartgondor')
|
|
290
283
|
.matchHeader('fiware-servicepath', 'gardens')
|
|
291
284
|
.post(
|
|
292
|
-
'/
|
|
293
|
-
utils.readExampleFile('./test/unit/examples/contextAvailabilityRequests/registerIoTAgent3.json')
|
|
294
|
-
)
|
|
295
|
-
.reply(
|
|
296
|
-
200,
|
|
285
|
+
'/v2/registrations',
|
|
297
286
|
utils.readExampleFile(
|
|
298
|
-
'./test/unit/examples/
|
|
287
|
+
'./test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent3.json'
|
|
299
288
|
)
|
|
300
|
-
)
|
|
289
|
+
)
|
|
290
|
+
.reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
|
|
301
291
|
|
|
302
|
-
contextBrokerMock
|
|
303
|
-
.post('/v1/updateContext')
|
|
304
|
-
.reply(
|
|
305
|
-
200,
|
|
306
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
307
|
-
);
|
|
292
|
+
contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
|
|
308
293
|
|
|
309
294
|
contextBrokerMock
|
|
310
|
-
.matchHeader('fiware-service', '
|
|
295
|
+
.matchHeader('fiware-service', 'smartgondor')
|
|
311
296
|
.matchHeader('fiware-servicepath', 'gardens')
|
|
312
297
|
.post(
|
|
313
|
-
'/
|
|
314
|
-
utils.readExampleFile('./test/unit/examples/contextAvailabilityRequests/registerIoTAgent3.json')
|
|
315
|
-
)
|
|
316
|
-
.reply(
|
|
317
|
-
200,
|
|
298
|
+
'/v2/registrations',
|
|
318
299
|
utils.readExampleFile(
|
|
319
|
-
'./test/unit/examples/
|
|
300
|
+
'./test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent3.json'
|
|
320
301
|
)
|
|
321
|
-
)
|
|
302
|
+
)
|
|
303
|
+
.reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
|
|
322
304
|
|
|
323
|
-
contextBrokerMock
|
|
324
|
-
.post('/v1/updateContext')
|
|
325
|
-
.reply(
|
|
326
|
-
200,
|
|
327
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
328
|
-
);
|
|
305
|
+
contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
|
|
329
306
|
|
|
330
307
|
iotAgentLib.activate(iotAgentConfig, function (error) {
|
|
331
308
|
done();
|
|
@@ -349,41 +326,25 @@ describe('MongoDB Device Registry', function () {
|
|
|
349
326
|
|
|
350
327
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
351
328
|
.post(
|
|
352
|
-
'/
|
|
353
|
-
utils.readExampleFile('./test/unit/examples/contextAvailabilityRequests/registerIoTAgent3.json')
|
|
354
|
-
)
|
|
355
|
-
.reply(
|
|
356
|
-
200,
|
|
329
|
+
'/v2/registrations',
|
|
357
330
|
utils.readExampleFile(
|
|
358
|
-
'./test/unit/examples/
|
|
331
|
+
'./test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent3.json'
|
|
359
332
|
)
|
|
360
|
-
)
|
|
333
|
+
)
|
|
334
|
+
.reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
|
|
361
335
|
|
|
362
|
-
contextBrokerMock
|
|
363
|
-
.post('/v1/updateContext')
|
|
364
|
-
.reply(
|
|
365
|
-
200,
|
|
366
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
367
|
-
);
|
|
336
|
+
contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
|
|
368
337
|
|
|
369
338
|
contextBrokerMock
|
|
370
339
|
.post(
|
|
371
|
-
'/
|
|
372
|
-
utils.readExampleFile('./test/unit/examples/contextAvailabilityRequests/registerIoTAgent3.json')
|
|
373
|
-
)
|
|
374
|
-
.reply(
|
|
375
|
-
200,
|
|
340
|
+
'/v2/registrations',
|
|
376
341
|
utils.readExampleFile(
|
|
377
|
-
'./test/unit/examples/
|
|
342
|
+
'./test/unit/ngsiv2/examples/contextAvailabilityRequests/registerIoTAgent3.json'
|
|
378
343
|
)
|
|
379
|
-
)
|
|
344
|
+
)
|
|
345
|
+
.reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
|
|
380
346
|
|
|
381
|
-
contextBrokerMock
|
|
382
|
-
.post('/v1/updateContext')
|
|
383
|
-
.reply(
|
|
384
|
-
200,
|
|
385
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
386
|
-
);
|
|
347
|
+
contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
|
|
387
348
|
|
|
388
349
|
iotAgentLib.activate(iotAgentConfig, function (error) {
|
|
389
350
|
done();
|
|
@@ -402,51 +363,20 @@ describe('MongoDB Device Registry', function () {
|
|
|
402
363
|
|
|
403
364
|
describe('When a device is removed from the IoT Agent', function () {
|
|
404
365
|
beforeEach(function (done) {
|
|
405
|
-
const expectedPayload3 = utils.readExampleFile(
|
|
406
|
-
'./test/unit/examples/contextAvailabilityRequests/unregisterDevice3.json'
|
|
407
|
-
);
|
|
408
|
-
|
|
409
366
|
nock.cleanAll();
|
|
410
367
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
411
|
-
.post('/
|
|
412
|
-
.reply(
|
|
413
|
-
200,
|
|
414
|
-
utils.readExampleFile(
|
|
415
|
-
'./test/unit/examples/contextAvailabilityResponses/registerNewDevice1Success.json'
|
|
416
|
-
)
|
|
417
|
-
);
|
|
368
|
+
.post('/v2/registrations')
|
|
369
|
+
.reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
|
|
418
370
|
|
|
419
|
-
contextBrokerMock
|
|
420
|
-
.post('/v1/updateContext')
|
|
421
|
-
.reply(
|
|
422
|
-
200,
|
|
423
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
424
|
-
);
|
|
371
|
+
contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
|
|
425
372
|
|
|
426
373
|
contextBrokerMock
|
|
427
|
-
.post('/
|
|
428
|
-
.reply(
|
|
429
|
-
200,
|
|
430
|
-
utils.readExampleFile(
|
|
431
|
-
'./test/unit/examples/contextAvailabilityResponses/registerNewDevice2Success.json'
|
|
432
|
-
)
|
|
433
|
-
);
|
|
374
|
+
.post('/v2/registrations')
|
|
375
|
+
.reply(201, null, { Location: '/v2/registrations/6319a7f5254b05844116584d' });
|
|
434
376
|
|
|
435
|
-
contextBrokerMock
|
|
436
|
-
.post('/v1/updateContext')
|
|
437
|
-
.reply(
|
|
438
|
-
200,
|
|
439
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
440
|
-
);
|
|
377
|
+
contextBrokerMock.post('/v2/entities?options=upsert').reply(204);
|
|
441
378
|
|
|
442
|
-
contextBrokerMock
|
|
443
|
-
.post('/NGSI9/registerContext', expectedPayload3)
|
|
444
|
-
.reply(
|
|
445
|
-
200,
|
|
446
|
-
utils.readExampleFile(
|
|
447
|
-
'./test/unit/examples/contextAvailabilityResponses/unregisterDevice1Success.json'
|
|
448
|
-
)
|
|
449
|
-
);
|
|
379
|
+
contextBrokerMock.delete('/v2/registrations/6319a7f5254b05844116584d', '').reply(204);
|
|
450
380
|
|
|
451
381
|
iotAgentLib.activate(iotAgentConfig, function (error) {
|
|
452
382
|
async.series(
|
|
@@ -457,7 +387,7 @@ describe('MongoDB Device Registry', function () {
|
|
|
457
387
|
});
|
|
458
388
|
|
|
459
389
|
it('should be removed from MongoDB', function (done) {
|
|
460
|
-
iotAgentLib.unregister(device1.id, '
|
|
390
|
+
iotAgentLib.unregister(device1.id, 'smartgondor', 'gardens', function (error) {
|
|
461
391
|
iotAgentDb
|
|
462
392
|
.db()
|
|
463
393
|
.collection('devices')
|
|
@@ -476,14 +406,11 @@ describe('MongoDB Device Registry', function () {
|
|
|
476
406
|
describe('When the registry is queried for a device using an arbitrary attribute', function () {
|
|
477
407
|
beforeEach(function (done) {
|
|
478
408
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
479
|
-
.post('/
|
|
409
|
+
.post('/v2/entities?options=upsert')
|
|
480
410
|
.times(10)
|
|
481
|
-
.matchHeader('fiware-service', '
|
|
411
|
+
.matchHeader('fiware-service', 'smartgondor')
|
|
482
412
|
.matchHeader('fiware-servicepath', 'gardens')
|
|
483
|
-
.reply(
|
|
484
|
-
200,
|
|
485
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
486
|
-
);
|
|
413
|
+
.reply(204);
|
|
487
414
|
|
|
488
415
|
const devices = [];
|
|
489
416
|
|
|
@@ -492,7 +419,7 @@ describe('MongoDB Device Registry', function () {
|
|
|
492
419
|
id: 'id' + i,
|
|
493
420
|
type: 'Light' + i,
|
|
494
421
|
internalId: 'internal' + i,
|
|
495
|
-
service: '
|
|
422
|
+
service: 'smartgondor',
|
|
496
423
|
subservice: 'gardens',
|
|
497
424
|
active: [
|
|
498
425
|
{
|
|
@@ -514,7 +441,7 @@ describe('MongoDB Device Registry', function () {
|
|
|
514
441
|
iotAgentLib.clearRegistry(done);
|
|
515
442
|
});
|
|
516
443
|
it('should return the appropriate device', function (done) {
|
|
517
|
-
iotAgentLib.getDevicesByAttribute('internalId', 'internal3', '
|
|
444
|
+
iotAgentLib.getDevicesByAttribute('internalId', 'internal3', 'smartgondor', 'gardens', function (
|
|
518
445
|
error,
|
|
519
446
|
devices
|
|
520
447
|
) {
|
|
@@ -530,14 +457,11 @@ describe('MongoDB Device Registry', function () {
|
|
|
530
457
|
describe('When the list of devices is retrieved', function () {
|
|
531
458
|
beforeEach(function (done) {
|
|
532
459
|
contextBrokerMock = nock('http://192.168.1.1:1026')
|
|
533
|
-
.post('/
|
|
460
|
+
.post('/v2/entities?options=upsert')
|
|
534
461
|
.times(10)
|
|
535
|
-
.matchHeader('fiware-service', '
|
|
462
|
+
.matchHeader('fiware-service', 'smartgondor')
|
|
536
463
|
.matchHeader('fiware-servicepath', 'gardens')
|
|
537
|
-
.reply(
|
|
538
|
-
200,
|
|
539
|
-
utils.readExampleFile('./test/unit/examples/contextResponses/createProvisionedDeviceSuccess.json')
|
|
540
|
-
);
|
|
464
|
+
.reply(204);
|
|
541
465
|
|
|
542
466
|
const devices = [];
|
|
543
467
|
|
|
@@ -546,7 +470,7 @@ describe('MongoDB Device Registry', function () {
|
|
|
546
470
|
id: 'id' + i,
|
|
547
471
|
type: 'Light' + i,
|
|
548
472
|
internalId: 'internal' + i,
|
|
549
|
-
service: '
|
|
473
|
+
service: 'smartgondor',
|
|
550
474
|
subservice: 'gardens',
|
|
551
475
|
active: [
|
|
552
476
|
{
|
|
@@ -568,7 +492,7 @@ describe('MongoDB Device Registry', function () {
|
|
|
568
492
|
iotAgentLib.clearRegistry(done);
|
|
569
493
|
});
|
|
570
494
|
it('should return the limited number of devices', function (done) {
|
|
571
|
-
iotAgentLib.listDevices('
|
|
495
|
+
iotAgentLib.listDevices('smartgondor', 'gardens', 3, 2, function (error, result) {
|
|
572
496
|
should.not.exist(error);
|
|
573
497
|
should.exist(result.devices);
|
|
574
498
|
result.devices.length.should.equal(3);
|
|
@@ -576,7 +500,7 @@ describe('MongoDB Device Registry', function () {
|
|
|
576
500
|
});
|
|
577
501
|
});
|
|
578
502
|
it('should return the total number of devices', function (done) {
|
|
579
|
-
iotAgentLib.listDevices('
|
|
503
|
+
iotAgentLib.listDevices('smartgondor', 'gardens', 3, 2, function (error, result) {
|
|
580
504
|
should.not.exist(error);
|
|
581
505
|
should.exist(result.count);
|
|
582
506
|
result.count.should.equal(10);
|