Task/3068 ngsiv2 update forwarding

CHANGES_NEXT_RELEASE

@@ -1,4 +1,5 @@
 - Fix: idPattern '.*' is now allowed in NGSIv2 registrations (#3458)
 - Add: Forwarded queries work for registrations using idPattern == '.*', but only for simple cases (#3458)
+- Add: Forwarded updates work for registrations using idPattern == '.*', but only for simple cases (#3458)
+- Add: NGSIv2 forwards now work for queries and updates - for simple cases (#3068)
 - Fix: The 'Allow:' header for the service /v2/registrations had the incorrect value of "Allow: POST". The correct value is: "Allow: GET, POST"
-- Add: NGSIv2 forwards now works for queries - for simple cases (#3068)

doc/manuals/devel/cprs.md

@@ -16,7 +16,7 @@ In NGSIv1 (deprecated), the request `POST /v1/updateContext` has a field called
 * APPEND_STRICT
 * REPLACE
 
-> Side-node: The first three are "standard NGSIv1" while the second two were added for NGSIv2.
+> Side-note: The first three are "standard NGSIv1" while the second two were added for NGSIv2.
 
 * Requests with `UPDATE` or `REPLACE` may provoke forwarding of the request.
   Only if **not found locally but found in a registration**.
@@ -89,9 +89,9 @@ The `QueryContextRequest` items are filled in based on the output of the [**mong
 _FW-04: `queryForward()` function detail_
 
 * Parse the context provider string to extract IP, port, URI path, etc. (step 1).
-* The request to forward has to be built (step 2). In the case of NGSIv1, we need to extract information of the binary object into text to be able to send the REST request (plain text) to the Context Provider using POST /v1/queryContext. In the case of NGSIv2, the use GET /v2/entities and no payload is required.
+* The request to forward has to be built (step 2). In the case of NGSIv1, we need to extract information of the binary object into text to be able to send the REST request (plain text) to the Context Provider using POST /v1/queryContext. In the case of NGSIv2, the use of GET /v2/entities (without payload) is required.
 * The request to forward is sent with the help of `httpRequestSend()` (step 3) which uses [libcurl](https://curl.haxx.se/libcurl/) to forward the request (step 4). libcurl sends in sequence the request to the Context Provider (step 5).
-* The textual response from the Context Provider is parsed and an `QueryContextResponse` object is created (step 6). Parsing details are provided in diagram [PP-01](jsonParse.md#flow-pp-01).
+* The textual response from the Context Provider is parsed and a `QueryContextResponse` object is created (step 6). Parsing details are provided in diagram [PP-01](jsonParse.md#flow-pp-01).
 
 ## A Caveat about shadowing of entities
 The Context Provider mechanism is implemented using standard registration requests and this might lead to unwanted situations.

doc/manuals/user/ngsiv2_implementation_notes.md

@@ -335,8 +335,9 @@ for the following aspects:
   directly. I.e., updates must be done deleting and re-creating the registration. Please
   see [this issue](https://github.com/telefonicaid/fiware-orion/issues/3007) about this.
 * `idPattern` is supported but only for the exact regular expression `.*`
-  And, right now (2019-03-21), only forwarding of queries is working for registrations with idPatterns.
-  forwarded updates do not work for registrations with idPattern (the plan is to fix this asap). 
+  And, right now (2019-04-24), forwarding for registrations with idPatterns works for queries using `GET /v2/entities`
+  as well as updates using `PATCH /v2/entities/{Entity-ID}/attrs`.
+  More requests will be added to this list.
 * `typePattern` is not implemented.
 * The only valid `supportedForwardingMode` is `all`. Trying to use any other value will end
   in a 501 Not Implemented error response. Please

src/lib/mongoBackend/MongoCommonUpdate.cpp

@@ -2703,17 +2703,24 @@ static void searchContextProviders
   std::string                        err;
 
   /* Fill input data for registrationsQuery() */
+  LM_T(LmtForward, ("Entity Id:         %s", en.id.c_str()));
+  LM_T(LmtForward, ("Entity isPattern:  %s", en.isPattern.c_str()));
+  LM_T(LmtForward, ("Entity Type:       %s", en.type.c_str()));
+
   enV.push_back(&en);
   for (unsigned int ix = 0; ix < caV.size(); ++ix)
   {
     attrL.push_back(caV[ix]->name);
+    LM_T(LmtForward, ("Attr %d: %s", ix, caV[ix]->name.c_str()));
   }
 
   /* First CPr lookup (in the case some CER is not found): looking in E-A registrations */
   if (someContextElementNotFound(*cerP))
   {
+    LM_T(LmtForward, ("Calling registrationsQuery I"));
     if (registrationsQuery(enV, attrL, &crrV, &err, tenant, servicePathV, 0, 0, false))
     {
+      LM_T(LmtForward, ("registrationsQuery I returned %d items in crrV", crrV.size()));
       if (crrV.size() > 0)
       {
         fillContextProviders(cerP, crrV);
@@ -2734,8 +2741,10 @@ static void searchContextProviders
   StringList attrNullList;
   if (someContextElementNotFound(*cerP))
   {
+    LM_T(LmtForward, ("Calling registrationsQuery II"));
     if (registrationsQuery(enV, attrNullList, &crrV, &err, tenant, servicePathV, 0, 0, false))
     {
+      LM_T(LmtForward, ("registrationsQuery II returned %d items in crrV", crrV.size()));
       if (crrV.size() > 0)
       {
         fillContextProviders(cerP, crrV);
@@ -2761,21 +2770,26 @@ static void searchContextProviders
 */
 static bool forwardsPending(UpdateContextResponse* upcrsP)
 {
+  LM_T(LmtForward, ("Looping over %d context element responses", upcrsP->contextElementResponseVector.size()));
   for (unsigned int cerIx = 0; cerIx < upcrsP->contextElementResponseVector.size(); ++cerIx)
   {
     ContextElementResponse* cerP  = upcrsP->contextElementResponseVector[cerIx];
 
+    LM_T(LmtForward, ("Looping over %d attributes", cerP->entity.attributeVector.size()));
     for (unsigned int aIx = 0 ; aIx < cerP->entity.attributeVector.size(); ++aIx)
     {
       ContextAttribute* aP  = cerP->entity.attributeVector[aIx];
 
+      LM_T(LmtForward, ("Attribute: '%s'", aP->name.c_str()));
       if (aP->providingApplication.get() != "")
       {
+        LM_T(LmtForward, ("Found a providingApplication: %s", aP->providingApplication.get().c_str()));
         return true;
       }
     }
   }
 
+  LM_T(LmtForward, ("No providingApplication found"));
   return false;
 }
 
@@ -2952,6 +2966,7 @@ static void updateEntity
     // FIXME P8: the same three statements are at the end of the while loop. Refactor the code to have this
     // in only one place
     //
+    LM_T(LmtForward, ("Calling searchContextProviders"));
     searchContextProviders(tenant, servicePathV, en, eP->attributeVector, cerP);
 
     if (!(attributeAlreadyExistsError && (action == ActionTypeAppendStrict)))
@@ -3488,8 +3503,11 @@ void processContextElement
       //
       // If no context providers found, then the UPDATE was simply for a non-found entity and an error should be returned
       //
+      LM_T(LmtForward, ("Calling forwardsPending"));
       if (forwardsPending(responseP) == false)
       {
+        LM_T(LmtForward, ("No forwards pending"));
+
         cerP->statusCode.fill(SccContextElementNotFound);
 
         if (apiVersion == V1)