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

Jump to bottom

Task/travis ci #105

Merged
merged 17 commits into from
Dec 22, 2017
Merged

Task/travis ci #105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b88dd96
Passing unit tests
dcalvoalonso Dec 18, 2017
4c75d50
Including needed pre-requisites for travis CI
dcalvoalonso Dec 19, 2017
70f8484
Removing forcing lowercase service names
dcalvoalonso Dec 19, 2017
8195e12
Travis CI for all branches
dcalvoalonso Dec 19, 2017
4aa60ca
Adding test script to package.json
dcalvoalonso Dec 19, 2017
0c7c001
Restoring log level to FATAL in tests
dcalvoalonso Dec 19, 2017
597ce81
Restoring log level to FATAL in tests
dcalvoalonso Dec 19, 2017
d407223
Precise is not used anymore in travis
dcalvoalonso Dec 19, 2017
ee6d771
npm-shrinkwrap.json updated
dcalvoalonso Dec 19, 2017
994b6d9
Travis CI: orion uses host network
dcalvoalonso Dec 19, 2017
0de8f25
Address comments of PR#105
dcalvoalonso Dec 19, 2017
80d7cfc
Address comments of PR#105
dcalvoalonso Dec 19, 2017
6d590dd
Address comments of PR#105
dcalvoalonso Dec 19, 2017
babe984
Addressing comments of PR#105
dcalvoalonso Dec 20, 2017
9ccd486
Address comment of PR #571
dcalvoalonso Dec 20, 2017
441870d
Updating npm-shrinkwrap.json
dcalvoalonso Dec 20, 2017
b225434
Increasing timeouts in activeAttributes tests
dcalvoalonso Dec 20, 2017
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
Removing forcing lowercase service names
  • Loading branch information
@dcalvoalonso
dcalvoalonso committed Dec 19, 2017
commit 70f8484cc90c54e0e4b8a19ad3ba97e3db2b98aa
6 changes: 3 additions & 3 deletions lib/services/lwm2mHandlers/registration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function mapConfig(device, configuration, callback) {
id: device.name,
name: device.name + ':' + device.type,
type: device.type,
service: configuration.service.toLowerCase(),
service: configuration.service,
subservice: configuration.subservice,
lazy: configuration.lazy,
attributes: configuration.attributes,
Expand Down Expand Up @@ -108,7 +108,7 @@ function findConfiguration(device, callback) {
finalConfiguration = commons.getConfig().ngsi.types[device.type];
} else if (commons.getConfig().ngsi.service && commons.getConfig().ngsi.subservice) {
finalConfiguration = {};
finalConfiguration.service = commons.getConfig().ngsi.service.toLowerCase();
finalConfiguration.service = commons.getConfig().ngsi.service;
finalConfiguration.subservice = commons.getConfig().ngsi.subservice;
}
else if (device.type) {
Expand Down Expand Up @@ -277,7 +277,7 @@ function registrationHandler(endpoint, lifetime, version, binding, payload, call
} else {
iotAgentLib.getDevice(
lwm2mDevice.name,
configuration.service.toLowerCase(),
configuration.service,
configuration.subservice, function(error, ngsiDevice) {
if (error && error.name && error.name === 'DEVICE_NOT_FOUND') {
logger.debug(context, 'Device register not found. Creating new device.');
Expand Down
2 changes: 1 addition & 1 deletion lib/services/lwm2mHandlers/unregistration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function unregistrationHandler(device, callback) {
} else {
iotAgentLib.unregister(
device.name,
(configuration.service).toLowerCase(),
configuration.service,
configuration.subservice,
callback);
}
Expand Down