From ad945cb22a08b4259c2d5324e5034499824960d5 Mon Sep 17 00:00:00 2001 From: aloralove Date: Fri, 6 Sep 2024 02:24:44 +0000 Subject: [PATCH 1/2] Added meter id/name to message, most valuable content for Rails app and reliable reference to link messages -> event files -> meters. --- cli_meter/meters/sel735/create_message.sh | 19 +++++++++++-------- cli_meter/meters/sel735/download.sh | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/cli_meter/meters/sel735/create_message.sh b/cli_meter/meters/sel735/create_message.sh index cfd2e1c..ed652e2 100755 --- a/cli_meter/meters/sel735/create_message.sh +++ b/cli_meter/meters/sel735/create_message.sh @@ -7,6 +7,7 @@ # # # Arguments: +# meter_id Meter ID # event_id event ID # zip_filename Name of the zipped file # md5sum_value md5sum of the zipped file @@ -20,23 +21,25 @@ current_dir=$(dirname "$(readlink -f "$0")") script_name=$(basename "$0") source "$current_dir/../../common_utils.sh" -# Check for exactly 5 arguments -[ "$#" -ne 5 ] && failure $STREAMS_INVALID_ARGS "Usage: $script_name " +# Check for exactly 6 arguments +[ "$#" -ne 6 ] && failure $STREAMS_INVALID_ARGS "Usage: $script_name " -event_id="$1" -zip_filename="$2" -md5sum_value="$3" -data_type="$4" -output_dir="$5" +meter_id="$1" +event_id="$2" +zip_filename="$3" +md5sum_value="$4" +data_type="$5" +output_dir="$6" message_file="$output_dir/${zip_filename}.message" # Create the JSON payload json_payload=$(jq -n \ + --arg mid "$meter_id" \ --arg eid "$event_id" \ --arg fn "$zip_filename" \ --arg md5s "$md5sum_value" \ --arg dt "$data_type" \ - '{event_id: $eid, filename: $fn, md5sum: $md5s, data_type: $dt}') + '{meter_id: $mid, event_id: $eid, filename: $fn, md5sum: $md5s, data_type: $dt}') # Write the JSON payload to the .message file echo "$json_payload" > "$message_file" && log "Created message file: $message_file" || failure $STREAMS_FILE_CREATION_FAIL "Failed to write to message file: $message_file" diff --git a/cli_meter/meters/sel735/download.sh b/cli_meter/meters/sel735/download.sh index 2767d82..39e295c 100755 --- a/cli_meter/meters/sel735/download.sh +++ b/cli_meter/meters/sel735/download.sh @@ -147,7 +147,7 @@ for event_info in $events; do md5sum_value=$(md5sum "$event_zipped_output_dir/$zip_filename" | awk '{print $1}') # Create the message file (JSON) for the event - "$current_dir/create_message.sh" "$event_id" "$zip_filename" "$md5sum_value" "$data_type" "$event_zipped_output_dir" || { + "$current_dir/create_message.sh" "$meter_id" "$event_id" "$zip_filename" "$md5sum_value" "$data_type" "$event_zipped_output_dir" || { handle_fail "$event_id" "$output_dir" "$STREAMS_FILE_CREATION_FAIL" "Failed to create message file for event: $event_id" "$meter_id" "$download_start" "$download_end" continue } From 93b3638eade4223da6fd481eeb6bd8d24ec350aa Mon Sep 17 00:00:00 2001 From: aloralove Date: Fri, 6 Sep 2024 21:07:58 +0000 Subject: [PATCH 2/2] updated tests to reflect new change to messages sent for mqtt pub sub --- cli_meter/test/test_scripts.bats | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli_meter/test/test_scripts.bats b/cli_meter/test/test_scripts.bats index 3875c19..02d13c7 100755 --- a/cli_meter/test/test_scripts.bats +++ b/cli_meter/test/test_scripts.bats @@ -13,7 +13,7 @@ teardown() { } @test "create_message.sh execution test" { - run ./create_message.sh "$EVENT_ID" "$ZIP_FILENAME" "/path/to/file" "$DATA_TYPE" "$TMP_DIR" + run ./create_message.sh "$METER_ID" "$EVENT_ID" "$ZIP_FILENAME" "$MD5SUM_VALUE" "$DATA_TYPE" "$TMP_DIR" assert_success assert [ -f "$TMP_DIR/$ZIP_FILENAME.message" ] } @@ -22,13 +22,13 @@ teardown() { @test "create_message.sh test 0 arguments" { run ./create_message.sh assert_failure $(($STREAMS_INVALID_ARGS % 256)) - assert_output --partial "Usage: create_message.sh " + assert_output --partial "Usage: create_message.sh " } @test "create_message.sh test too many arguments" { - run ./create_message.sh "$EVENT_ID" "$ZIP_FILENAME" "/path/to/file" "$DATA_TYPE" + run ./create_message.sh "$METER_ID" "$EVENT_ID" "$ZIP_FILENAME" "$MD5SUM_VALUE" "$DATA_TYPE" "$TMP_DIR" "extra_argument" assert_failure $(($STREAMS_INVALID_ARGS % 256)) - assert_output --partial "Usage: create_message.sh " + assert_output --partial "Usage: create_message.sh " } @test "cleanup_incomplete.sh cleanups incomplete directories" {