Merge pull request #4563 from telefonicaid/remove/last-ngsiv1-api-ops

FIX remove NGSIv1 lasting API ops
telefonicaid · Jun 5, 2024 · 769a72a · 769a72a
2 parents 03d3f53 + 5e09b00
commit 769a72a
Show file tree

Hide file tree

Showing 151 changed files with 119 additions and 1,053 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -7,3 +7,11 @@
 - Hardening: compile code using C++14 standard
 - Remove: `-dbhost`, `-rplSet`, `-dbTimeout`, `-dbuser`, `-dbAuthMech`, `-dbAuthDb`, `-dbSSL` and `-dbDisableRetryWrites` CLI parameters along with associated env vars, already deprecated in Orion 3.12.0 (use `-dbURI` instead`)
 - Remove: legacy subscription format
+- Remove: all the remaining NGSIv1 operations
+  - PUT /v1/contextEntities/{id}
+  - DELETE /v1/contextEntities/{id}
+  - GET /v1/contextEntities/{id}/attributes/{name}
+  - POST /v1/updateContext
+  - POST /NGSI10/updateContext
+  - POST /v1/queryContext
+  - POST /NGSI10/queryContext
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -187,8 +187,8 @@ ENDIF()
 
 SET (ORION_LIBS
     common
-    serviceRoutines
     serviceRoutinesV2
+    serviceRoutines
     ngsiNotify
     rest          # verbName(Verb) from [email protected]; jsonRequestTreat from [email protected];
     jsonParse

diff --git a/doc/manuals/admin/logs.md b/doc/manuals/admin/logs.md
@@ -406,13 +406,6 @@ time=2020-10-26T15:06:14.642Z | lvl=INFO | corr=c4a3192e-179c-11eb-ac8f-000c29df
 If `-logDeprecate` CLI setting is used (or `deprecate` parameter in the [log admin REST API](management_api.md#log-configs-and-trace-levels)) the
 following WARN traces are generated:
 
-* NGSIv1 requests (both with and without payload). For instance:
-
-```
-time=2023-05-25T14:27:45.958Z | lvl=WARN | corr=513bd10e-fb08-11ed-8ad7-000c29583ca5 | trans=1685024865-125-00000000001 | from=127.0.0.1 | srv=s1 | subsrv=/A | comp=Orion | op=logTracing.cpp[171]:logInfoRequestWithPayload | msg=Deprecated NGSIv1 request received: POST /v1/queryContext, request payload (48 bytes): { "entities": [ { "type": "T1", "id": "E1" } ] }, response code: 200
-time=2023-05-25T14:27:46.041Z | lvl=WARN | corr=51490536-fb08-11ed-9782-000c29583ca5 | trans=1685024865-125-00000000002 | from=127.0.0.1 | srv=s1 | subsrv=/A | comp=Orion | op=logTracing.cpp[114]:logInfoRequestWithoutPayload | msg=Deprecated NGSIv1 request received: GET /v1/contextEntities/E, response code: 200
-```
-
 * Usages of [`"legacyForwarding": true`](../orion-api.md#registrationprovider)). For instance:
 
 ```

diff --git a/doc/manuals/deprecated.md b/doc/manuals/deprecated.md
@@ -40,6 +40,7 @@ A list of deprecated features and the version in which they were deprecated foll
         * `POST /v1/queryContext`
         * `POST /NGSI10/queryContext`
     * NGSIv1 format in subscription notifications (`notification.atttrsFormat` set to `legacy`) removed in Orion 4.0.0
+    * Finally, the last remaining NGSIv1 operations where removed in Orion 4.0.0
 * `attributes` field in `POST /v2/op/query` is in Orion 1.15.0. It is a combination of `attrs` (to select
   which attributes to include in the response to the query) and unary attribute filter in `q` within
   `expression` (to return only entities which have these attributes). Use them instead.

diff --git a/src/app/contextBroker/orionRestServices.cpp b/src/app/contextBroker/orionRestServices.cpp
diff --git a/...uests/pagination_error_in_uri_params.test → ...ination_error_in_uri_params.test.DISABLED b/...uests/pagination_error_in_uri_params.test → ...ination_error_in_uri_params.test.DISABLED
diff --git a/..._content_related_headers/accept_fail.test → ...related_headers/accept_fail.test.DISABLED b/..._content_related_headers/accept_fail.test → ...related_headers/accept_fail.test.DISABLED
diff --git a/...ntent_related_headers/accept_fail_01.test → ...ated_headers/accept_fail_01.test.DISABLED b/...ntent_related_headers/accept_fail_01.test → ...ated_headers/accept_fail_01.test.DISABLED
diff --git a/..._headers/missing_content_type_header.test → ...missing_content_type_header.test.DISABLED b/..._headers/missing_content_type_header.test → ...missing_content_type_header.test.DISABLED
diff --git a/...eprecated_checkings/disable_ngsi_cli.test → ..._checkings/disable_ngsi_cli.test.DISABLED b/...eprecated_checkings/disable_ngsi_cli.test → ..._checkings/disable_ngsi_cli.test.DISABLED
diff --git a/test/functionalTest/cases/0000_deprecated_checkings/log_deprecate_warning.test b/test/functionalTest/cases/0000_deprecated_checkings/log_deprecate_warning.test
@@ -33,65 +33,17 @@ brokerStart CB 0 IPV4 -logDeprecate -statCounters
 # Note there is not a "Update registration using legacyForwarding mode"
 # as the registrations update operation is not implemented (issue #3007)
 #
-# 01. Query E1-T1
-# 02. GET /v1/contextEntities/E/attributes/A
-# 03. Create entity using NGSIv1 and geo:point
-# 04. Create entity using NGSIv2 and geo:point
-# 05. Create registration using legacyForwarding mode
-# 06. Retrieve registrations (which uses legacyForwarding mode)
-# 07. Forwarded query using legacyForwarding mode
-# 08. Update query using legacyForwarding mode
-# 09. Get WARNING trace in logs
-# 10. Get statistics and see deprecatedFeatures counters
+# 01. Create entity using NGSIv2 and geo:point
+# 02. Create registration using legacyForwarding mode
+# 03. Retrieve registrations (which uses legacyForwarding mode)
+# 04. Forwarded query using legacyForwarding mode
+# 05. Update query using legacyForwarding mode
+# 06. Get WARNING trace in logs
+# 07. Get statistics and see deprecatedFeatures counters
 #
 
-echo "01. Query E1-T1"
-echo "==============="
-payload='{
-  "entities": [
-    {
-      "type": "T1",
-      "id": "E1"
-    }
-  ]
-}'
-orionCurl --url /v1/queryContext --payload "${payload}"
-echo
-echo
-
-
-echo "02. GET /v1/contextEntities/E/attributes/A"
-echo "=========================================="
-orionCurl --url /v1/contextEntities/E/attributes/A
-echo
-echo
-
-
-echo "03. Create entity using NGSIv1 and geo:point"
-echo "============================================"
-payload='{
-  "contextElements": [
-  {
-    "type": "City",
-    "isPattern": "false",
-    "id": "Barcelona",
-    "attributes": [
-    {
-      "name": "location",
-      "type": "geo:point",
-      "value": "40.418889, -3.691944"
-    }
-    ]
-  }
-  ],
-  "updateAction": "APPEND"
-}'
-orionCurl --url /v1/updateContext --payload "$payload"
-echo
-echo
 
