From fee9d200784a05b6f25147e7c2473e2e549a4ab2 Mon Sep 17 00:00:00 2001
From: Federico Sismondi <federicosismondi@gmail.com>
Date: Thu, 14 May 2020 14:22:28 +0000
Subject: [PATCH] Update() watering scripts using orion LD API

---
 scripts/watering_05_retrieve_attribute.sh    | 14 ++++----------
 scripts/watering_06_update_specific_attrs.sh |  2 +-
 scripts/watering_07_subscribe_to_entity.sh   |  2 +-
 scripts/xx_todo.sh                           |  0
 4 files changed, 6 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 scripts/xx_todo.sh

diff --git a/scripts/watering_05_retrieve_attribute.sh b/scripts/watering_05_retrieve_attribute.sh
index c543985..e058b43 100755
--- a/scripts/watering_05_retrieve_attribute.sh
+++ b/scripts/watering_05_retrieve_attribute.sh
@@ -3,14 +3,8 @@
 [[ -z "$ORION_HOST" ]] && echo "Please set ORION_HOST env var. E.g. export ORION_HOST=127.0.0.1" && exit
 echo "Querying context broker at: ${ORION_HOST}"
 
-curl --location --request GET \
-    "http://$ORION_HOST:1026/v2/entities/urn:ngsi-ld:FlowerBed:FlowerBed-345/attrs/soilMoistureVwc" \
-    --header "Fiware-Service: carouge" \
-    --header "Fiware-ServicePath: /watering" \
-    | python -mjson.tool
+curl -X GET \
+  "http://$ORION_HOST:1026/v2/entities/urn:ngsi-ld:FlowerBed:FlowerBed-345" \
+  -H 'Accept: application/json' \
+  -H 'Link: <https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context.jsonld>; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json"' 
 
-#curl --location --request GET \
-#    "http://$ORION_HOST:1026/v2/entities/urn:ngsi-ld:FlowerBed:FlowerBed-345/attrs/location" \
-#    --header "Fiware-Service: carouge" \
-#    --header "Fiware-ServicePath: /watering" \
-#    | python -mjson.tool
\ No newline at end of file
diff --git a/scripts/watering_06_update_specific_attrs.sh b/scripts/watering_06_update_specific_attrs.sh
index e5870f0..cffac02 100755
--- a/scripts/watering_06_update_specific_attrs.sh
+++ b/scripts/watering_06_update_specific_attrs.sh
@@ -9,5 +9,5 @@ curl --location --request PATCH \
     --header 'Content-Type: application/json' \
     --data-raw '{
 	"type": "Property",
-	"value": 8
+	"value": 23
     }'
diff --git a/scripts/watering_07_subscribe_to_entity.sh b/scripts/watering_07_subscribe_to_entity.sh
index 6e694e4..eb2b08d 100755
--- a/scripts/watering_07_subscribe_to_entity.sh
+++ b/scripts/watering_07_subscribe_to_entity.sh
@@ -18,7 +18,7 @@ curl --location --request POST \
       "entities": [{"type": "FlowerBed"}],
       "notification": {
         "attributes": ["soilMoistureVwc"],
-        "format": "keyValues",
+        "format": "normalized",
         "endpoint": {
           "uri": "'${SUBSCRIPTION_URL}'",
           "accept": "application/json"
diff --git a/scripts/xx_todo.sh b/scripts/xx_todo.sh
old mode 100644
new mode 100755
-- 
2.24.1