adding "udmi validate" tool #561
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,6 @@ | ||
| #!/bin/bash -e | ||
|
|
||
| source $(realpath $(dirname $(readlink -f $0))/..)/etc/udmi_preamble.sh | ||
|
|
||
| echo profile: ${udmi_profile} | ||
| echo site_model: ${udmi_site} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,12 @@ | ||
| #!/bin/bash -e | ||
|
|
||
|
There was a problem hiding this comment. Is there some reason these aren't named same_as_the_others instead of using - ? There was a problem hiding this comment. I was basing it off of the git extension format, e.g. the file "git-utility" would map to the command-line "git utility " -- as a way to provide transparent extensions. So, "udmi-validate" maps to "udmi validate". The snake_case ones are generally things then that should be run directly (bin/test_sequencer). So, that was the reason (consistency with git extension naming)... |
||
| source $(realpath $(dirname $(readlink -f $0))/..)/etc/udmi_preamble.sh | ||
|
|
||
| [[ $udmi_site != null ]] || udmi_help site_model not defined | ||
| [[ $udmi_project != null ]] || udmi_help project_id not defined | ||
| [[ $udmi_device != null ]] || udmi_help device_id not defined | ||
| [[ $udmi_serial != null ]] || udmi_help serial_id not defined | ||
|
|
||
| cmd="$UDMI_ROOT/bin/pubber $udmi_site $udmi_project $udmi_device $udmi_serial $*" | ||
| echo $cmd | ||
| $cmd | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| #!/bin/bash -e | ||
|
|
||
| source $(realpath $(dirname $(readlink -f $0))/..)/etc/udmi_preamble.sh | ||
|
|
||
| CONFIG_FILE=/tmp/validator_config.json | ||
|
|
||
| echo $udmi_site | ||
| [[ $udmi_site != null ]] || udmi_help site_model not defined | ||
| [[ $udmi_project != null ]] || udmi_help project_id not defined | ||
|
|
||
| [[ $udmi_feed != null ]] || udmi_feed= | ||
|
|
||
| SUMMARY_FILE=out/validation_report.json | ||
| rm -f $SUMMARY_FILE | ||
|
|
||
| $UDMI_ROOT/validator/bin/build | ||
|
|
||
| echo Writing config to $CONFIG_FILE | ||
| cat <<EOF > $CONFIG_FILE | ||
| { | ||
| "project_id": "$udmi_project", | ||
| "site_model": "$udmi_site", | ||
| "log_level": "$udmi_loglevel", | ||
| "udmi_root": "$UDMI_ROOT", | ||
| "feed_name": "$udmi_feed", | ||
| "udmi_version": "$udmi_version", | ||
| "key_file": "$site_path/validator/rsa_private.pkcs8" | ||
| } | ||
| EOF | ||
|
|
||
| JAVA_CMD="java -cp $UDMI_JAR com.google.daq.mqtt.validator.Validator" | ||
|
|
||
| cmd="$JAVA_CMD $CONFIG_FILE" | ||
| if [[ $udmi_runsec != null ]]; then | ||
| cmd="timeout ${udmi_runsec}s $cmd" | ||
| fi | ||
|
|
||
| echo $cmd | ||
| result=0 | ||
| $cmd || result=$? | ||
|
|
||
| if [[ $result != 124 ]]; then | ||
| echo abnormal termination not due to timeout. | ||
| false | ||
| fi | ||
|
|
||
| [[ -f $SUMMARY_FILE ]] || (echo missing summary file $SUMMARY_FILE && false) | ||
|
|
||
| mkdir -p out/devices | ||
|
|
||
| error_files=$(find out/devices/ -name \*.out) | ||
| echo | ||
| if [[ -n $error_files ]]; then | ||
| echo Device validation error files: | ||
| find out/devices/ -name \*.out | ||
| else | ||
| echo No device validation errors found. | ||
| fi | ||
| echo | ||
| echo Report summary in $SUMMARY_FILE |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Honestly all this source'ing makes me nervous. Is there some other way we can accomplish this?
If we just want to put configuration data into shell scripts that's one thing, and carefully pull the values out. But at the point that we are building multiple source (with sourceing them) shell scripts I think we might need a different approach.
WDYT?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know how else to do it other than with "source" -- if you have a specific suggestion on "some other way" that's more appropriate then I'm all ears... but -- if you want/need to do something like define "common functions" I'm not sure how else to do it...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think if you are sourcing shell scripts you need to move to a different language.