update to get correct endpoints and endpoint selection in the adapters

Author: atimgraves

IoTSonnenUploader/DigitalTwin/sonnen-to-generic-mapping-envelope.json

@@ -1,5 +1,5 @@
 {
-  "reference-endpoint": "house/sonnen/status",
+  "reference-endpoint": "house/sonnenstatus",
   "reference-payload": {
          "data": {
            "batteryCharging": false,

IoTSonnenUploader/DigitalTwin/sonnen-to-generic-mapping-multiple-routes.json

@@ -1,6 +1,6 @@
 [
 	{
-		"condition": "${endpoint(2) == \"sonnenstatus\"}",
+		"condition": "${endpoint(1) == \"house\" and endpoint(2) == \"sonnenstatus\"}",
 		"description": "Handle status messages",
 		"reference-payload": {
 			"dataFormat": "JSON",
@@ -37,7 +37,7 @@
 		}
 	},
 	{
-		"condition": "${endpoint(2) == \"sonnenconfiguration\"}",
+		"condition": "${endpoint(1) == \"house\" and endpoint(2) == \"sonnenconfiguration\"}",
 		"description": "Handle configuration messages",
 		"reference-payload": {
 			"dataFormat": "JSON",

IoTSonnenUploader/OCISetup/CreateAdditionalDigitalTwinInstance.sh

@@ -100,16 +100,20 @@ export DIGITAL_TWIN_INSTANCE_SECRET_BASE64=`oci secrets secret-bundle get --secr
 export DIGITAL_TWIN_INSTANCE_SECRET=`echo $DIGITAL_TWIN_INSTANCE_SECRET_BASE64 | base64 --decode`
 export DIGITAL_TWIN_INSTANCE_CREDENTIALS="$DIGITAL_TWIN_INSTANCE_EXTERNAL_KEY":"$DIGITAL_TWIN_INSTANCE_SECRET"
 echo "Digital twin instance credentials $DIGITAL_TWIN_INSTANCE_CREDENTIALS"
-echo "To send test data for the configuration"
+echo "To send test data for the configuration for device $ADDITIONAL_DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
 echo 'export CURRENT_TS=`date +%s%N | cut -b1-13`'
 echo curl -u \"$DIGITAL_TWIN_INSTANCE_CREDENTIALS\" \"https://$IOT_DOMAIN_HOST/house/sonnenconfiguration/$ADDITIONAL_DIGITAL_TWIN_INSTANCE_DEVICE_NAME\" -H \'Content-Type: application/json\' -d \"{\\\"softwareVersion\\\": \\\"1.18.4\\\",\\\"time\\\": \$CURRENT_TS}\"
-echo "To send text data for the status"
+echo "To send text data for the status for device $ADDITIONAL_DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
 echo 'export CURRENT_TS=`date +%s%N | cut -b1-13`'
 echo curl -u \"$DIGITAL_TWIN_INSTANCE_CREDENTIALS\" \"https://$IOT_DOMAIN_HOST/house/sonnenstatus/$ADDITIONAL_DIGITAL_TWIN_INSTANCE_DEVICE_NAME\" -H \'Content-Type: application/json\' -d \"{\\\"batteryCharging\\\": false,\\\"consumptionAvgWattsLastMinute\\\": 339,\\\"currentBatteryCapacityPercentage\\\": 59,\\\"operatingMode\\\": 2,\\\"reservedBatteryCapacityPercentage\\\": 5,\\\"solarProductionWattsPointInTime\\\": 131,\\\"time\\\": \$CURRENT_TS}\"
 
-echo "To send test data for the configuration using mqttx but no device specific endpoint"
+echo "To send test data for the configuration using mqttx, no device specific endpoint, for device $ADDITIONAL_DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
 echo 'export CURRENT_TS=`date +%s%N | cut -b1-13`'
 echo mqttx pub -t house/sonnenconfiguration -ct application/json  -u $DIGITAL_TWIN_INSTANCE_EXTERNAL_KEY -P $DIGITAL_TWIN_INSTANCE_SECRET  -h $IOT_DOMAIN_HOST -p 8883  -m  \"{\\\"softwareVersion\\\": \\\"1.18.8\\\",\\\"time\\\": \$CURRENT_TS}\"
-echo "To send text data for the status"
+echo "To send text data for the status using mqttx, no device specific endpoint, for device $ADDITIONAL_DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
 echo 'export CURRENT_TS=`date +%s%N | cut -b1-13`'
 echo mqttx pub -t house/sonnenstatus -ct application/json  -u $DIGITAL_TWIN_INSTANCE_EXTERNAL_KEY -P $DIGITAL_TWIN_INSTANCE_SECRET  -h $IOT_DOMAIN_HOST -p 8883  -m  \"{\\\"batteryCharging\\\": false,\\\"consumptionAvgWattsLastMinute\\\": 339,\\\"currentBatteryCapacityPercentage\\\": 59,\\\"operatingMode\\\": 2,\\\"reservedBatteryCapacityPercentage\\\": 5,\\\"solarProductionWattsPointInTime\\\": 131,\\\"time\\\": \$CURRENT_TS}\" 
+
+
+echo "To get the most recent normalized data for device $ADDITIONAL_DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
+echo "oci iot digital-twin-instance get-content --digital-twin-instance-id  $DIGITAL_TWIN_INSTANCE_OCID"

IoTSonnenUploader/OCISetup/CreateConfig.sh

@@ -109,17 +109,19 @@ export DIGITAL_TWIN_INSTANCE_SECRET_BASE64=`oci secrets secret-bundle get --secr
 export DIGITAL_TWIN_INSTANCE_SECRET=`echo $DIGITAL_TWIN_INSTANCE_SECRET_BASE64 | base64 --decode`
 export DIGITAL_TWIN_INSTANCE_CREDENTIALS="$DIGITAL_TWIN_INSTANCE_EXTERNAL_KEY":"$DIGITAL_TWIN_INSTANCE_SECRET"
 echo "Digital twin instance credentials $DIGITAL_TWIN_INSTANCE_CREDENTIALS"
-echo "To send test data for the configuration using https"
+echo "To send test data for the configuration using https for device $DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
 echo 'export CURRENT_TS=`date +%s%N | cut -b1-13`'
 echo curl -u \"$DIGITAL_TWIN_INSTANCE_CREDENTIALS\" \"https://$IOT_DOMAIN_HOST/house/sonnenconfiguration/$DIGITAL_TWIN_INSTANCE_DEVICE_NAME\" -H \'Content-Type: application/json\' -d \"{\\\"softwareVersion\\\": \\\"1.18.4\\\",\\\"time\\\": \$CURRENT_TS}\"
-echo "To send text data for the status"
+echo "To send text data for the status for device $DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
 echo 'export CURRENT_TS=`date +%s%N | cut -b1-13`'
 echo curl -u \"$DIGITAL_TWIN_INSTANCE_CREDENTIALS\" \"https://$IOT_DOMAIN_HOST/house/sonnenstatus/$DIGITAL_TWIN_INSTANCE_DEVICE_NAME\" -H \'Content-Type: application/json\' -d \"{\\\"batteryCharging\\\": false,\\\"consumptionAvgWattsLastMinute\\\": 339,\\\"currentBatteryCapacityPercentage\\\": 59,\\\"operatingMode\\\": 2,\\\"reservedBatteryCapacityPercentage\\\": 5,\\\"solarProductionWattsPointInTime\\\": 131,\\\"time\\\": \$CURRENT_TS}\"
 
-echo "To send test data for the configuration using mqttx "
+echo "To send test data for the configuration using mqttx for device $DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
 echo 'export CURRENT_TS=`date +%s%N | cut -b1-13`'
 echo mqttx pub -t house/sonnenconfiguration -ct application/json  -u $DIGITAL_TWIN_INSTANCE_EXTERNAL_KEY -P $DIGITAL_TWIN_INSTANCE_SECRET  -h $IOT_DOMAIN_HOST -p 8883  -m  \"{\\\"softwareVersion\\\": \\\"1.18.8\\\",\\\"time\\\": \$CURRENT_TS}\"
-echo "To send text data for the status"
+echo "To send text data for the status for device $DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
 echo 'export CURRENT_TS=`date +%s%N | cut -b1-13`'
 echo mqttx pub -t house/sonnenstatus -ct application/json  -u $DIGITAL_TWIN_INSTANCE_EXTERNAL_KEY -P $DIGITAL_TWIN_INSTANCE_SECRET  -h $IOT_DOMAIN_HOST -p 8883  -m  \"{\\\"batteryCharging\\\": false,\\\"consumptionAvgWattsLastMinute\\\": 339,\\\"currentBatteryCapacityPercentage\\\": 59,\\\"operatingMode\\\": 2,\\\"reservedBatteryCapacityPercentage\\\": 5,\\\"solarProductionWattsPointInTime\\\": 131,\\\"time\\\": \$CURRENT_TS}\" 
 
+echo "To get the most recent normalized data for device $DIGITAL_TWIN_INSTANCE_DEVICE_NAME"
+echo "oci iot digital-twin-instance get-content --digital-twin-instance-id  $DIGITAL_TWIN_INSTANCE_OCID"