-
Notifications
You must be signed in to change notification settings - Fork 265
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4166 from telefonicaid/feature/4159_extra_custom_…
…notif_macros ADD service, servicePath and authToken macros to custom notifications
- Loading branch information
Showing
14 changed files
with
1,110 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| - Add: json field in httpCustom and mqttCustom subscriptions (#2560) | ||
| - Add: ${service}, ${servicePath} and ${authToken} macros in custom notifications (#4159) | ||
| - Upgrade Debian version from 11.2 to 11.3 in Dockerfile | ||
| - Remove: RPM package stuff |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
140 changes: 140 additions & 0 deletions
140
...ctionalTest/cases/4159_custom_notif_extra_macros/custom_notif_extra_macros_http_json.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| # Copyright 2022 Telefonica Investigacion y Desarrollo, S.A.U | ||
| # | ||
| # This file is part of Orion Context Broker. | ||
| # | ||
| # Orion Context Broker is free software: you can redistribute it and/or | ||
| # modify it under the terms of the GNU Affero General Public License as | ||
| # published by the Free Software Foundation, either version 3 of the | ||
| # License, or (at your option) any later version. | ||
| # | ||
| # Orion Context Broker is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero | ||
| # General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU Affero General Public License | ||
| # along with Orion Context Broker. If not, see http://www.gnu.org/licenses/. | ||
| # | ||
| # For those usages not covered by this license please contact with | ||
| # iot_support at tid dot es | ||
|
|
||
| # VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh | ||
|
|
||
| --NAME-- | ||
| Custom notification HTTP with json field using service, servicePath and authToken macros | ||
|
|
||
| --SHELL-INIT-- | ||
| dbInit CB s1 | ||
| brokerStart CB 0 IPV4 -multiservice | ||
| accumulatorStart --pretty-print | ||
|
|
||
| --SHELL-- | ||
|
|
||
| # | ||
| # 01. Create custom subscription with json field using service, servicePath and authToken macros | ||
| # 02. Create E1 entity with specific service, servicePath and authToken to trigger sub | ||
| # 03. Dump accumulator, see 1 notifications | ||
| # | ||
|
|
||
| echo "01. Create custom subscription with json field using service, servicePath and authToken macros" | ||
| echo "==============================================================================================" | ||
| payload='{ | ||
| "subject": { | ||
| "entities": [ | ||
| { | ||
| "id" : "E1", | ||
| "type": "T" | ||
| } | ||
| ] | ||
| }, | ||
| "notification": { | ||
| "httpCustom": { | ||
| "url": "http://127.0.0.1:'${LISTENER_PORT}'/notify", | ||
| "qs": { | ||
| "S": "my-${service}", | ||
| "t": "my-${authToken}" | ||
| }, | ||
| "json": { | ||
| "id": "${id}", | ||
| "S": "${service}", | ||
| "SS": "${servicePath}", | ||
| "token": "${authToken}" | ||
| } | ||
| } | ||
| } | ||
| }' | ||
| orionCurl --url /v2/subscriptions --payload "$payload" --tenant s1 | ||
| echo | ||
| echo | ||
|
|
||
|
|
||
| echo "02. Create E1 entity with specific service, servicePath and authToken to trigger sub" | ||
| echo "====================================================================================" | ||
| payload='{ | ||
| "id": "E1", | ||
| "type": "T", | ||
| "A": { | ||
| "value": "trigger!", | ||
| "type": "Text" | ||
| } | ||
| }' | ||
| orionCurl --url /v2/entities --payload "$payload" --tenant s1 --servicePath "/subservA" --xauthToken fgm | ||
| echo | ||
| echo | ||
|
|
||
|
|
||
| echo "03. Dump accumulator, see 1 notification" | ||
| echo "========================================" | ||
| accumulatorDump | ||
| echo | ||
| echo | ||
|
|
||
|
|
||
| --REGEXPECT-- | ||
| 01. Create custom subscription with json field using service, servicePath and authToken macros | ||
| ============================================================================================== | ||
| HTTP/1.1 201 Created | ||
| Content-Length: 0 | ||
| Location: /v2/subscriptions/REGEX([0-9a-f]{24}) | ||
| Fiware-Correlator: REGEX([0-9a-f\-]{36}) | ||
| Date: REGEX(.*) | ||
|
|
||
|
|
||
|
|
||
| 02. Create E1 entity with specific service, servicePath and authToken to trigger sub | ||
| ==================================================================================== | ||
| HTTP/1.1 201 Created | ||
| Content-Length: 0 | ||
| Location: /v2/entities/E1?type=T | ||
| Fiware-Correlator: REGEX([0-9a-f\-]{36}) | ||
| Date: REGEX(.*) | ||
|
|
||
|
|
||
|
|
||
| 03. Dump accumulator, see 1 notification | ||
| ======================================== | ||
| POST http://127.0.0.1:REGEX(\d+)/notify?S=my-s1&t=my-fgm | ||
| Fiware-Servicepath: /subservA | ||
| Content-Length: 51 | ||
| X-Auth-Token: fgm | ||
| User-Agent: orion/REGEX(\d+\.\d+\.\d+.*) | ||
| Ngsiv2-Attrsformat: custom | ||
| Host: 127.0.0.1:REGEX(\d+) | ||
| Accept: application/json | ||
| Fiware-Service: s1 | ||
| Content-Type: application/json; charset=utf-8 | ||
| Fiware-Correlator: REGEX([0-9a-f\-]{36}); cbnotif=1 | ||
|
|
||
| { | ||
| "S": "s1", | ||
| "SS": "/subservA", | ||
| "id": "E1", | ||
| "token": "fgm" | ||
| } | ||
| ======================================= | ||
|
|
||
|
|
||
| --TEARDOWN-- | ||
| brokerStop CB | ||
| dbDrop CB s1 | ||
| accumulatorStop |
Oops, something went wrong.