scripts/gen_nvme.sh: add option for remote bdev JSON configuration
Add "create_remote_json_config" which will create a bdev JSON configuration for SPDK initiator to connect to NVMe-oF Target. Change-Id: I2370c6911df35ffa1f27e93bdfa4ddb7f174ea49 Signed-off-by: Karol Latecki <karol.latecki@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8776 Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com> Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-by: Paul Luse <paul.e.luse@intel.com> Reviewed-by: GangCao <gang.cao@intel.com> Reviewed-by: Maciej Wawryk <maciejx.wawryk@intel.com>
This commit is contained in:
parent
38ea8d54f3
commit
faaa9dd596
@ -6,6 +6,9 @@ rootdir=$(readlink -f $(dirname $0))/..
|
|||||||
source "$rootdir/scripts/common.sh"
|
source "$rootdir/scripts/common.sh"
|
||||||
|
|
||||||
gen_subsystems=false
|
gen_subsystems=false
|
||||||
|
gen_mode="local"
|
||||||
|
gen_function="create_local_json_config"
|
||||||
|
gen_args=()
|
||||||
|
|
||||||
function usage() {
|
function usage() {
|
||||||
echo "Script for generating JSON configuration file for attaching"
|
echo "Script for generating JSON configuration file for attaching"
|
||||||
@ -13,11 +16,16 @@ function usage() {
|
|||||||
echo "Usage: ${0##*/} [OPTIONS]"
|
echo "Usage: ${0##*/} [OPTIONS]"
|
||||||
echo
|
echo
|
||||||
echo "-h, --help Print help and exit"
|
echo "-h, --help Print help and exit"
|
||||||
|
echo " --mode Generate 'local' or 'remote' NVMe JSON configuration. Default is 'local'."
|
||||||
|
echo " Remote needs --trid option to be present."
|
||||||
|
echo " --trid Comma separated list target subsystem information containing transport type,"
|
||||||
|
echo " IP addresses, port numbers and NQN names."
|
||||||
|
echo " Example: tcp:127.0.0.1:4420:nqn.2016-06.io.spdk:cnode1,tcp:127.0.0.1:4421:nqn.2016-06.io.spdk:cnode2"
|
||||||
echo " --json-with-subsystems Wrap bdev subsystem JSON configuration with higher level 'subsystems' dictionary."
|
echo " --json-with-subsystems Wrap bdev subsystem JSON configuration with higher level 'subsystems' dictionary."
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
function create_json_config() {
|
function create_local_json_config() {
|
||||||
local bdev_json_cfg=()
|
local bdev_json_cfg=()
|
||||||
local bdfs=()
|
local bdfs=()
|
||||||
|
|
||||||
@ -49,11 +57,56 @@ function create_json_config() {
|
|||||||
JSON
|
JSON
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function create_remote_json_config() {
|
||||||
|
local trids
|
||||||
|
local bdev_json_cfg=()
|
||||||
|
|
||||||
|
IFS="," read -r -a trids <<< $1
|
||||||
|
for ((i = 0; i < ${#trids[@]}; i++)); do
|
||||||
|
local transport
|
||||||
|
local ip_addr
|
||||||
|
local svc_port
|
||||||
|
local nqn
|
||||||
|
|
||||||
|
IFS=":" read -r transport ip_addr svc_port nqn <<< ${trids[i]}
|
||||||
|
bdev_json_cfg+=("$(
|
||||||
|
cat <<- JSON
|
||||||
|
{
|
||||||
|
"method": "bdev_nvme_attach_controller",
|
||||||
|
"params": {
|
||||||
|
"trtype": "$transport",
|
||||||
|
"adrfam": "IPv4",
|
||||||
|
"name": "Nvme${i}",
|
||||||
|
"subnqn": "$nqn",
|
||||||
|
"traddr": "$ip_addr",
|
||||||
|
"trsvcid": "$svc_port"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
JSON
|
||||||
|
)")
|
||||||
|
done
|
||||||
|
|
||||||
|
local IFS=","
|
||||||
|
cat <<- JSON
|
||||||
|
{
|
||||||
|
"subsystem": "bdev",
|
||||||
|
"config": [
|
||||||
|
${bdev_json_cfg[*]}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
JSON
|
||||||
|
}
|
||||||
|
|
||||||
while getopts 'h-:' optchar; do
|
while getopts 'h-:' optchar; do
|
||||||
case "$optchar" in
|
case "$optchar" in
|
||||||
-)
|
-)
|
||||||
case "$OPTARG" in
|
case "$OPTARG" in
|
||||||
help) usage ;;
|
help) usage ;;
|
||||||
|
mode=*)
|
||||||
|
gen_mode="${OPTARG#*=}"
|
||||||
|
gen_function="create_${OPTARG#*=}_json_config"
|
||||||
|
;;
|
||||||
|
trid=*) remote_trid="${OPTARG#*=}" ;;
|
||||||
json-with-subsystems) gen_subsystems=true ;;
|
json-with-subsystems) gen_subsystems=true ;;
|
||||||
*) echo "Invalid argument '$OPTARG'" && usage ;;
|
*) echo "Invalid argument '$OPTARG'" && usage ;;
|
||||||
esac
|
esac
|
||||||
@ -63,7 +116,16 @@ while getopts 'h-:' optchar; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
bdev_json_cfg=$(create_json_config)
|
if [[ "$gen_mode" == "remote" ]] && [[ -z "$remote_trid" ]]; then
|
||||||
|
echo "For $gen_mode --trid argument must be provided."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$gen_mode" == "remote" ]]; then
|
||||||
|
gen_args+=("$remote_trid")
|
||||||
|
fi
|
||||||
|
|
||||||
|
bdev_json_cfg=$("$gen_function" "${gen_args[@]}")
|
||||||
if [[ $gen_subsystems == true ]]; then
|
if [[ $gen_subsystems == true ]]; then
|
||||||
bdev_json_cfg=$(
|
bdev_json_cfg=$(
|
||||||
cat <<- JSON
|
cat <<- JSON
|
||||||
|
Loading…
Reference in New Issue
Block a user