-
Notifications
You must be signed in to change notification settings - Fork 91
Basic NGSI-LD active measures support #841
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.
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
Changes from all commits
055d343
4d30d69
f1d0201
03779ba
68b5f65
40875e3
dd81751
a2b334a
b41a18a
2d849b0
a027234
c70d9ed
a5c650a
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -91,7 +91,8 @@ function processEnvironmentVariables() { | |
| 'IOTA_APPEND_MODE', | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. CHANGES_NEXT_RELEASE entry should be provided for this PR.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed b41a18a |
||
| 'IOTA_POLLING_EXPIRATION', | ||
| 'IOTA_POLLING_DAEMON_FREQ', | ||
| 'IOTA_MULTI_CORE' | ||
| 'IOTA_MULTI_CORE', | ||
| 'IOTA_JSON_LD_CONTEXT' | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. New env var should be described in documentation.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed b41a18a - Minimal Documentation for now. |
||
| ], | ||
| iotamVariables = [ | ||
| 'IOTA_IOTAM_URL', | ||
|
|
@@ -146,6 +147,9 @@ function processEnvironmentVariables() { | |
| if (process.env.IOTA_CB_NGSI_VERSION) { | ||
| config.contextBroker.ngsiVersion = process.env.IOTA_CB_NGSI_VERSION; | ||
| } | ||
| if (process.env.IOTA_JSON_LD_CONTEXT){ | ||
| config.contextBroker.jsonLdContext = process.env.IOTA_JSON_LD_CONTEXT; | ||
| } | ||
|
|
||
| // North Port Configuration (ensuring the configuration sub-object exists before start using it) | ||
| if (config.server === undefined) { | ||
|
|
@@ -377,6 +381,21 @@ function checkNgsi2() { | |
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * It checks if the configuration file states the use of NGSI-LD | ||
| * | ||
| * @return {boolean} Result of the checking | ||
| */ | ||
| function checkNgsiLD() { | ||
| if (config.contextBroker && | ||
| config.contextBroker.ngsiVersion && | ||
| config.contextBroker.ngsiVersion === 'ld') { | ||
| return true; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| function setSecurityService(newSecurityService) { | ||
| securityService = newSecurityService; | ||
| } | ||
|
|
@@ -394,5 +413,6 @@ exports.getGroupRegistry = getGroupRegistry; | |
| exports.setCommandRegistry = setCommandRegistry; | ||
| exports.getCommandRegistry = getCommandRegistry; | ||
| exports.checkNgsi2 = checkNgsi2; | ||
| exports.checkNgsiLD = checkNgsiLD; | ||
| exports.setSecurityService = setSecurityService; | ||
| exports.getSecurityService = getSecurityService; | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line seems to belong to PR #839. Thus, I understand that jason-fox:feature/ngsi-ld-measure is a branch of jason-fox:feature/add-v2-metadata.
PR #839 should be merged before, then this PR updated.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Correct - this PR is dependent upon and extends the metadata change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
PR #839 has been merged. This PR branch should be upgrade, then this diff will disappear.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've merge master which should reduce the diff - Fixed with dd81751