From 06d2863a674635bd2e08d640320ce9ac53f9640a Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Thu, 17 Sep 2020 15:54:44 -0700 Subject: [PATCH] test/iscsi: In ip_migration.sh, eliminate rpc_validate_ip This was testing the net_interface_* RPCs, which are about to be eliminated. Signed-off-by: Ben Walker Change-Id: I903eb73c72f5d7cf5ffa322e39296e4692adf008 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4302 Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Aleksey Marchuk --- test/iscsi_tgt/ip_migration/ip_migration.sh | 37 --------------------- 1 file changed, 37 deletions(-) diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh index d4b9381b2..005a11222 100755 --- a/test/iscsi_tgt/ip_migration/ip_migration.sh +++ b/test/iscsi_tgt/ip_migration/ip_migration.sh @@ -24,42 +24,6 @@ function kill_all_iscsi_target() { done } -function rpc_validate_ip() { - # Always delete the IP first in case it is there already - cmd="$rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS" - if $cmd; then - echo "Delete existing IP succeeded." - else - echo "Ignore the failure as IP did not exist." - fi - - cmd="$rpc_py -s $1 net_interface_add_ip_address 1 $MIGRATION_ADDRESS" - if $cmd; then - echo "Add new IP succeeded." - else - echo "Add new IP failed. Expected to succeed..." - exit 1 - fi - # Add same IP again - if $cmd; then - echo "Same IP existed. Expected to fail..." - exit 1 - fi - - cmd="$rpc_py -s $1 net_interface_delete_ip_address 1 $MIGRATION_ADDRESS" - if $cmd; then - echo "Delete existing IP succeeded." - else - echo "Delete existing IP failed. Expected to succeed..." - exit 1 - fi - # Delete same IP again - if $cmd; then - echo "No required IP existed. Expected to fail..." - exit 1 - fi -} - function rpc_add_target_node() { $rpc_py -s $1 net_interface_add_ip_address 1 $MIGRATION_ADDRESS $rpc_py -s $1 iscsi_create_portal_group $PORTAL_TAG $MIGRATION_ADDRESS:$ISCSI_PORT @@ -101,7 +65,6 @@ for ((i = 0; i < 2; i++)); do done rpc_first_addr="/var/tmp/spdk0.sock" -rpc_validate_ip $rpc_first_addr rpc_add_target_node $rpc_first_addr sleep 1