Updated demo scripts, readme and added .env for docker compose

.env

+# Orion variables
+ORION_PORT=1026
+ORION_VERSION=2.3.0
+
+# MongoDB variables
+MONGO_DB_PORT=27017
+MONGO_DB_VERSION=3.6
+
+# MongoDB dashboard
+MONGO_DB_EXPRESS_PORT=8081
+
+# Keyrock variables
+KEYROCK_VERSION=7.8.1
+KEYROCK_PORT=3005
+KEYROCK_HTTPS_PORT=3443
+
+# MySQL variables
+MYSQL_DB_VERSION=5.7
+MYSQL_DB_PORT=3307
+
+# PEP Proxy variables
+WILMA_VERSION=7.8.1
+ORION_PROXY_PORT=1027
+
+# WMS mock module
+WMS_MODULE_PORT=8080

README.md

@@ -63,6 +63,37 @@ UPDATE|
 
 +------------------------------------------------------------------------------+
 
+# TODO how do we handle non-standard FIWARE formats?
+# A proposal from UDGA/MI:
+
++----------------------+                +-------------------+
+|                      |                |                   |
+|  Cloud Core Platform +--------------->+ WMS + Watering    |
+|                      |   POST         + weekly scheduler  |
++----------------------+  /FlowerBed/soilMoistureVwc        |
+      ^                                 +-------------------+
+      | UPDATE
+      |  /FlowerBed/soilMoistureVwc
+      |
++----------------------+
+|                      |          +------------------+
+| interoperability     +<---------+                  |
+| layer                |          |  Carouge format  |
+|  e.g. nginx          +---------->  exchange        |
++-----^----------------+          +------------------+
+      |
+      | UPDATE+
+      | carougeFormat/FlowerBed/soilMoistureVwc
+      |
+      |
++----------------------+
+|                      |
+|  Soil Moisture IoT   |
+|       sensor         |
+|                      |
++----------------------+
+
++------------------------------------------------------------------------------+
 
 
 # Requirements

scripts/01_create_entity.sh

@@ -12,11 +12,8 @@ curl --location --request POST 'http://localhost:1026/v2/entities/' \
         "value": 0.85
     },
     "dateLastWatering": {
-        "type": "Property",
-        "value": {
-            "@type": "DateTime",
-            "@value": "2020-02-11T08:00:00Z"
-        }
+        "type": "DateTime",
+        "value": "2020-02-11T08:00:00Z"
     },
     "soilTemperature": {
         "type": "Property",

scripts/05_retrieve_attribute_value.sh → scripts/04_retrieve_attribute_value.sh

-curl --request GET 'localhost:1026/v2/entities/urn:ngsi-ld:FlowerBed:FlowerBed-345/attrs/soilMoistureVwc/value' | python -mjson.tool
+curl --request GET 'localhost:1026/v2/entities/urn:ngsi-ld:FlowerBed:FlowerBed-345/attrs/soilMoistureVwc/value'
 
 # this gives same results:
 #curl --request GET 'localhost:1026/v2/entities/urn:ngsi-ld:FlowerBed:FlowerBed-345/attrs/soilMoistureVwc/value'

scripts/11_subscribe_to_entity.sh

-curl -v localhost:1026/v2/subscriptions -s -S --header 'Content-Type: application/json' \
+curl -v localhost:1026/v2/subscriptions/ -s -S --header 'Content-Type: application/json' \
     -d @- <<EOF
 {
   "description": "A subscription to get info about FlowerBed",
@@ -21,7 +21,8 @@ curl -v localhost:1026/v2/subscriptions -s -S --header 'Content-Type: applicatio
     },
     "attrs": [
       "soilMoistureVwc"
-    ]
+    ],
+    "attrsFormat": "keyValues"
   },
   "expires": "2040-01-01T14:00:00.00Z",
   "throttling": 5