-
-echo "04. Create entity using NGSIv2 and geo:point"
+echo "01. Create entity using NGSIv2 and geo:point"
 echo "============================================"
 payload='{
   "id": "Sevilla",
@@ -106,7 +58,7 @@ echo
 echo
 
 
-echo "05. Create registration using legacyForwarding mode"
+echo "02. Create registration using legacyForwarding mode"
 echo "==================================================="
 payload='{
    "dataProvided": {
@@ -134,21 +86,21 @@ echo
 REG_ID=$(echo "$_responseHeaders" | grep Location | awk -F/ '{ print $4 }' | tr -d "\r\n")
 
 
-echo "06. Retrieve registrations (which uses legacyForwarding mode)"
+echo "03. Retrieve registrations (which uses legacyForwarding mode)"
 echo "============================================================="
 orionCurl --url /v2/registrations
 echo
 echo
 
 
-echo "07. Forwarded query using legacyForwarding mode"
+echo "04. Forwarded query using legacyForwarding mode"
 echo "==============================================="
 orionCurl --url /v2/entities/E1/attrs/A1?type=T1
 echo
 echo
 
 
-echo "08. Update query using legacyForwarding mode"
+echo "05. Update query using legacyForwarding mode"
 echo "============================================"
 payload='{
   "value": 1,
@@ -159,87 +111,22 @@ echo
 echo
 
 
-echo "09. Get WARNING trace in logs"
+echo "06. Get WARNING trace in logs"
 echo "============================="
 cat /tmp/contextBroker.log | grep 'WARN' | awk -F 'msg=' '{print $2}' | sed -e "s/$REG_ID/REG_ID/g"
 echo
 echo
 
 
-echo "10. Get statistics and see deprecatedFeatures counters"
+echo "07. Get statistics and see deprecatedFeatures counters"
 echo "======================================================"
 orionCurl --url /statistics
 echo
 echo
 
 
 --REGEXPECT--
-01. Query E1-T1
-===============
-HTTP/1.1 200 OK
-Date: REGEX(.*)
-Fiware-Correlator: REGEX([0-9a-f\-]{36})
-Content-Type: application/json
-Content-Length: 70
-
-{
-    "errorCode": {
-        "code": "404",
-        "reasonPhrase": "No context element found"
-    }
-}
-
-
-02. GET /v1/contextEntities/E/attributes/A
-==========================================
-HTTP/1.1 200 OK
-Date: REGEX(.*)
-Fiware-Correlator: REGEX([0-9a-f\-]{36})
-Content-Type: application/json
-Content-Length: 98
-
-{
-    "statusCode": {
-        "code": "404",
-        "details": "Entity id: /E/",
-        "reasonPhrase": "No context element found"
-    }
-}
-
-
-03. Create entity using NGSIv1 and geo:point
-============================================
-HTTP/1.1 200 OK
-Date: REGEX(.*)
-Fiware-Correlator: REGEX([0-9a-f\-]{36})
-Content-Type: application/json
-Content-Length: 207
-
-{
-    "contextResponses": [
-        {
-            "contextElement": {
-                "attributes": [
-                    {
-                        "name": "location",
-                        "type": "geo:point",
-                        "value": ""
-                    }
-                ],
-                "id": "Barcelona",
-                "isPattern": "false",
-                "type": "City"
-            },
-            "statusCode": {
-                "code": "200",
-                "reasonPhrase": "OK"
-            }
-        }
-    ]
-}
-
-
-04. Create entity using NGSIv2 and geo:point
+01. Create entity using NGSIv2 and geo:point
 ============================================
 HTTP/1.1 201 Created
 Date: REGEX(.*)
@@ -249,7 +136,7 @@ Content-Length: 0
 
 
 
-05. Create registration using legacyForwarding mode
+02. Create registration using legacyForwarding mode
 ===================================================
 HTTP/1.1 201 Created
 Date: REGEX(.*)
@@ -259,7 +146,7 @@ Content-Length: 0
 
 
 
-06. Retrieve registrations (which uses legacyForwarding mode)
+03. Retrieve registrations (which uses legacyForwarding mode)
 =============================================================
 HTTP/1.1 200 OK
 Date: REGEX(.*)
@@ -293,7 +180,7 @@ Content-Length: 233
 ]
 
 
