Timothy Messier
e66ea15fef
When using the json output of the cli (`-format=json`), a successful call to the controller API would place the HTTP status code in the JSON as `status_code`. However, if there was an error from the API the status code would be placed in the JSON as `status`. In order to be consistent, this adds a `status_code` field to the error response case. For backwards compatibility it still populates `status` in the error case. This inconsistency was missed partially due to a bug in the CLI tests. The assertion on status code was not valid and would always be successful. Thus this also fixes the assertions and tests.
34 lines
1.1 KiB
Bash
34 lines
1.1 KiB
Bash
export BOUNDARY_ADDR="${BOUNDARY_ADDR:-http://127.0.0.1:9200}"
|
|
export DEFAULT_PASSWORD="${DEFAULT_PASSWORD:-password}"
|
|
export DEFAULT_LOGIN="${DEFAULT_LOGIN:-admin}"
|
|
export DEFAULT_UNPRIVILEGED_LOGIN="${DEFAULT_UNPRIVILEGED_LOGIN:-user}"
|
|
export DEFAULT_AMPW="${DEFAULT_AMPW:-ampw_1234567890}"
|
|
export DEFAULT_P_ID="${DEFAULT_P_ID:-p_1234567890}"
|
|
export DEFAULT_O_ID="${DEFAULT_O_ID:-o_1234567890}"
|
|
export DEFAULT_GLOBAL='global'
|
|
export DEFAULT_TARGET="${DEFAULT_TARGET:-ttcp_1234567890}"
|
|
export DEFAULT_HOST_SET="${DEFAULT_HOST_SET:-hsst_1234567890}"
|
|
export DEFAULT_HOST_CATALOG="${DEFAULT_HOST_CATALOG:-hcst_1234567890}"
|
|
export DEFAULT_HOST="${DEFAULT_HOST:-hst_1234567890}"
|
|
export DEFAULT_USER="${DEFAULT_USER:-u_1234567890}"
|
|
export DEFAULT_UNPRIVILEGED_USER="${DEFAULT_UNPRIVILEGED_USER:-u_0987654321}"
|
|
|
|
function strip() {
|
|
echo "$1" | tr -d '"'
|
|
}
|
|
|
|
function strip_all() {
|
|
echo "$1" | tr -d '"' | tr -d '\'\'
|
|
}
|
|
|
|
function has_status_code() {
|
|
local json=$1
|
|
local code=$2
|
|
echo "checking .status_code == $code in $json"
|
|
echo "$json" | jq -e ".status_code == $code"
|
|
}
|
|
|
|
diag() {
|
|
echo "$@" | sed -e 's/^/# /' >&3 ;
|
|
}
|