diff --git a/test/functionalTest/cases/0501_cors/registration_cors.test b/test/functionalTest/cases/0501_cors/registration_cors.test index f36c008487..9bb76a901b 100644 --- a/test/functionalTest/cases/0501_cors/registration_cors.test +++ b/test/functionalTest/cases/0501_cors/registration_cors.test @@ -44,8 +44,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' diff --git a/test/functionalTest/cases/1492_limit_zero/limit_zero_regs.test b/test/functionalTest/cases/1492_limit_zero/limit_zero_regs.test index 1a0da2705c..6189945cbe 100644 --- a/test/functionalTest/cases/1492_limit_zero/limit_zero_regs.test +++ b/test/functionalTest/cases/1492_limit_zero/limit_zero_regs.test @@ -62,8 +62,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -88,8 +87,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' diff --git a/test/functionalTest/cases/3004_v2_reg_create/v2_reg_create.test b/test/functionalTest/cases/3004_v2_reg_create/v2_reg_create.test index 0770b2d40d..dc7c95eebb 100644 --- a/test/functionalTest/cases/3004_v2_reg_create/v2_reg_create.test +++ b/test/functionalTest/cases/3004_v2_reg_create/v2_reg_create.test @@ -58,8 +58,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "inactive" }' @@ -100,7 +99,7 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 311 +Content-Length: 312 { "dataProvided": { @@ -125,7 +124,7 @@ Content-Length: 311 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "inactive" @@ -138,13 +137,10 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 250 +Content-Length: 206 { "counters": { - "deprecatedFeatures": { - "ngsiv1Forwarding": 2 - }, "jsonRequests": 1, "noPayloadRequests": 2, "requests": { diff --git a/test/functionalTest/cases/3004_v2_reg_create/v2_reg_create_errors.test b/test/functionalTest/cases/3004_v2_reg_create/v2_reg_create_errors.test index 3522afcd28..37b9e29aba 100644 --- a/test/functionalTest/cases/3004_v2_reg_create/v2_reg_create_errors.test +++ b/test/functionalTest/cases/3004_v2_reg_create/v2_reg_create_errors.test @@ -776,8 +776,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": 4 }' @@ -802,8 +801,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "green" }' @@ -854,8 +852,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } } }' orionCurl --url /v2/registrations --payload "$payload" @@ -879,8 +876,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } } }' orionCurl --url /v2/registrations --payload "$payload" diff --git a/test/functionalTest/cases/3005_GET_registrations/get_registrations.test b/test/functionalTest/cases/3005_GET_registrations/get_registrations.test index 1d6df2e9cb..42248ac3b6 100644 --- a/test/functionalTest/cases/3005_GET_registrations/get_registrations.test +++ b/test/functionalTest/cases/3005_GET_registrations/get_registrations.test @@ -60,8 +60,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -86,8 +85,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -112,8 +110,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -138,8 +135,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -223,7 +219,7 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 1053 +Content-Length: 1057 [ { @@ -244,7 +240,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -267,7 +263,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -290,7 +286,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -313,7 +309,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -338,7 +334,7 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 264 +Content-Length: 265 [ { @@ -359,7 +355,7 @@ Content-Length: 264 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -373,7 +369,7 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 1053 +Content-Length: 1057 [ { @@ -394,7 +390,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -417,7 +413,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -440,7 +436,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -463,7 +459,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" diff --git a/test/functionalTest/cases/3005_GET_registrations/get_registrations_with_pagination.test b/test/functionalTest/cases/3005_GET_registrations/get_registrations_with_pagination.test index c96163d4c7..552d561044 100644 --- a/test/functionalTest/cases/3005_GET_registrations/get_registrations_with_pagination.test +++ b/test/functionalTest/cases/3005_GET_registrations/get_registrations_with_pagination.test @@ -57,8 +57,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -83,8 +82,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -109,8 +107,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -135,8 +132,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -228,7 +224,7 @@ Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Fiware-Total-Count: 4 Content-Type: application/json -Content-Length: 1053 +Content-Length: 1057 [ { @@ -249,7 +245,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -272,7 +268,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -295,7 +291,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -318,7 +314,7 @@ Content-Length: 1053 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -332,7 +328,7 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 527 +Content-Length: 529 [ { @@ -353,7 +349,7 @@ Content-Length: 527 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -376,7 +372,7 @@ Content-Length: 527 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -390,7 +386,7 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 527 +Content-Length: 529 [ { @@ -411,7 +407,7 @@ Content-Length: 527 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -434,7 +430,7 @@ Content-Length: 527 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -448,7 +444,7 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 264 +Content-Length: 265 [ { @@ -469,7 +465,7 @@ Content-Length: 264 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" diff --git a/test/functionalTest/cases/3006_delete_registrations/delete_reg_using_v2_created_using_v2.test b/test/functionalTest/cases/3006_delete_registrations/delete_reg_using_v2_created_using_v2.test index ff06bae97e..629acf2b23 100644 --- a/test/functionalTest/cases/3006_delete_registrations/delete_reg_using_v2_created_using_v2.test +++ b/test/functionalTest/cases/3006_delete_registrations/delete_reg_using_v2_created_using_v2.test @@ -52,8 +52,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -123,13 +122,10 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 253 +Content-Length: 209 { "counters": { - "deprecatedFeatures": { - "ngsiv1Forwarding": 1 - }, "jsonRequests": 1, "noPayloadRequests": 3, "requests": { diff --git a/test/functionalTest/cases/3008_get_registration/get_reg_using_v2_created_using_v2.test b/test/functionalTest/cases/3008_get_registration/get_reg_using_v2_created_using_v2.test index 6a15472f9a..f0e4d35b43 100644 --- a/test/functionalTest/cases/3008_get_registration/get_reg_using_v2_created_using_v2.test +++ b/test/functionalTest/cases/3008_get_registration/get_reg_using_v2_created_using_v2.test @@ -52,8 +52,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${CP1_PORT}'/v2" - }, - "legacyForwarding": true + } }, "status": "active" }' @@ -101,7 +100,7 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 262 +Content-Length: 263 { "dataProvided": { @@ -121,7 +120,7 @@ Content-Length: 262 "http": { "url": "http://localhost:REGEX(\d+)/v2" }, - "legacyForwarding": true, + "legacyForwarding": false, "supportedForwardingMode": "all" }, "status": "active" @@ -148,13 +147,10 @@ HTTP/1.1 200 OK Date: REGEX(.*) Fiware-Correlator: REGEX([0-9a-f\-]{36}) Content-Type: application/json -Content-Length: 250 +Content-Length: 206 { "counters": { - "deprecatedFeatures": { - "ngsiv1Forwarding": 2 - }, "jsonRequests": 1, "noPayloadRequests": 3, "requests": { diff --git a/test/functionalTest/cases/3176_entity_without_attributes_not_listed/entity_without_attributes_not_listed.test b/test/functionalTest/cases/3176_entity_without_attributes_not_listed/entity_without_attributes_not_listed.test index 456cfcff1a..c3ea085346 100644 --- a/test/functionalTest/cases/3176_entity_without_attributes_not_listed/entity_without_attributes_not_listed.test +++ b/test/functionalTest/cases/3176_entity_without_attributes_not_listed/entity_without_attributes_not_listed.test @@ -55,8 +55,7 @@ payload='{ "http": { "url": "http://contextsource.example.org" }, - "supportedForwardingMode": "all", - "legacyForwarding": true + "supportedForwardingMode": "all" }, "status": "active" }' diff --git a/test/functionalTest/cases/3282_compound_not_render_in_not_matching_registration/compound_not_render_in_not_matching_registration.test b/test/functionalTest/cases/3282_compound_not_render_in_not_matching_registration/compound_not_render_in_not_matching_registration.test index 7a1cdef953..496683ce9c 100644 --- a/test/functionalTest/cases/3282_compound_not_render_in_not_matching_registration/compound_not_render_in_not_matching_registration.test +++ b/test/functionalTest/cases/3282_compound_not_render_in_not_matching_registration/compound_not_render_in_not_matching_registration.test @@ -112,8 +112,7 @@ payload='{ "provider": { "http": { "url": "http://localhost':$CP1_PORT'/v1" - }, - "legacyForwarding": true + } } }' orionCurl --url /v2/registrations --payload "$payload" diff --git a/test/functionalTest/cases/3363_fwd_query_on_fail/fwd_query_on_fail.test b/test/functionalTest/cases/3363_fwd_query_on_fail/fwd_query_on_fail.test index 2eb2ea9e40..e5b12fe77f 100644 --- a/test/functionalTest/cases/3363_fwd_query_on_fail/fwd_query_on_fail.test +++ b/test/functionalTest/cases/3363_fwd_query_on_fail/fwd_query_on_fail.test @@ -86,8 +86,7 @@ payload='{ "provider": { "http": { "url": "http://localhost:'${LISTENER_PORT}'/badresponse" - }, - "legacyForwarding": true + } } }' orionCurl --url /v2/registrations --payload "$payload"