-07. Forwarded query using legacyForwarding mode
+04. Forwarded query using legacyForwarding mode
 ===============================================
 HTTP/1.1 404 Not Found
 Date: REGEX(.*)
@@ -307,7 +194,7 @@ Content-Length: 95
 }
 
 
-08. Update query using legacyForwarding mode
+05. Update query using legacyForwarding mode
 ============================================
 HTTP/1.1 404 Not Found
 Date: REGEX(.*)
@@ -321,12 +208,8 @@ Content-Length: 95
 }
 
 
-09. Get WARNING trace in logs
+06. Get WARNING trace in logs
 =============================
-Deprecated NGSIv1 request received: POST /v1/queryContext, request payload (48 bytes): { "entities": [ { "type": "T1", "id": "E1" } ] }, response code: 200
-Deprecated NGSIv1 request received: GET /v1/contextEntities/E/attributes/A, response code: 200
-Deprecated usage of geo:point detected in attribute location at entity update, please use geo:json instead
-Deprecated NGSIv1 request received: POST /v1/updateContext, request payload (208 bytes): { "contextElements": [ { "type": "City", "isPattern": "false", "id": "Barcelona", "attributes": [ { "name": "location", "type": "geo:point", "value": "40.418889, -3.691944" } ] } ], "updateAction": "APPEND" }, response code: 200
 Deprecated usage of geo:point detected in attribute location at entity update, please use geo:json instead
 Deprecated usage of legacyForwarding mode in registration creation (regId: REG_ID)
 Deprecated usage of legacyForwarding mode detected in existing registration (regId: REG_ID)
