diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index fad7fd53f7..16b6bfb7b0 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -58,3 +58,5 @@ * Issue #1322 Default port for HTTPS is 443, for HTTP: 80 * Issue #1338 Removed the check for mongoc only, as all operations now support mongoc * Issue #1340 Fixed a dangling pointer bug +* Issue #1343 Added the HTTP header (well, for mqtt notfications also) 'Host' for notifications +* Issue #1344 Accepting hyphen as a valid character for a tenant diff --git a/src/app/orionld/orionld.cpp b/src/app/orionld/orionld.cpp index e335ac4f14..bc822aa7e4 100644 --- a/src/app/orionld/orionld.cpp +++ b/src/app/orionld/orionld.cpp @@ -55,7 +55,7 @@ * CLI option '--insecure'. */ #include -#include // getppid, fork, setuid, sleep, etc. +#include // getppid, fork, setuid, sleep, gethostname, etc. #include #include // open #include @@ -1126,7 +1126,7 @@ int main(int argC, char* argV[]) // - // Get the hostname - needed for contexts created by the broker + // Get the hostname - needed for contexts created by the broker + notifications // gethostname(orionldHostName, sizeof(orionldHostName)); orionldHostNameLen = strlen(orionldHostName); diff --git a/src/lib/orionld/common/orionldState.cpp b/src/lib/orionld/common/orionldState.cpp index fcbb982fe8..a9adf48d4e 100644 --- a/src/lib/orionld/common/orionldState.cpp +++ b/src/lib/orionld/common/orionldState.cpp @@ -103,8 +103,9 @@ bool orionldStartup = true; char pgPortString[16]; char mongoServerVersion[32]; char userAgentHeaderNoLF[64]; // "User-Agent: orionld/" + ORIONLD_VERSION - initialized in orionldServiceInit() -char hostHeader[256]; // Host: xxx - +char hostHeaderNoLF[128]; +char hostHeader[128]; // Host: xxx +size_t hostHeaderLen; // // Variables for Mongo C Driver diff --git a/src/lib/orionld/common/orionldState.h b/src/lib/orionld/common/orionldState.h index c1e8a683fb..69d0752d12 100644 --- a/src/lib/orionld/common/orionldState.h +++ b/src/lib/orionld/common/orionldState.h @@ -580,10 +580,12 @@ extern bool experimental; // From orionld.cpp extern bool mongocOnly; // From orionld.cpp extern char allowedOrigin[64]; // From orionld.cpp (CORS) extern int maxAge; // From orionld.cpp (CORS) -extern char userAgentHeader[64]; // From notificationSend.cpp - move to orionld.cpp -extern size_t userAgentHeaderLen; // From notificationSend.cpp - move to orionld.cpp -extern char userAgentHeaderNoLF[64]; // move to orionld.cpp (from orionldPostEntities.cpp) -extern char hostHeader[256]; // move to orionld.cpp (from orionldPostEntities.cpp) +extern char userAgentHeader[64]; // From notificationSend.cpp - move to orionld.cpp? +extern size_t userAgentHeaderLen; // From notificationSend.cpp - move to orionld.cpp? +extern char userAgentHeaderNoLF[64]; // move to orionld.cpp? +extern char hostHeader[128]; // move to orionld.cpp? +extern char hostHeaderNoLF[128]; // move to orionld.cpp? +extern size_t hostHeaderLen; // move to orionld.cpp? extern bool debugCurl; // From orionld.cpp extern bool noCache; // From orionld.cpp extern int cSubCounters; // Number of subscription counter updates before flush from sub-cache to DB diff --git a/src/lib/orionld/forwarding/distOpInit.cpp b/src/lib/orionld/forwarding/distOpInit.cpp index 598ea6c853..01a59153d8 100644 --- a/src/lib/orionld/forwarding/distOpInit.cpp +++ b/src/lib/orionld/forwarding/distOpInit.cpp @@ -25,7 +25,7 @@ #include // snprintf #include // gethostname -#include "orionld/common/orionldState.h" // hostHeader +#include "orionld/common/orionldState.h" // hostHeaderNoLF #include "orionld/forwarding/distOpInit.h" // Own interface @@ -36,10 +36,10 @@ // void distOpInit(void) { - char hostName[128]; + char hostName[100]; if (gethostname(hostName, sizeof(hostName) - 1) == -1) - snprintf(hostHeader, sizeof(hostHeader), "Host: unknown"); + snprintf(hostHeaderNoLF, sizeof(hostHeaderNoLF), "Host: unknown"); else - snprintf(hostHeader, sizeof(hostHeader), "Host: %s", hostName); + snprintf(hostHeaderNoLF, sizeof(hostHeaderNoLF), "Host: %s", hostName); } diff --git a/src/lib/orionld/forwarding/distOpSend.cpp b/src/lib/orionld/forwarding/distOpSend.cpp index aaa04f9334..0e7993a9c3 100644 --- a/src/lib/orionld/forwarding/distOpSend.cpp +++ b/src/lib/orionld/forwarding/distOpSend.cpp @@ -495,7 +495,7 @@ bool distOpSend(DistOp* distOpP, const char* dateHeader, const char* xForwardedF headers = curl_slist_append(headers, dateHeader); // Host - headers = curl_slist_append(headers, hostHeader); + headers = curl_slist_append(headers, hostHeaderNoLF); // X-Forwarded-For headers = curl_slist_append(headers, xForwardedForHeader); diff --git a/src/lib/orionld/notifications/notificationSend.cpp b/src/lib/orionld/notifications/notificationSend.cpp index 0c3defd9d2..cff37adc65 100644 --- a/src/lib/orionld/notifications/notificationSend.cpp +++ b/src/lib/orionld/notifications/notificationSend.cpp @@ -78,7 +78,7 @@ static const char* normalizedHeaderNgsiV2 = (char*) "Ngsiv2-Attrsformat: norma static const char* keyValuesHeaderNgsiV2 = (char*) "Ngsiv2-Attrsformat: keyValues\r\n"; char userAgentHeader[64]; // "User-Agent: orionld/" + ORIONLD_VERSION + \r\n" - initialized in orionldServiceInit() -size_t userAgentHeaderLen = 0; // Also set in orionldServiceInit() +size_t userAgentHeaderLen = 0; // Set in orionldServiceInit() @@ -650,7 +650,7 @@ int notificationSend(OrionldAlterationMatch* mAltP, double timestamp, CURL** cur strcpy(contentLenHeader, "Content-Length: 0"); // Can't modify inside static strings, so need a char-vec on the stack for contentLenHeader snprintf(lenP, sizeLeftForLen, "%d\r\n", (int) contentLength); // Adding Content-Length inside contentLenHeader - int headers = 6; // the minimum number of request headers + int headers = 7; // the minimum number of request headers // @@ -672,14 +672,15 @@ int notificationSend(OrionldAlterationMatch* mAltP, double timestamp, CURL** cur LM_X(1, ("Too many HTTP headers (>50) for a Notification - to support that many, the broker needs a SW update and to be recompiled")); int ioVecLen = headers + 3; // Request line + X headers + empty line + payload body - int headerIx = 6; + int headerIx = 7; struct iovec ioVec[53] = { { requestHeader, requestHeaderLen }, { contentLenHeader, strlen(contentLenHeader) }, { (void*) contentTypeHeaderJson, 32 }, // Index 2 { (void*) userAgentHeader, userAgentHeaderLen }, + { (void*) hostHeader, hostHeaderLen }, { (void*) acceptHeader, 26 }, - { (void*) normalizedHeader, 37 } // Index 5 + { (void*) normalizedHeader, 37 } // Index 6 }; // @@ -715,23 +716,23 @@ int notificationSend(OrionldAlterationMatch* mAltP, double timestamp, CURL** cur // if (mAltP->subP->renderFormat == RF_CONCISE) { - ioVec[5].iov_base = (void*) conciseHeader; - ioVec[5].iov_len = 34; + ioVec[6].iov_base = (void*) conciseHeader; + ioVec[6].iov_len = 34; } else if (mAltP->subP->renderFormat == RF_KEYVALUES) { - ioVec[5].iov_base = (void*) simplifiedHeader; - ioVec[5].iov_len = 37; + ioVec[6].iov_base = (void*) simplifiedHeader; + ioVec[6].iov_len = 37; } else if ((mAltP->subP->renderFormat == RF_CROSS_APIS_NORMALIZED) || (mAltP->subP->renderFormat == RF_CROSS_APIS_NORMALIZED_COMPACT)) { - ioVec[5].iov_base = (void*) normalizedHeaderNgsiV2; - ioVec[5].iov_len = 32; + ioVec[6].iov_base = (void*) normalizedHeaderNgsiV2; + ioVec[6].iov_len = 32; } else if ((mAltP->subP->renderFormat == RF_CROSS_APIS_KEYVALUES) || (mAltP->subP->renderFormat == RF_CROSS_APIS_KEYVALUES_COMPACT)) { - ioVec[5].iov_base = (void*) keyValuesHeaderNgsiV2; - ioVec[5].iov_len = 31; + ioVec[6].iov_base = (void*) keyValuesHeaderNgsiV2; + ioVec[6].iov_len = 31; } diff --git a/src/lib/orionld/rest/orionldMhdConnectionInit.cpp b/src/lib/orionld/rest/orionldMhdConnectionInit.cpp index 2d721f0b8d..d31049be1f 100644 --- a/src/lib/orionld/rest/orionldMhdConnectionInit.cpp +++ b/src/lib/orionld/rest/orionldMhdConnectionInit.cpp @@ -955,9 +955,9 @@ static bool tenantCheck(char* tenantName) return false; } - if ((!isalnum(tenantName[len])) && (tenantName[len] != '_')) + if ((!isalnum(tenantName[len])) && (tenantName[len] != '_') && (tenantName[len] != '-')) { - orionldError(OrionldBadRequestData, "Invalid Tenant", "bad character in tenant name - only underscore and alphanumeric characters are allowed", 400); + orionldError(OrionldBadRequestData, "Invalid Tenant", "invalid character in tenant name - only underscore, hyphen, and alphanumeric characters are allowed", 400); return false; } diff --git a/src/lib/orionld/rest/orionldServiceInit.cpp b/src/lib/orionld/rest/orionldServiceInit.cpp index 4359d67583..a4afe46840 100644 --- a/src/lib/orionld/rest/orionldServiceInit.cpp +++ b/src/lib/orionld/rest/orionldServiceInit.cpp @@ -35,7 +35,7 @@ #include "logMsg/logMsg.h" // LM_* #include "logMsg/traceLevels.h" // Lmt* -#include "orionld/common/orionldState.h" // orionldState, userAgentHeader +#include "orionld/common/orionldState.h" // orionldState, userAgentHeader, hostHeader #include "orionld/context/orionldCoreContext.h" // orionldCoreContext, coreContextUrl #include "orionld/context/orionldContextInit.h" // orionldContextInit #include "orionld/rest/OrionLdRestService.h" // OrionLdRestService, ORION_LD_SERVICE_PREFIX_LEN @@ -496,12 +496,14 @@ void orionldServiceInit(OrionLdRestServiceSimplifiedVector* restServiceVV, int v // // FIXME: This "block should move to orionld.cpp ? // - // * userAgentHeader(Len): Notifications with HTTP + // * userAgentHeader(Len): Notifications with HTTP(s) // * userAgentHeaderNoLF: Forwarding + // * hostHeader(Len): Notifications with HTTP(s) // userAgentHeaderLen = snprintf(userAgentHeader, sizeof(userAgentHeader) -1, "User-Agent: orionld/%s\r\n", ORIONLD_VERSION); // Used in notifications as value of HTTP Header User-Agent snprintf(userAgentHeaderNoLF, sizeof(userAgentHeaderNoLF) -1, "User-Agent: orionld/%s", ORIONLD_VERSION); // Used in forwarding as value of HTTP Header User-Agent + hostHeaderLen = snprintf(hostHeader, sizeof(hostHeader) - 1, "Host: %s\r\n", orionldHostName); int svIx; // Service Vector Index for (svIx = 0; svIx < vecItems; svIx++) diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1224.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1224.test index 85503fe1ac..7b8602aa54 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1224.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1224.test @@ -62,7 +62,8 @@ echo echo "02. Create a subscription according to (2) of issue #1224" echo "=========================================================" payload='{ - "description": "A subscription to get air quality", + "id": "urn:S1", + "description": "A subscription to get air quality", "type": "Subscription", "entities": [ { @@ -140,7 +141,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:AirQualityObserved:Guadalajara:ES1537 HTTP/1.1 201 Created Content-Length: 0 Date: REGEX(.*) -Location: /ngsi-ld/v1/subscriptions/urn:ngsi-ld:subscription:REGEX(.*) +Location: /ngsi-ld/v1/subscriptions/urn:S1 @@ -164,9 +165,10 @@ Date: REGEX(.*) 06. Dump the accumulator, see one notification ============================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscription:REGEX(.*) -Content-Length: 384 +POST http://REGEX(.*)/notify?subscriptionId=urn:S1 +Content-Length: 329 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -189,7 +191,7 @@ Ngsild-Attribute-Format: Normalized ], "id": "urn:ngsi-ld:Notification:REGEX(.*)", "notifiedAt": "202REGEX(.*)Z", - "subscriptionId": "urn:ngsi-ld:subscription:REGEX(.*)", + "subscriptionId": "urn:S1", "type": "Notification" } ======================================= diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1322.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1322.test index b93d1fe416..2acace7fef 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1322.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1322.test @@ -206,6 +206,7 @@ POST http://REGEX(.*)/yvonne?subscriptionId=urn:S1 Content-Length: 403 Authorization: Bearer {myToken} User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Ngsild-Tenant: captn Content-Type: application/json @@ -240,7 +241,7 @@ POST https://REGEX(.*)/yvonne Content-Length: 403 Authorization: Bearer {myToken} User-Agent: orionld/REGEX(.*) -Host: localhost:9977 +Host: REGEX(.*) Accept: application/json Ngsild-Tenant: captn Content-Type: application/json diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342-experimental.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342-experimental.test new file mode 100644 index 0000000000..7988a14290 --- /dev/null +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342-experimental.test @@ -0,0 +1,328 @@ +# Copyright 2023 FIWARE Foundation e.V. +# +# This file is part of Orion-LD Context Broker. +# +# Orion-LD 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-LD 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-LD Context Broker. If not, see http://www.gnu.org/licenses/. +# +# For those usages not covered by this license please contact with +# orionld at fiware dot org + +# VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh + +--NAME-- +Retrieval of an entity with keyValues/simplified (and -experimental) + +--SHELL-INIT-- +dbInit CB +orionldStart CB -experimental + +--SHELL-- + +# +# 01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342 +# 02. Retrieve the entity with 'keyValues' +# 03. Retrieve the entity with 'simplified' +# 04. Retrieve the entity with 'concise' +# 05. Retrieve the entity with 'normalized' +# 06. Retrieve the entity with default output format (that's normalized) +# + + +echo "01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342" +echo "==========================================================================" +payload='{ + "id": "urn:ngsi-ld:Building:barn002", + "type": "Building", + "category": { + "type": "Property", + "value": "barn" + }, + "address": { + "type": "Property", + "value": { + "streetAddress": "Strasse des 17. Juni", + "addressRegion": "Berlin", + "addressLocality": "Tiergarten", + "postalCode": "10557" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "location": { + "type": "GeoProperty", + "value": { + "type": "Point", + "coordinates": [ + 13.3698, + 52.5163 + ] + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "type": "Relationship", + "object": "urn:ngsi-ld:Person:person001" + } +}' +orionCurl --url /ngsi-ld/v1/entities --payload "$payload" +echo +echo + + +echo "02. Retrieve the entity with 'keyValues'" +echo "========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=keyValues +echo +echo + + +echo "03. Retrieve the entity with 'simplified'" +echo "=========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=simplified +echo +echo + + +echo "04. Retrieve the entity with 'concise'" +echo "======================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=concise +echo +echo + + +echo "05. Retrieve the entity with 'normalized'" +echo "=========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=normalized +echo +echo + + +echo "06. Retrieve the entity with default output format (that's normalized)" +echo "======================================================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002 +echo +echo + + +--REGEXPECT-- +01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342 +========================================================================== +HTTP/1.1 201 Created +Content-Length: 0 +Date: REGEX(.*) +Location: /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002 + + + +02. Retrieve the entity with 'keyValues' +======================================== +HTTP/1.1 200 OK +Content-Length: 322 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": "urn:ngsi-ld:Person:person001", + "type": "Building" +} + + +03. Retrieve the entity with 'simplified' +========================================= +HTTP/1.1 200 OK +Content-Length: 322 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": "urn:ngsi-ld:Person:person001", + "type": "Building" +} + + +04. Retrieve the entity with 'concise' +====================================== +HTTP/1.1 200 OK +Content-Length: 359 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": true + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": { + "object": "urn:ngsi-ld:Person:person001" + }, + "type": "Building" +} + + +05. Retrieve the entity with 'normalized' +========================================= +HTTP/1.1 200 OK +Content-Length: 514 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "type": "Property", + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "category": { + "type": "Property", + "value": "barn" + }, + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "type": "GeoProperty", + "value": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "object": "urn:ngsi-ld:Person:person001", + "type": "Relationship" + }, + "type": "Building" +} + + +06. Retrieve the entity with default output format (that's normalized) +====================================================================== +HTTP/1.1 200 OK +Content-Length: 514 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "type": "Property", + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "category": { + "type": "Property", + "value": "barn" + }, + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "type": "GeoProperty", + "value": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "object": "urn:ngsi-ld:Person:person001", + "type": "Relationship" + }, + "type": "Building" +} + + +--TEARDOWN-- +brokerStop CB +dbDrop CB diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342-mongocOnly.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342-mongocOnly.test new file mode 100644 index 0000000000..12b3d6ec1d --- /dev/null +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342-mongocOnly.test @@ -0,0 +1,328 @@ +# Copyright 2023 FIWARE Foundation e.V. +# +# This file is part of Orion-LD Context Broker. +# +# Orion-LD 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-LD 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-LD Context Broker. If not, see http://www.gnu.org/licenses/. +# +# For those usages not covered by this license please contact with +# orionld at fiware dot org + +# VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh + +--NAME-- +Retrieval of an entity with keyValues/simplified (and -mongocOnly) + +--SHELL-INIT-- +dbInit CB +orionldStart CB -mongocOnly + +--SHELL-- + +# +# 01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342 +# 02. Retrieve the entity with 'keyValues' +# 03. Retrieve the entity with 'simplified' +# 04. Retrieve the entity with 'concise' +# 05. Retrieve the entity with 'normalized' +# 06. Retrieve the entity with default output format (that's normalized) +# + + +echo "01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342" +echo "==========================================================================" +payload='{ + "id": "urn:ngsi-ld:Building:barn002", + "type": "Building", + "category": { + "type": "Property", + "value": "barn" + }, + "address": { + "type": "Property", + "value": { + "streetAddress": "Strasse des 17. Juni", + "addressRegion": "Berlin", + "addressLocality": "Tiergarten", + "postalCode": "10557" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "location": { + "type": "GeoProperty", + "value": { + "type": "Point", + "coordinates": [ + 13.3698, + 52.5163 + ] + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "type": "Relationship", + "object": "urn:ngsi-ld:Person:person001" + } +}' +orionCurl --url /ngsi-ld/v1/entities --payload "$payload" +echo +echo + + +echo "02. Retrieve the entity with 'keyValues'" +echo "========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=keyValues +echo +echo + + +echo "03. Retrieve the entity with 'simplified'" +echo "=========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=simplified +echo +echo + + +echo "04. Retrieve the entity with 'concise'" +echo "======================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=concise +echo +echo + + +echo "05. Retrieve the entity with 'normalized'" +echo "=========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=normalized +echo +echo + + +echo "06. Retrieve the entity with default output format (that's normalized)" +echo "======================================================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002 +echo +echo + + +--REGEXPECT-- +01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342 +========================================================================== +HTTP/1.1 201 Created +Content-Length: 0 +Date: REGEX(.*) +Location: /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002 + + + +02. Retrieve the entity with 'keyValues' +======================================== +HTTP/1.1 200 OK +Content-Length: 322 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": "urn:ngsi-ld:Person:person001", + "type": "Building" +} + + +03. Retrieve the entity with 'simplified' +========================================= +HTTP/1.1 200 OK +Content-Length: 322 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": "urn:ngsi-ld:Person:person001", + "type": "Building" +} + + +04. Retrieve the entity with 'concise' +====================================== +HTTP/1.1 200 OK +Content-Length: 359 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": true + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": { + "object": "urn:ngsi-ld:Person:person001" + }, + "type": "Building" +} + + +05. Retrieve the entity with 'normalized' +========================================= +HTTP/1.1 200 OK +Content-Length: 514 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "type": "Property", + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "category": { + "type": "Property", + "value": "barn" + }, + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "type": "GeoProperty", + "value": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "object": "urn:ngsi-ld:Person:person001", + "type": "Relationship" + }, + "type": "Building" +} + + +06. Retrieve the entity with default output format (that's normalized) +====================================================================== +HTTP/1.1 200 OK +Content-Length: 514 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "type": "Property", + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "category": { + "type": "Property", + "value": "barn" + }, + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "type": "GeoProperty", + "value": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "object": "urn:ngsi-ld:Person:person001", + "type": "Relationship" + }, + "type": "Building" +} + + +--TEARDOWN-- +brokerStop CB +dbDrop CB diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342.test new file mode 100644 index 0000000000..535c2c42e6 --- /dev/null +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1342.test @@ -0,0 +1,328 @@ +# Copyright 2023 FIWARE Foundation e.V. +# +# This file is part of Orion-LD Context Broker. +# +# Orion-LD 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-LD 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-LD Context Broker. If not, see http://www.gnu.org/licenses/. +# +# For those usages not covered by this license please contact with +# orionld at fiware dot org + +# VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh + +--NAME-- +Retrieval of an entity with keyValues/simplified + +--SHELL-INIT-- +dbInit CB +orionldStart CB + +--SHELL-- + +# +# 01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342 +# 02. Retrieve the entity with 'keyValues' +# 03. Retrieve the entity with 'simplified' +# 04. Retrieve the entity with 'concise' +# 05. Retrieve the entity with 'normalized' +# 06. Retrieve the entity with default output format (that's normalized) +# + + +echo "01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342" +echo "==========================================================================" +payload='{ + "id": "urn:ngsi-ld:Building:barn002", + "type": "Building", + "category": { + "type": "Property", + "value": "barn" + }, + "address": { + "type": "Property", + "value": { + "streetAddress": "Strasse des 17. Juni", + "addressRegion": "Berlin", + "addressLocality": "Tiergarten", + "postalCode": "10557" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "location": { + "type": "GeoProperty", + "value": { + "type": "Point", + "coordinates": [ + 13.3698, + 52.5163 + ] + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "type": "Relationship", + "object": "urn:ngsi-ld:Person:person001" + } +}' +orionCurl --url /ngsi-ld/v1/entities --payload "$payload" +echo +echo + + +echo "02. Retrieve the entity with 'keyValues'" +echo "========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=keyValues +echo +echo + + +echo "03. Retrieve the entity with 'simplified'" +echo "=========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=simplified +echo +echo + + +echo "04. Retrieve the entity with 'concise'" +echo "======================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=concise +echo +echo + + +echo "05. Retrieve the entity with 'normalized'" +echo "=========================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002?options=normalized +echo +echo + + +echo "06. Retrieve the entity with default output format (that's normalized)" +echo "======================================================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002 +echo +echo + + +--REGEXPECT-- +01. Create an entity urn:ngsi-ld:Building:barn002 according to issue #1342 +========================================================================== +HTTP/1.1 201 Created +Content-Length: 0 +Date: REGEX(.*) +Location: /ngsi-ld/v1/entities/urn:ngsi-ld:Building:barn002 + + + +02. Retrieve the entity with 'keyValues' +======================================== +HTTP/1.1 200 OK +Content-Length: 322 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": "urn:ngsi-ld:Person:person001", + "type": "Building" +} + + +03. Retrieve the entity with 'simplified' +========================================= +HTTP/1.1 200 OK +Content-Length: 322 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": "urn:ngsi-ld:Person:person001", + "type": "Building" +} + + +04. Retrieve the entity with 'concise' +====================================== +HTTP/1.1 200 OK +Content-Length: 359 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": true + }, + "category": "barn", + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + }, + "name": "Big Red Barn", + "owner": { + "object": "urn:ngsi-ld:Person:person001" + }, + "type": "Building" +} + + +05. Retrieve the entity with 'normalized' +========================================= +HTTP/1.1 200 OK +Content-Length: 514 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "type": "Property", + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "category": { + "type": "Property", + "value": "barn" + }, + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "type": "GeoProperty", + "value": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "object": "urn:ngsi-ld:Person:person001", + "type": "Relationship" + }, + "type": "Building" +} + + +06. Retrieve the entity with default output format (that's normalized) +====================================================================== +HTTP/1.1 200 OK +Content-Length: 514 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +{ + "address": { + "type": "Property", + "value": { + "addressLocality": "Tiergarten", + "addressRegion": "Berlin", + "postalCode": "10557", + "streetAddress": "Strasse des 17. Juni" + }, + "verified": { + "type": "Property", + "value": true + } + }, + "category": { + "type": "Property", + "value": "barn" + }, + "id": "urn:ngsi-ld:Building:barn002", + "location": { + "type": "GeoProperty", + "value": { + "coordinates": [ + 13.3698, + 52.5163 + ], + "type": "Point" + } + }, + "name": { + "type": "Property", + "value": "Big Red Barn" + }, + "owner": { + "object": "urn:ngsi-ld:Person:person001", + "type": "Relationship" + }, + "type": "Building" +} + + +--TEARDOWN-- +brokerStop CB +dbDrop CB diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-new.test b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-new.test index 46a354edd4..a062ef892f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-new.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-new.test @@ -272,9 +272,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E1 06. Dump/Reset accumulator - see one notification for S1, with L1 as a LanguageProperty ======================================================================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 310 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -314,9 +315,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E2 08. Dump/Reset accumulator - see one notification for S2, with L2 as a Property in English ========================================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 271 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-with-arrays.test b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-with-arrays.test index a6f67fdc4f..f78f944265 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-with-arrays.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-with-arrays.test @@ -271,9 +271,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E1 06. Dump/Reset accumulator - see one notification for S1, with L1 as a LanguageProperty ======================================================================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 377 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -325,9 +326,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E2 08. Dump/Reset accumulator - see one notification for S2, with L2 as a normal Property ====================================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 293 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-with-normalized-concise-simplified.test b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-with-normalized-concise-simplified.test index 902b198e3f..24f0079510 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-with-normalized-concise-simplified.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications-with-normalized-concise-simplified.test @@ -331,9 +331,10 @@ Location: /ngsi-ld/v1/entities/urn:E1 04b. Dump/Reset Accumulator =========================== #SORT_START -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S3 Content-Length: 209 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -353,9 +354,10 @@ Ngsild-Attribute-Format: Simplified "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 234 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -378,9 +380,10 @@ Ngsild-Attribute-Format: Concise "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 252 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -419,9 +422,10 @@ Location: /ngsi-ld/v1/entities/urn:E2 05b. Dump/Reset Accumulator =========================== #SORT_START -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S3 Content-Length: 209 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -441,9 +445,10 @@ Ngsild-Attribute-Format: Simplified "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 231 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -466,9 +471,10 @@ Ngsild-Attribute-Format: Concise "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 249 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -507,9 +513,10 @@ Location: /ngsi-ld/v1/entities/urn:E3 06b. Dump/Reset Accumulator =========================== #SORT_START -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S3 Content-Length: 209 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -529,9 +536,10 @@ Ngsild-Attribute-Format: Simplified "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 231 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -554,9 +562,10 @@ Ngsild-Attribute-Format: Concise "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 249 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -595,9 +604,10 @@ Location: /ngsi-ld/v1/entities/urn:E4 07b. Dump/Reset Accumulator =========================== #SORT_START -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S3 Content-Length: 209 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -617,9 +627,10 @@ Ngsild-Attribute-Format: Simplified "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 231 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -642,9 +653,10 @@ Ngsild-Attribute-Format: Concise "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 249 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -683,9 +695,10 @@ Location: /ngsi-ld/v1/entities/urn:E5 08b. Dump/Reset Accumulator =========================== #SORT_START -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S3 Content-Length: 219 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -708,9 +721,10 @@ Ngsild-Attribute-Format: Simplified "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 244 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -736,9 +750,10 @@ Ngsild-Attribute-Format: Concise "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 262 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -780,9 +795,10 @@ Location: /ngsi-ld/v1/entities/urn:E6 09b. Dump/Reset Accumulator =========================== #SORT_START -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S3 Content-Length: 224 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -805,9 +821,10 @@ Ngsild-Attribute-Format: Simplified "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 246 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -833,9 +850,10 @@ Ngsild-Attribute-Format: Concise "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 264 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -877,9 +895,10 @@ Location: /ngsi-ld/v1/entities/urn:E7 10b. Dump/Reset Accumulator =========================== #SORT_START -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S3 Content-Length: 211 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -901,9 +920,10 @@ Ngsild-Attribute-Format: Simplified "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -928,9 +948,10 @@ Ngsild-Attribute-Format: Concise "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 251 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -971,9 +992,10 @@ Location: /ngsi-ld/v1/entities/urn:E8 11b. Dump/Reset Accumulator =========================== #SORT_START -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S3 Content-Length: 211 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -995,9 +1017,10 @@ Ngsild-Attribute-Format: Simplified "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S2 Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -1022,9 +1045,10 @@ Ngsild-Attribute-Format: Concise "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 251 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications.test index da2948f462..2d9774fcf0 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-and-notifications.test @@ -453,7 +453,7 @@ Fiware-Servicepath: / Content-Length: 310 User-Agent: REGEX(.*) Ngsiv2-Attrsformat: normalized -Host: 127.0.0.1:9997 +Host: REGEX(.*) Accept: application/json Content-Type: application/json; charset=utf-8 Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -497,7 +497,7 @@ Fiware-Servicepath: / Content-Length: 272 User-Agent: REGEX(.*) Ngsiv2-Attrsformat: normalized -Host: 127.0.0.1:9997 +Host: REGEX(.*) Accept: application/json Content-Type: application/json; charset=utf-8 Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -547,7 +547,7 @@ Fiware-Servicepath: / Content-Length: 232 User-Agent: REGEX(.*) Ngsiv2-Attrsformat: keyValues -Host: 127.0.0.1:9997 +Host: REGEX(.*) Accept: application/json Content-Type: application/json; charset=utf-8 Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -584,9 +584,10 @@ Date: REGEX(.*) 23. Dump/Reset accumulator - see one notification for S1, with L1 as a Property =============================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:subs:S1 Content-Length: 271 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-get-with-@none.test b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-get-with-@none.test index 2824e31268..ed70363785 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_langprop-get-with-@none.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_langprop-get-with-@none.test @@ -91,6 +91,7 @@ echo echo "06. Create a subscription with lang=gr, matching E1" echo "===================================================" payload='{ + "id": "urn:ngsi-ld:subscription:S1", "type": "Subscription", "entities": [ { @@ -222,7 +223,7 @@ Link: ; rel="http:/ HTTP/1.1 201 Created Content-Length: 0 Date: REGEX(.*) -Location: /ngsi-ld/v1/subscriptions/urn:ngsi-ld:subscription:REGEX(.*) +Location: /ngsi-ld/v1/subscriptions/urn:ngsi-ld:subscription:S1 @@ -235,9 +236,10 @@ Date: REGEX(.*) 08. Dump accumulator, see one notification with the Default language for L ========================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscription:REGEX(.*) -Content-Length: 359 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscription:S1 +Content-Length: 325 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -261,7 +263,7 @@ Ngsild-Attribute-Format: Normalized ], "id": "urn:ngsi-ld:Notification:REGEX(.*)", "notifiedAt": "202REGEX(.*)", - "subscriptionId": "urn:ngsi-ld:subscription:REGEX(.*)", + "subscriptionId": "urn:ngsi-ld:subscription:S1", "type": "Notification" } ======================================= diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_update.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_update.test index de991a2a8d..1d696c231c 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_update.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_update.test @@ -300,9 +300,10 @@ Date: REGEX(.*) 03. Dump and reset accumulator - see one notification with 3 entities ===================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:Subscription:testsubscription +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:testsubscription Content-Length: 436 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -418,9 +419,10 @@ Date: REGEX(.*) 06. Dump and reset accumulator - see one notification with two entities ======================================================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:Subscription:testsubscription +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:testsubscription Content-Length: 402 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -548,9 +550,10 @@ Date: REGEX(.*) 09. Dump and reset accumulator - see one notification with two entities ======================================================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:Subscription:testsubscription +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:testsubscription Content-Length: 432 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-create-one-entity.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-create-one-entity.test index c33243c5e5..9927abcc78 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-create-one-entity.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-create-one-entity.test @@ -272,6 +272,7 @@ Link: ; rel="http:/ POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 624 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-create-with-notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-create-with-notifications.test index 0db29a8420..2fb35ab046 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-create-with-notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-create-with-notifications.test @@ -107,6 +107,7 @@ Date: REGEX(.*) POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 555 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-replace-one-entity.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-replace-one-entity.test index 511f1fe962..f4489331f4 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-replace-one-entity.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-replace-one-entity.test @@ -331,6 +331,7 @@ modifiedAt > createdAt POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 624 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-replace-with-notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-replace-with-notifications.test index 96b6765e5c..2ad4d00ef5 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-replace-with-notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-replace-with-notifications.test @@ -402,9 +402,10 @@ Link: ; rel="http:/ 09. Dump Accumulator - see four notifications (one double) ========================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 278 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -428,9 +429,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 261 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -453,9 +455,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 350 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -491,9 +494,10 @@ Ngsild-Attribute-Format: Normalized 10. Dump Accumulator2 - see four notifications (one double) =========================================================== -POST http://127.0.0.1:9977/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 Content-Length: 278 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -517,9 +521,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9977/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 Content-Length: 261 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -542,9 +547,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9977/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 Content-Length: 350 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-update-one-entity.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-update-one-entity.test index 47ab1ef25a..f08906353d 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-update-one-entity.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-update-one-entity.test @@ -362,6 +362,7 @@ modifiedAt > createdAt POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 713 User-Agent: orionld/REGEX(.*) +REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-update-with-notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-update-with-notifications.test index 6b6b0e49d2..b53f1eed46 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-update-with-notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert-update-with-notifications.test @@ -513,9 +513,10 @@ Link: ; rel="http:/ 11. Dump Accumulator - see four notifications (one double) ========================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 278 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -539,9 +540,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 261 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -564,9 +566,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 402 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -607,9 +610,10 @@ Ngsild-Attribute-Format: Normalized 12. Dump Accumulator2 - see four notifications (one double) =========================================================== -POST http://127.0.0.1:9977/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 Content-Length: 278 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -633,9 +637,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9977/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 Content-Length: 261 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -658,9 +663,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9977/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 Content-Length: 402 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -701,9 +707,10 @@ Ngsild-Attribute-Format: Normalized 13. Dump Accumulator3 - see one notification (step 05) ====================================================== -POST http://127.0.0.1:9957/notify?subscriptionId=urn:ngsi-ld:subscriptions:S3 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S3 Content-Length: 278 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -731,9 +738,10 @@ Ngsild-Attribute-Format: Normalized 14. Dump Accumulator4 - see one notification (step 07) ====================================================== -POST http://127.0.0.1:9937/notify?subscriptionId=urn:ngsi-ld:subscriptions:S4 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S4 Content-Length: 402 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert_with_notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert_with_notifications.test index fa824863a5..4027a168de 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert_with_notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_batch_upsert_with_notifications.test @@ -500,9 +500,10 @@ Link: ; rel="http:/ 06. Dump accumulator, see 2 notifications, with 6 entities each =============================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 2835 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -745,9 +746,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 5028 User-Agent: orionld/post-v1.1.0 +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_first_notification.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_first_notification.test index 90716742ab..f4ed342c3a 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_first_notification.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_first_notification.test @@ -156,9 +156,10 @@ Date: REGEX(.*) 05. Dump accumulator to see one notification ============================================ -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 413 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_geojson-format-in-notifications-with-keyValues.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_geojson-format-in-notifications-with-keyValues.test index bc7f42afe4..ca9aacc09a 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_geojson-format-in-notifications-with-keyValues.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_geojson-format-in-notifications-with-keyValues.test @@ -142,9 +142,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:E01 03. Dump accumulator to see one notification - in GeoJSON format ================================================================ -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 478 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/geo+json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -197,9 +198,10 @@ Date: REGEX(.*) 05. Dump accumulator to see another GeoJSON format notification =============================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 485 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/geo+json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_geojson-format-in-notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_geojson-format-in-notifications.test index 447706ae87..ccd417f179 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_geojson-format-in-notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_geojson-format-in-notifications.test @@ -141,9 +141,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:E01 03. Dump accumulator to see one notification - in GeoJSON format ================================================================ -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 565 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/geo+json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -205,9 +206,10 @@ Date: REGEX(.*) 05. Dump accumulator to see another GeoJSON format notification =============================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 600 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/geo+json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_issue_1248_q_in_subscription.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_issue_1248_q_in_subscription.test index f7f0a74a05..18dd781b6f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_issue_1248_q_in_subscription.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_issue_1248_q_in_subscription.test @@ -284,9 +284,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E2 06. Dump the accumulator and see the notification for E1 ======================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 281 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -413,9 +414,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E4 12. Dump the accumulator and see the notification for E3 ======================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S2 Content-Length: 282 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_missing_notification.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_missing_notification.test index 85b2b00eb1..8226362c27 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_missing_notification.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_missing_notification.test @@ -70,6 +70,7 @@ echo echo "01. Creating subscription on tenant openiot" echo "===========================================" payload='{ + "id": "urn:S1", "description": "Notify me of all changes", "type": "Subscription", "entities" : [{"type": "TemperatureSensor"}], @@ -162,7 +163,7 @@ transfer-encoding: chunked HTTP/1.1 201 Created Content-Length: 0 Date: REGEX(.*) -Location: /ngsi-ld/v1/subscriptions/urn:ngsi-ld:subscription:REGEX(.*) +Location: /ngsi-ld/v1/subscriptions/urn:S1 NGSILD-Tenant: openiot @@ -182,9 +183,10 @@ NGSILD-Tenant: openiot 03. Dumping/Reseting accumulator to see one notification ======================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscription:REGEX(.*) -Content-Length: 388 +POST http://REGEX(.*)/notify?subscriptionId=urn:S1 +Content-Length: 333 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Ngsild-Tenant: openiot Content-Type: application/json @@ -208,7 +210,7 @@ Ngsild-Attribute-Format: Normalized ], "id": "urn:ngsi-ld:Notification:REGEX(.*)", "notifiedAt": "REGEX(.*)", - "subscriptionId": "urn:ngsi-ld:subscription:REGEX(.*)", + "subscriptionId": "urn:S1", "type": "Notification" } ======================================= @@ -223,9 +225,10 @@ Date: REGEX(.*) 05. Dumping accumulator to see one notification =============================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscription:REGEX(.*) -Content-Length: 394 +POST http://REGEX(.*)/notify?subscriptionId=urn:S1 +Content-Length: 339 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Ngsild-Tenant: openiot Content-Type: application/json @@ -247,7 +250,7 @@ Ngsild-Attribute-Format: Normalized ], "id": "urn:ngsi-ld:Notification:REGEX(.*)", "notifiedAt": "REGEX(.*)", - "subscriptionId": "urn:ngsi-ld:subscription:REGEX(.*)", + "subscriptionId": "urn:S1", "type": "Notification" } ======================================= diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_no_notification_on_nochange.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_no_notification_on_nochange.test index d5b6f7dba8..80314ef3a2 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_no_notification_on_nochange.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_no_notification_on_nochange.test @@ -147,9 +147,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E1 03. Dump and reset accumulator - see one notification ===================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:copy-e1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:copy-e1 Content-Length: 338 User-Agent: orionld/REGEX(.*) +REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -198,9 +199,10 @@ Date: REGEX(.*) 07. Dump and reset accumulator - see one notification ===================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:copy-e1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:copy-e1 Content-Length: 338 User-Agent: orionld/REGEX(.*) +REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_no_notification_on_nochange_2.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_no_notification_on_nochange_2.test index c51181ff01..51f9635692 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_no_notification_on_nochange_2.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_no_notification_on_nochange_2.test @@ -180,9 +180,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E1 03. Dump and reset accumulator and see one notification ======================================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:Subscription:01 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:01 Content-Length: 493 User-Agent: orionld/REGEX(.*) +REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification-in-geojson-format.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification-in-geojson-format.test index aac813a7c3..5748cff8e1 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification-in-geojson-format.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification-in-geojson-format.test @@ -143,6 +143,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:E01 POST http://REGEX(.*)/notify Content-Length: 565 User-Agent: orionld/REGEX(.*) +REGEX(.*) Accept: application/json Content-Type: application/geo+json Link: REGEX(.*) @@ -207,6 +208,7 @@ Date: REGEX(.*) POST http://REGEX(.*)/notify Content-Length: 600 User-Agent: orionld/REGEX(.*) +REGEX(.*) Accept: application/json Content-Type: application/geo+json Link: REGEX(.*) diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-keyValues-compact.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-keyValues-compact.test index 63f2d77fe5..0a3c6db8b3 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-keyValues-compact.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-keyValues-compact.test @@ -137,6 +137,7 @@ POST http://REGEX(.*)/notify Content-Length: 106 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: keyValues +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -167,6 +168,7 @@ POST REGEX(.*) Content-Length: 113 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: keyValues +Host: REGEX(.*) Accept: application/json Content-Type: application/json diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-keyValues.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-keyValues.test index 354801060b..3355f5cd8a 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-keyValues.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-keyValues.test @@ -137,6 +137,7 @@ POST http://REGEX(.*)/notify Content-Length: 241 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: keyValues +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -167,6 +168,7 @@ POST REGEX(.*) Content-Length: 293 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: keyValues +Host: REGEX(.*) Accept: application/json Content-Type: application/json diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-normalized-and-compact.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-normalized-and-compact.test index 73ca0e6fd6..a8eefe6d90 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-normalized-and-compact.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-normalized-and-compact.test @@ -137,6 +137,7 @@ POST http://REGEX(.*)/notify Content-Length: 239 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -180,6 +181,7 @@ POST REGEX(.*) Content-Length: 288 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-normalized.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-normalized.test index 96e7dab19a..6127515fc4 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-normalized.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_for_ngsiv2-normalized.test @@ -137,6 +137,7 @@ POST http://REGEX(.*)/notify Content-Length: 419 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -180,6 +181,7 @@ POST REGEX(.*) Content-Length: 513 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-and-subcache-refresh.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-and-subcache-refresh.test index 68e5e2253d..a6ce35b33d 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-and-subcache-refresh.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-and-subcache-refresh.test @@ -288,6 +288,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:T:E3 POST REGEX(.*) Content-Length: 223 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-commalist-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-commalist-attr.test index b49d344d4b..611cde1d0b 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-commalist-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-commalist-attr.test @@ -351,6 +351,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -408,6 +409,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 236 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -465,6 +467,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E5 POST REGEX(.*) Content-Length: 235 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -519,9 +522,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E7 18. Dump accumulator to see one notification ============================================ -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subs:S4 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subs:S4 Content-Length: 301 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-attr-compound.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-attr-compound.test index c8b2b3fb6e..616477735e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-attr-compound.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-attr-compound.test @@ -132,9 +132,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E2 04. Dump accumulator - see notification for E1 ============================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subs:S1 Content-Length: 244 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-attr.test index f9d5d51a2a..6a5662449d 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-attr.test @@ -505,6 +505,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -562,6 +563,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 236 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -619,6 +621,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E5 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -676,6 +679,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E7 POST REGEX(.*) Content-Length: 236 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -733,6 +737,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E9 POST REGEX(.*) Content-Length: 243 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -778,6 +783,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E11 POST REGEX(.*) Content-Length: 244 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -801,6 +807,7 @@ Ngsild-Attribute-Format: Simplified POST REGEX(.*) Content-Length: 234 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -845,6 +852,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E12 POST REGEX(.*) Content-Length: 244 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-observedAt-of-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-observedAt-of-attr.test index f358becefd..677078b9bd 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-observedAt-of-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-observedAt-of-attr.test @@ -131,6 +131,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 239 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-attr.test index a6e5da4384..7b45786741 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-attr.test @@ -125,6 +125,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-relationship-and-more.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-relationship-and-more.test index 2b2d7b7652..ee0005dabe 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-relationship-and-more.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-relationship-and-more.test @@ -124,9 +124,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 03. Dump accumulator to see one notification ============================================ -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subs:S1 Content-Length: 289 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-relationship.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-relationship.test index 3112684856..3953d3ac1f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-relationship.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-string-relationship.test @@ -125,6 +125,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 240 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-subattr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-subattr.test index 1603ffd9b3..48f541498d 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-subattr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-eq-subattr.test @@ -128,9 +128,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E2 04. Dump accumulator - see notification for E1 ============================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subs:S1 Content-Length: 232 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-exists-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-exists-attr.test index e19cfa02e3..513494bc0f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-exists-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-exists-attr.test @@ -250,6 +250,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E2 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -303,6 +304,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E4 POST REGEX(.*) Content-Length: 236 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -356,6 +358,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E6 POST REGEX(.*) Content-Length: 243 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ge-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ge-attr.test index 642fdb310b..0f9e4baaee 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ge-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ge-attr.test @@ -494,6 +494,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -558,6 +559,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -622,6 +624,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E5 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -700,6 +703,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E9 POST REGEX(.*) Content-Length: 243 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -745,6 +749,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E11 POST REGEX(.*) Content-Length: 247 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -768,6 +773,7 @@ Ngsild-Attribute-Format: Simplified POST REGEX(.*) Content-Length: 234 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -819,6 +825,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E12 POST REGEX(.*) Content-Length: 243 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ge-observedAt-of-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ge-observedAt-of-attr.test index bdc0c8cd9d..f2b0f99ce3 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ge-observedAt-of-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ge-observedAt-of-attr.test @@ -131,6 +131,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 239 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-attr.test index 5d936469c7..122c2a5dc8 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-attr.test @@ -494,6 +494,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -558,6 +559,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -622,6 +624,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E5 POST REGEX(.*) Content-Length: 238 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -700,6 +703,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E9 POST REGEX(.*) Content-Length: 244 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -745,6 +749,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E11 POST REGEX(.*) Content-Length: 247 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -768,6 +773,7 @@ Ngsild-Attribute-Format: Simplified POST REGEX(.*) Content-Length: 235 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -819,6 +825,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E12 POST REGEX(.*) Content-Length: 244 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-observedAt-of-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-observedAt-of-attr.test index b55a9c7a3a..4184fad8a4 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-observedAt-of-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-observedAt-of-attr.test @@ -131,6 +131,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 239 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-subattr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-subattr.test index 8a978304e7..a0519e79b6 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-subattr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-gt-subattr.test @@ -128,9 +128,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E2 04. Dump accumulator - see notification for E1 ============================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subs:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subs:S1 Content-Length: 232 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-int-commalist-for-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-int-commalist-for-attr.test index 94302520dc..62e3c53bae 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-int-commalist-for-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-int-commalist-for-attr.test @@ -125,6 +125,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-le-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-le-attr.test index fe0df17ff1..a9e0f7efc6 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-le-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-le-attr.test @@ -494,6 +494,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -558,6 +559,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -622,6 +624,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E5 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -700,6 +703,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E9 POST REGEX(.*) Content-Length: 243 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -745,6 +749,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E11 POST REGEX(.*) Content-Length: 247 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -768,6 +773,7 @@ Ngsild-Attribute-Format: Simplified POST REGEX(.*) Content-Length: 234 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -819,6 +825,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E12 POST REGEX(.*) Content-Length: 245 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-le-observedAt-of-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-le-observedAt-of-attr.test index 74baa0e6e6..20e8534df7 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-le-observedAt-of-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-le-observedAt-of-attr.test @@ -131,6 +131,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 239 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-lt-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-lt-attr.test index 5d085f45f5..2dcc35fc55 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-lt-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-lt-attr.test @@ -494,6 +494,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -558,6 +559,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 239 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -622,6 +624,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E5 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -700,6 +703,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E9 POST REGEX(.*) Content-Length: 243 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -745,6 +749,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E11 POST REGEX(.*) Content-Length: 247 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -768,6 +773,7 @@ Ngsild-Attribute-Format: Simplified POST REGEX(.*) Content-Length: 234 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -819,6 +825,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E12 POST REGEX(.*) Content-Length: 241 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-lt-observedAt-of-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-lt-observedAt-of-attr.test index ad75d1aecc..41d3630c36 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-lt-observedAt-of-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-lt-observedAt-of-attr.test @@ -131,6 +131,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 239 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ne-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ne-attr.test index 049db9a69f..3b9e343e1c 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ne-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-ne-attr.test @@ -546,6 +546,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -610,6 +611,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 236 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -674,6 +676,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E5 POST REGEX(.*) Content-Length: 238 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -738,6 +741,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E7 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -802,6 +806,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E9 POST REGEX(.*) Content-Length: 244 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -847,6 +852,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E11 POST REGEX(.*) Content-Length: 244 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -870,6 +876,7 @@ Ngsild-Attribute-Format: Simplified POST REGEX(.*) Content-Length: 234 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -921,6 +928,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E12 POST REGEX(.*) Content-Length: 245 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-notexists-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-notexists-attr.test index 5ab62a4a49..4951964fe7 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-notexists-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-notexists-attr.test @@ -267,6 +267,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E2 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -327,6 +328,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E4 POST REGEX(.*) Content-Length: 236 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -387,6 +389,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E6 POST REGEX(.*) Content-Length: 243 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-or.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-or.test index 8d4a924753..41cff36ab6 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-or.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-or.test @@ -193,6 +193,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -287,6 +288,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-range-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-range-attr.test index 5460188a92..9c76cd957b 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-range-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with-q-range-attr.test @@ -343,6 +343,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E1 POST REGEX(.*) Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -400,6 +401,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E3 POST REGEX(.*) Content-Length: 236 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -457,6 +459,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E5 POST REGEX(.*) Content-Length: 237 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -511,9 +514,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:T:E7 18. Dump accumulator to see one notification ============================================ -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subs:S4 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subs:S4 Content-Length: 301 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_concise.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_concise.test index d6231c9d60..1c54cb8f0a 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_concise.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_concise.test @@ -144,6 +144,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:E01 POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 361 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Concise @@ -183,6 +184,7 @@ Date: REGEX(.*) POST REGEX(.*) Content-Length: 368 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Concise diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_forwarded-headers-from-receiverInfo.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_forwarded-headers-from-receiverInfo.test index 644b510bf9..9bb799821e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_forwarded-headers-from-receiverInfo.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_forwarded-headers-from-receiverInfo.test @@ -131,6 +131,7 @@ Content-Length: 282 Authorization: Auth123 X-Auth-Token: XHT User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_forwarded-headers.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_forwarded-headers.test index c0a61fe0e9..448f33cc06 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_forwarded-headers.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_forwarded-headers.test @@ -120,6 +120,7 @@ Content-Length: 282 Authorization: Auth123 X-Auth-Token: XHT User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Ngsild-Tenant: t1 Content-Type: application/json diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_keyValues.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_keyValues.test index 286a23fb56..ed8d28a342 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_keyValues.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_keyValues.test @@ -138,9 +138,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:E01 03. Dump accumulator to see one notification, then reset the accumulator ======================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 322 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Simplified @@ -172,9 +173,10 @@ Date: REGEX(.*) 05. Dump accumulator to see one notification ============================================ -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 329 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Simplified diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_simplified.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_simplified.test index 2e05369890..3586ce407f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_simplified.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notification_with_simplified.test @@ -144,6 +144,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:E01 POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 322 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Simplified @@ -178,6 +179,7 @@ Date: REGEX(.*) POST REGEX(.*) Content-Length: 329 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Simplified diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_after_restarting_broker.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_after_restarting_broker.test index 72a2958a56..50eb7f6358 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_after_restarting_broker.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_after_restarting_broker.test @@ -217,9 +217,10 @@ Date: REGEX(.*) 05. Dump accumulator to see one notification - NGSI-LD has no initial notifications =================================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 328 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -265,9 +266,10 @@ Date: REGEX(.*) 08. Dump accumulator to see one notification ============================================ -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 363 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_after_restarting_broker_sub_with_type_only.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_after_restarting_broker_sub_with_type_only.test index f0fa0ad226..3be3f6ee4c 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_after_restarting_broker_sub_with_type_only.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_after_restarting_broker_sub_with_type_only.test @@ -216,9 +216,10 @@ Date: REGEX(.*) 05. Dump accumulator to see one notification - NGSI-LD has no initial notifications =================================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 328 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -264,9 +265,10 @@ Date: REGEX(.*) 08. Dump accumulator to see one notification ============================================ -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 363 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_before_restarting_broker.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_before_restarting_broker.test index 5ae0da1417..3e5130a30c 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_before_restarting_broker.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_before_restarting_broker.test @@ -184,9 +184,10 @@ Date: REGEX(.*) 05. Dump accumulator to see one notification - NGSI-LD has no initial notifications =================================================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=http://a.b.c/subs/sub01 +POST http://REGEX(.*)/notify?subscriptionId=http://a.b.c/subs/sub01 Content-Length: 328 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_entity_delete.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_entity_delete.test index 9df3f55b88..7a0a384c35 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_entity_delete.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_entity_delete.test @@ -214,6 +214,7 @@ Date: REGEX(.*) POST http://REGEX(.*)/notify?subscriptionId=urn:S2 Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -236,6 +237,7 @@ Ngsild-Attribute-Format: Normalized POST http://REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 233 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_issue-1244.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_issue-1244.test index 5c57177e7a..f3cf407e2a 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_issue-1244.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_notifications_issue-1244.test @@ -206,6 +206,7 @@ Date: REGEX(.*) POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:withAttributes Content-Length: 411 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -246,6 +247,7 @@ Date: REGEX(.*) POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:withAttributes Content-Length: 411 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -286,6 +288,7 @@ Date: REGEX(.*) POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:withAttributes Content-Length: 360 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -315,6 +318,7 @@ Ngsild-Attribute-Format: Normalized POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:withoutAttributes Content-Length: 493 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -348,6 +352,7 @@ Ngsild-Attribute-Format: Normalized POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:withoutAttributes Content-Length: 493 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -381,6 +386,7 @@ Ngsild-Attribute-Format: Normalized POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:withoutAttributes Content-Length: 363 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_attribute.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_attribute.test index 0535fcc79a..e488ed8e0d 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_attribute.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_attribute.test @@ -173,9 +173,10 @@ bye 05. Dump accumulator, see one notification ========================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscription:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscription:S1 Content-Length: 341 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attr_and_notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attr_and_notifications.test index 953d405cbf..a915e83372 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attr_and_notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attr_and_notifications.test @@ -141,9 +141,10 @@ Date: REGEX(.*) 04. Dump accumulator - see one notification =========================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 266 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -177,9 +178,10 @@ Date: REGEX(.*) 06. Dump accumulator - see two notifications ============================================ -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 266 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -202,9 +204,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 266 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attr_with_subscription.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attr_with_subscription.test index 95b77c82f2..890af97b47 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attr_with_subscription.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attr_with_subscription.test @@ -246,9 +246,10 @@ Link: REGEX(.*) 06. Dump the accumulator - see one notification - then reset the accumulator ============================================================================ -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 321 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attrs.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attrs.test index e769c5705e..f89dc0aefa 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attrs.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_patch_entity_attrs.test @@ -247,9 +247,10 @@ bye 06. Dump accumulator - see two notification (from step 01 and 03) ================================================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 331 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -280,9 +281,10 @@ Ngsild-Attribute-Format: Normalized "type": "Notification" } ======================================= -POST http://127.0.0.1:9997/notify?subscriptionId=urn:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 331 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription-with-mqtt-notification.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription-with-mqtt-notification.test index cec9cccd9e..c3b60ad54e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription-with-mqtt-notification.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription-with-mqtt-notification.test @@ -344,6 +344,7 @@ Notifications: 1 "Content-Type": "application/json", "H1": "123", "H2": "456", + "Host": "REGEX(.*)", "Link": "REGEX(.*)", "Ngsild-Attribute-Format": "Normalized", "User-Agent": "orionld/REGEX(.*)" @@ -489,6 +490,7 @@ Notifications: 1 "Content-Type": "application/json", "H1": "123", "H2": "456", + "Host": "REGEX(.*)", "Link": "REGEX(.*)", "Ngsild-Attribute-Format": "Normalized", "User-Agent": "orionld/REGEX(.*)", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_and_q_issue_1180.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_and_q_issue_1180.test index 5e00436ff6..7d2dd5a908 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_and_q_issue_1180.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_and_q_issue_1180.test @@ -228,9 +228,10 @@ Location: /ngsi-ld/v1/entities/urn:E1 06. Dump accumulator ==================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 258 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_ngsiv2_notification-compact.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_ngsiv2_notification-compact.test index 53fefdb16a..3bf90a725a 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_ngsiv2_notification-compact.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_ngsiv2_notification-compact.test @@ -394,10 +394,11 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E1 03. Dump accumulator to see the notification ============================================ -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 146 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -445,10 +446,11 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E2 07. Dump accumulator to see the notification (and reset the accumulator afterwards) =================================================================================== -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 147 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -496,10 +498,11 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E3 11. Dump accumulator to see the notification with P3 only (and reset the accumulator afterwards) ================================================================================================ -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 148 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -547,10 +550,11 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E4 15. Dump accumulator to see location in the notification (and reset the accumulator afterwards) =============================================================================================== -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 193 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -624,10 +628,11 @@ Date: REGEX(.*) 18. Dump accumulator to see observationSpace in the notification (and reset the accumulator afterwards) ======================================================================================================= -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 343 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -681,10 +686,11 @@ Date: REGEX(.*) 20. Dump accumulator to see operationSpace in the notification (and reset the accumulator afterwards) ===================================================================================================== -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 491 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_ngsiv2_notification.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_ngsiv2_notification.test index 6798bbf372..ab0d989a23 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_ngsiv2_notification.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_ngsiv2_notification.test @@ -394,10 +394,11 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E1 03. Dump accumulator to see the notification ============================================ -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 236 User-Agent: orionld/post-v1.1.0 Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -445,10 +446,11 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E2 07. Dump accumulator to see the notification (and reset the accumulator afterwards) =================================================================================== -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 237 User-Agent: orionld/post-v1.1.0 Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -496,10 +498,11 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E3 11. Dump accumulator to see the notification with P3 only (and reset the accumulator afterwards) ================================================================================================ -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 238 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -547,10 +550,11 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E4 15. Dump accumulator to see location in the notification (and reset the accumulator afterwards) =============================================================================================== -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 238 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -624,10 +628,11 @@ Date: REGEX(.*) 18. Dump accumulator to see observationSpace in the notification (and reset the accumulator afterwards) ======================================================================================================= -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 388 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json @@ -681,10 +686,11 @@ Date: REGEX(.*) 20. Dump accumulator to see operationSpace in the notification (and reset the accumulator afterwards) ===================================================================================================== -POST http://127.0.0.1:9997/notify +POST http://REGEX(.*)/notify Content-Length: 536 User-Agent: orionld/REGEX(.*) Ngsiv2-Attrsformat: normalized +Host: REGEX(.*) Accept: application/json Content-Type: application/json diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_timestamps.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_timestamps.test index 5e08ab9d65..0c62f3e592 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_timestamps.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_timestamps.test @@ -421,9 +421,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entities:E1 05. Dump the accumulator - check milliseconds for all timestamps ================================================================ -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:subscriptions:s1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:s1 Content-Length: 268 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_and-senderThread.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_and-senderThread.test index 03c5bb4e5c..0ec0a3ed42 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_and-senderThread.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_and-senderThread.test @@ -207,6 +207,7 @@ Notifications: 1 "metadata": { "Accept": "application/json", "Content-Type": "application/json", + "Host": "REGEX(.*)", "Link": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld", "Ngsild-Attribute-Format": "Simplified", "User-Agent": "orionld/REGEX(.*)" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_issue-1178-II.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_issue-1178-II.test index 483eb5ba9e..47c71a0242 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_issue-1178-II.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_issue-1178-II.test @@ -265,6 +265,7 @@ Notifications: 1 "metadata": { "Accept": "application/json", "Content-Type": "application/json", + "Host": "REGEX(.*)", "Link": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld", "Ngsild-Attribute-Format": "Simplified", "User-Agent": "orionld/REGEX(.*)" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_issue-1178.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_issue-1178.test index 25ec82ba62..6502b80f5e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_issue-1178.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_with_mqtt_issue-1178.test @@ -207,6 +207,7 @@ Notifications: 1 "metadata": { "Accept": "application/json", "Content-Type": "application/json", + "Host": "REGEX(.*)", "Link": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld", "Ngsild-Attribute-Format": "Simplified", "User-Agent": "orionld/REGEX(.*)" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_testsuite-simple_subscription_to_concrete_attribute.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_testsuite-simple_subscription_to_concrete_attribute.test index cded4ac38b..b33094240b 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_testsuite-simple_subscription_to_concrete_attribute.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_testsuite-simple_subscription_to_concrete_attribute.test @@ -133,9 +133,10 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:Vehicle:V1234 03. Dump and reset accumulator. See one notification ==================================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:Subscription:mySubscription:20-09-2019:13:13:00 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:mySubscription:20-09-2019:13:13:00 Content-Length: 362 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -173,9 +174,10 @@ Date: REGEX(.*) 05. Dump accumulator. See the notification ========================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsi-ld:Subscription:mySubscription:20-09-2019:13:13:00 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:mySubscription:20-09-2019:13:13:00 Content-Length: 361 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_one_tenant.test b/test/functionalTest/cases/0000_ngsild/ngsild_one_tenant.test index 57ff4c1b70..8d7d8a92b2 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_one_tenant.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_one_tenant.test @@ -25,38 +25,38 @@ Tenant test --SHELL-INIT-- dbInit CB -dbInit CB tn1 +dbInit CB tn-1 orionldStart CB -multiservice --SHELL-- # -# 01. Create an entity urn:ngsi-ld:entity:E1 in tenant tn1 -# 02. Dump mongo::entities collection of tenant tn1 - see E1 -# 03. GET the entity from tenant tn1 +# 01. Create an entity urn:ngsi-ld:entity:E1 in tenant tn-1 +# 02. Dump mongo::entities collection of tenant tn-1 - see E1 +# 03. GET the entity from tenant tn-1 # -echo "01. Create an entity urn:ngsi-ld:entity:E1 in tenant tn1" -echo "========================================================" +echo "01. Create an entity urn:ngsi-ld:entity:E1 in tenant tn-1" +echo "=========================================================" payload='{ "id": "urn:ngsi-ld:entity:E1", "type": "T1" }' -orionCurl --url /ngsi-ld/v1/entities --payload "$payload" --tenant tn1 +orionCurl --url /ngsi-ld/v1/entities --payload "$payload" --tenant tn-1 echo echo -echo "02. Dump mongo::entities collection of tenant tn1 - see E1" -echo "==========================================================" -mongoCmd2 ftest-tn1 "db.entities.findOne()" +echo "02. Dump mongo::entities collection of tenant tn-1 - see E1" +echo "===========================================================" +mongoCmd2 ftest-tn-1 "db.entities.findOne()" echo echo -echo "03. GET the entity from tenant tn1" -echo "==================================" -orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:entity:E1 --tenant tn1 +echo "03. GET the entity from tenant tn-1" +echo "===================================" +orionCurl --url /ngsi-ld/v1/entities/urn:ngsi-ld:entity:E1 --tenant tn-1 echo echo @@ -69,18 +69,18 @@ echo --REGEXPECT-- -01. Create an entity urn:ngsi-ld:entity:E1 in tenant tn1 -======================================================== +01. Create an entity urn:ngsi-ld:entity:E1 in tenant tn-1 +========================================================= HTTP/1.1 201 Created Content-Length: 0 Date: REGEX(.*) Location: /ngsi-ld/v1/entities/urn:ngsi-ld:entity:E1 -NGSILD-Tenant: tn1 +NGSILD-Tenant: tn-1 -02. Dump mongo::entities collection of tenant tn1 - see E1 -========================================================== +02. Dump mongo::entities collection of tenant tn-1 - see E1 +=========================================================== MongoDB shell version REGEX(.*) connecting to: mongodb:REGEX(.*) MongoDB server version: REGEX(.*) @@ -101,8 +101,8 @@ MongoDB server version: REGEX(.*) bye -03. GET the entity from tenant tn1 -================================== +03. GET the entity from tenant tn-1 +=================================== HTTP/1.1 200 OK Content-Length: 42 Content-Type: application/json @@ -133,4 +133,4 @@ Date: REGEX(.*) brokerStop CB accumulatorStop dbDrop CB -dbDrop CB tn1 +dbDrop CB tn-1 diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_patch-subscription-with-mqtt.test b/test/functionalTest/cases/0000_ngsild/ngsild_patch-subscription-with-mqtt.test index 424ed7601a..b8444c0dc8 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_patch-subscription-with-mqtt.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_patch-subscription-with-mqtt.test @@ -205,6 +205,7 @@ Notifications: 1 "Content-Type": "application/json", "H1": "123", "H2": "456", + "Host": "REGEX(.*)", "Link": "REGEX(.*)", "Ngsild-Attribute-Format": "Normalized", "User-Agent": "orionld/REGEX(.*)" @@ -259,6 +260,7 @@ Notifications: 1 "Content-Type": "application/json", "H1": "123", "H2": "456", + "Host": "REGEX(.*)", "Link": "REGEX(.*)", "Ngsild-Attribute-Format": "Normalized", "User-Agent": "orionld/REGEX(.*)", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_patch_attribute-and-notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_patch_attribute-and-notifications.test index 94df24e592..39da6df14c 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_patch_attribute-and-notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_patch_attribute-and-notifications.test @@ -181,9 +181,10 @@ Date: REGEX(.*) 04. Dump accumulator, see one notification ========================================== -POST http://127.0.0.1:9997/notify?subscriptionId=urn:ngsdi-ld:subscriptions:s1 +POST http://REGEX(.*)/notify?subscriptionId=urn:ngsdi-ld:subscriptions:s1 Content-Length: 1268 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-delete-attr-and-notification.test b/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-delete-attr-and-notification.test index 8c47d6c7a2..bbaa5e0ba7 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-delete-attr-and-notification.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-delete-attr-and-notification.test @@ -313,6 +313,7 @@ Date: REGEX(.*) POST REGEX(.*)/notify?subscriptionId=urn:S4 Content-Length: 267 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -334,6 +335,7 @@ Ngsild-Attribute-Format: Normalized POST REGEX(.*)/notify?subscriptionId=urn:S2 Content-Length: 267 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -355,6 +357,7 @@ Ngsild-Attribute-Format: Normalized POST REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 267 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -389,6 +392,7 @@ Date: REGEX(.*) POST REGEX(.*)/notify?subscriptionId=urn:S4 Content-Length: 267 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -410,6 +414,7 @@ Ngsild-Attribute-Format: Normalized POST REGEX(.*)/notify?subscriptionId=urn:S2 Content-Length: 267 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -444,6 +449,7 @@ Date: REGEX(.*) POST REGEX(.*)/notify?subscriptionId=urn:S5 Content-Length: 303 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -469,6 +475,7 @@ Ngsild-Attribute-Format: Normalized POST REGEX(.*)/notify?subscriptionId=urn:S4 Content-Length: 303 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized @@ -494,6 +501,7 @@ Ngsild-Attribute-Format: Normalized POST REGEX(.*)/notify?subscriptionId=urn:S2 Content-Length: 303 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/ld+json Ngsild-Attribute-Format: Normalized diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-many-alterations-on-same-sub.test b/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-many-alterations-on-same-sub.test index 86c83aaacc..01af12b5fe 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-many-alterations-on-same-sub.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-many-alterations-on-same-sub.test @@ -231,6 +231,7 @@ bye POST REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 302 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-modify-existing-attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-modify-existing-attr.test index 906a534a48..da65ed0f9f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-modify-existing-attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-modify-existing-attr.test @@ -119,6 +119,7 @@ Date: REGEX(.*) POST REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 229 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-with-attribute-filter.test b/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-with-attribute-filter.test index 26f3815293..94cc5e7832 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-with-attribute-filter.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_patch_entity2-notification-with-attribute-filter.test @@ -128,6 +128,7 @@ Date: REGEX(.*) POST REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 302 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_post_entities2-and-notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_post_entities2-and-notifications.test index 5a962a47e6..5fc92b6752 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_post_entities2-and-notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_post_entities2-and-notifications.test @@ -174,6 +174,7 @@ bye POST REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:Subscription:testsubscription Content-Length: 453 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_put_attribute.test b/test/functionalTest/cases/0000_ngsild/ngsild_put_attribute.test index 62ed4d965b..93bb6f1dce 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_put_attribute.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_put_attribute.test @@ -568,6 +568,7 @@ Date: REGEX(.*) POST REGEX(.*)/notify?subscriptionId=urn:S0 Content-Length: 642 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -632,6 +633,7 @@ Date: REGEX(.*) POST REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 642 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_put_entity-notification-with-attribute-filter.test b/test/functionalTest/cases/0000_ngsild/ngsild_put_entity-notification-with-attribute-filter.test index 4b1173bc5f..baa83cc935 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_put_entity-notification-with-attribute-filter.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_put_entity-notification-with-attribute-filter.test @@ -130,6 +130,7 @@ Date: REGEX(.*) POST REGEX(.*)/notify?subscriptionId=urn:S1 Content-Length: 302 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_put_entity-notifications.test b/test/functionalTest/cases/0000_ngsild/ngsild_put_entity-notifications.test index 1ac2bc1681..1c4ea76001 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_put_entity-notifications.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_put_entity-notifications.test @@ -144,6 +144,7 @@ Date: REGEX(.*) POST REGEX(.*) Content-Length: 284 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" @@ -180,6 +181,7 @@ Date: REGEX(.*) POST REGEX(.*) Content-Length: 284 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_subCache-counters.test b/test/functionalTest/cases/0000_ngsild/ngsild_subCache-counters.test index 4bfee726ed..0b795e2830 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_subCache-counters.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_subCache-counters.test @@ -356,6 +356,7 @@ Location: /ngsi-ld/v1/entities/urn:ngsi-ld:T:E1 POST REGEX(.*) Content-Length: 224 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_subscription_issue_1179-with-experimental.test b/test/functionalTest/cases/0000_ngsild/ngsild_subscription_issue_1179-with-experimental.test index 9b8d82cafe..7763c4be5e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_subscription_issue_1179-with-experimental.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_subscription_issue_1179-with-experimental.test @@ -297,6 +297,7 @@ NGSILD-Tenant: captn POST http://REGEX(.*) Content-Length: 346 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Ngsild-Tenant: captn Content-Type: application/json diff --git a/test/functionalTest/cases/0000_troe/troe_new_batch_upsert-create-one-entity.test b/test/functionalTest/cases/0000_troe/troe_new_batch_upsert-create-one-entity.test index 3d6f9316eb..dabf23af3c 100644 --- a/test/functionalTest/cases/0000_troe/troe_new_batch_upsert-create-one-entity.test +++ b/test/functionalTest/cases/0000_troe/troe_new_batch_upsert-create-one-entity.test @@ -157,6 +157,7 @@ Date: REGEX(.*) POST http://REGEX(.*)/notify?subscriptionId=urn:ngsi-ld:subscriptions:S1 Content-Length: 624 User-Agent: orionld/REGEX(.*) +Host: REGEX(.*) Accept: application/json Content-Type: application/json Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"