From 4eda51a0c065a3f3822d00ca49a20d89b6bc203e Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Tue, 11 Aug 2020 06:42:06 -0400 Subject: [PATCH] test/iscsi: only test rpc_config with posix Since VPP is deprecated, this is no longer required. rpc_config tests will work for posix and uring the same for this test. Signed-off-by: Tomasz Zawadzki Change-Id: Ibc7bd76ea47ca137f3eb4484782cc64ff748fe22 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3729 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker --- test/iscsi_tgt/rpc_config/rpc_config.py | 8 ++------ test/iscsi_tgt/rpc_config/rpc_config.sh | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/test/iscsi_tgt/rpc_config/rpc_config.py b/test/iscsi_tgt/rpc_config/rpc_config.py index 9f8e32909..4f214eb2c 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.py +++ b/test/iscsi_tgt/rpc_config/rpc_config.py @@ -10,13 +10,12 @@ import json import random from subprocess import check_call, call, check_output, Popen, PIPE, CalledProcessError -if (len(sys.argv) == 8): +if (len(sys.argv) == 7): target_ip = sys.argv[2] initiator_ip = sys.argv[3] port = sys.argv[4] netmask = sys.argv[5] namespace = sys.argv[6] - test_type = sys.argv[7] ns_cmd = 'ip netns exec ' + namespace other_ip = '127.0.0.6' @@ -462,10 +461,7 @@ if __name__ == "__main__": try: verify_log_flag_rpc_methods(rpc_py, rpc_param) verify_net_get_interfaces(rpc_py) - # Add/delete IP will not be supported in VPP. - # It has separate vppctl utility for that. - if test_type == 'posix': - verify_net_interface_add_delete_ip_address(rpc_py) + verify_net_interface_add_delete_ip_address(rpc_py) create_malloc_bdevs_rpc_methods(rpc_py, rpc_param) verify_portal_groups_rpc_methods(rpc_py, rpc_param) verify_initiator_groups_rpc_methods(rpc_py, rpc_param) diff --git a/test/iscsi_tgt/rpc_config/rpc_config.sh b/test/iscsi_tgt/rpc_config/rpc_config.sh index 347a5a172..9588c5dbc 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.sh +++ b/test/iscsi_tgt/rpc_config/rpc_config.sh @@ -50,7 +50,7 @@ sleep 1 timing_exit start_iscsi_tgt -$rpc_config_py $rpc_py $TARGET_IP $INITIATOR_IP $ISCSI_PORT $NETMASK $TARGET_NAMESPACE $TEST_TYPE +$rpc_config_py $rpc_py $TARGET_IP $INITIATOR_IP $ISCSI_PORT $NETMASK $TARGET_NAMESPACE $rpc_py bdev_get_bdevs