@@ -337,23 +220,22 @@ Raising alarm ForwardingError localhost:9801/v2/updateContext: forwarding failur
 Raising alarm BadInput 127.0.0.1: The requested entity has not been found. Check type and id
 
 
-10. Get statistics and see deprecatedFeatures counters
+07. Get statistics and see deprecatedFeatures counters
 ======================================================
 HTTP/1.1 200 OK
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 468
+Content-Length: 314
 
 {
     "counters": {
         "deprecatedFeatures": {
-            "geoFormat": 2,
-            "ngsiv1Forwarding": 4,
-            "ngsiv1Requests": 3
+            "geoFormat": 1,
+            "ngsiv1Forwarding": 4
         },
-        "jsonRequests": 5,
-        "noPayloadRequests": 4,
+        "jsonRequests": 3,
+        "noPayloadRequests": 3,
         "requests": {
             "/statistics": {
                 "GET": 1
@@ -369,17 +251,6 @@ Content-Length: 468
                 "GET": 1,
                 "POST": 1
             }
-        },
-        "requestsLegacy": {
-            "/v1/contextEntities/{id}/attributes/{name}": {
-                "GET": 1
-            },
-            "/v1/queryContext": {
-                "POST": 1
-            },
-            "/v1/updateContext": {
-                "POST": 1
-            }
         }
     },
     "measuring_interval_in_secs": REGEX(\d+),

diff --git a/...ckings/log_deprecate_warning_dynamic.test → ...g_deprecate_warning_dynamic.test.DISABLED b/...ckings/log_deprecate_warning_dynamic.test → ...g_deprecate_warning_dynamic.test.DISABLED
diff --git a/...ings/metadata_id_as_regular_metadata.test → ...data_id_as_regular_metadata.test.DISABLED b/...ings/metadata_id_as_regular_metadata.test → ...data_id_as_regular_metadata.test.DISABLED
diff --git a/...heckings/metadata_id_duplicate_error.test → ...metadata_id_duplicate_error.test.DISABLED b/...heckings/metadata_id_duplicate_error.test → ...metadata_id_duplicate_error.test.DISABLED
diff --git a/...json_parse/jsonParseGetNotifyContext.test → ...e/jsonParseGetNotifyContext.test.DISABLED b/...json_parse/jsonParseGetNotifyContext.test → ...e/jsonParseGetNotifyContext.test.DISABLED
diff --git a/...json_parse/jsonParsePostQueryContext.test → ...e/jsonParsePostQueryContext.test.DISABLED b/...json_parse/jsonParsePostQueryContext.test → ...e/jsonParsePostQueryContext.test.DISABLED
diff --git a/...0_large_requests/large_query_context.test → ...equests/large_query_context.test.DISABLED b/...0_large_requests/large_query_context.test → ...equests/large_query_context.test.DISABLED
diff --git a/..._large_requests/large_update_context.test → ...quests/large_update_context.test.DISABLED b/..._large_requests/large_update_context.test → ...quests/large_update_context.test.DISABLED
diff --git a/..._sequence_attributes_as_json_objects.test → ..._attributes_as_json_objects.test.DISABLED b/..._sequence_attributes_as_json_objects.test → ..._attributes_as_json_objects.test.DISABLED
diff --git a/...butes_as_json_objects_with_compounds.test → ...json_objects_with_compounds.test.DISABLED b/...butes_as_json_objects_with_compounds.test → ...json_objects_with_compounds.test.DISABLED
diff --git a/...dividual_context_entity_delete_fails.test → ...context_entity_delete_fails.test.DISABLED b/...dividual_context_entity_delete_fails.test → ...context_entity_delete_fails.test.DISABLED
diff --git a/...eolocation_query/geoquery_bad_coords.test → ...n_query/geoquery_bad_coords.test.DISABLED b/...eolocation_query/geoquery_bad_coords.test → ...n_query/geoquery_bad_coords.test.DISABLED
diff --git a/...olocation_query/geoquery_circle_json.test → ..._query/geoquery_circle_json.test.DISABLED b/...olocation_query/geoquery_circle_json.test → ..._query/geoquery_circle_json.test.DISABLED
diff --git a/...location_query/geoquery_polygon_json.test → ...query/geoquery_polygon_json.test.DISABLED b/...location_query/geoquery_polygon_json.test → ...query/geoquery_polygon_json.test.DISABLED
diff --git a/...y/location_no_actual_location_change.test → ...n_no_actual_location_change.test.DISABLED b/...y/location_no_actual_location_change.test → ...n_no_actual_location_change.test.DISABLED
diff --git a/...ses/0000_ngsi10_query/query_sequence.test → ...ngsi10_query/query_sequence.test.DISABLED b/...ses/0000_ngsi10_query/query_sequence.test → ...ngsi10_query/query_sequence.test.DISABLED
diff --git a/...ses/0000_ngsi10_update/delete_entity.test → ...ngsi10_update/delete_entity.test.DISABLED b/...ses/0000_ngsi10_update/delete_entity.test → ...ngsi10_update/delete_entity.test.DISABLED
diff --git a/..._update/update_empty_attribute_value.test → ...pdate_empty_attribute_value.test.DISABLED b/..._update/update_empty_attribute_value.test → ...pdate_empty_attribute_value.test.DISABLED
diff --git a/...s/0000_ngsi10_update/update_sequence.test → ...si10_update/update_sequence.test.DISABLED b/...s/0000_ngsi10_update/update_sequence.test → ...si10_update/update_sequence.test.DISABLED
diff --git a/...equence_empty_value_in_context_value.test → ...mpty_value_in_context_value.test.DISABLED b/...equence_empty_value_in_context_value.test → ...mpty_value_in_context_value.test.DISABLED
diff --git a/...ce_empty_value_in_context_value_json.test → ...value_in_context_value_json.test.DISABLED b/...ce_empty_value_in_context_value_json.test → ...value_in_context_value_json.test.DISABLED
diff --git a/...s_operation/statistics_with_counters.test → ...on/statistics_with_counters.test.DISABLED b/...s_operation/statistics_with_counters.test → ...on/statistics_with_counters.test.DISABLED
diff --git a/...ultitenancy/http_tenant_update_query.test → ...cy/http_tenant_update_query.test.DISABLED b/...ultitenancy/http_tenant_update_query.test → ...cy/http_tenant_update_query.test.DISABLED
diff --git a/...e_and_query/service_path_http_header.test → ...ry/service_path_http_header.test.DISABLED b/...e_and_query/service_path_http_header.test → ...ry/service_path_http_header.test.DISABLED
diff --git a/...e_and_query/update_with_service_path.test → ...ry/update_with_service_path.test.DISABLED b/...e_and_query/update_with_service_path.test → ...ry/update_with_service_path.test.DISABLED