From a70732c9f1c93777c512ced586f09f4b81659a75 Mon Sep 17 00:00:00 2001 From: Sebastian Brzezinka Date: Thu, 11 Aug 2022 15:54:14 +0200 Subject: [PATCH] test/sma: move crypto helper function to common.sh Signed-off-by: Sebastian Brzezinka Change-Id: I55d58a5959d5b67d99c2e2dfd9ea787a1e31b023 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13996 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Konrad Sztyber Reviewed-by: Jim Harris --- test/sma/common.sh | 18 ++++++++++++++++++ test/sma/crypto.sh | 18 ------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/test/sma/common.sh b/test/sma/common.sh index dd34ee8e8..afa2ecbe8 100644 --- a/test/sma/common.sh +++ b/test/sma/common.sh @@ -17,3 +17,21 @@ function uuid2base64() { print(base64.b64encode(uuid.UUID("$1").bytes).decode()) EOF } + +get_cipher() { + case "$1" in + AES_CBC) echo 0 ;; + AES_XTS) echo 1 ;; + *) echo "$1" ;; + esac +} + +format_key() { + base64 <(echo -n "$1") +} + +uuid2nguid() { + # The NGUID returned by the RPC is UPPERCASE + local uuid=${1^^} + echo ${uuid//-/} +} diff --git a/test/sma/crypto.sh b/test/sma/crypto.sh index eadee774e..b0d8ffc3b 100755 --- a/test/sma/crypto.sh +++ b/test/sma/crypto.sh @@ -20,24 +20,6 @@ cleanup() { killprocess $tgtpid } -get_cipher() { - case "$1" in - AES_CBC) echo 0 ;; - AES_XTS) echo 1 ;; - *) echo "$1" ;; - esac -} - -format_key() { - base64 <(echo -n "$1") -} - -uuid2nguid() { - # The NGUID returned by the RPC is UPPERCASE - local uuid=${1^^} - echo ${uuid//-/} -} - gen_volume_params() { local volume_id=$1 cipher=$2 key=$3 key2=$4 config local -a params crypto