Commit 9c9f5151 authored by Emilia Haligowska's avatar Emilia Haligowska Committed by Tomasz Zawadzki
Browse files

scripts: Read env var SPDK_JSONRPC_GO_CLIENT in order to run go client 



Change-Id: I0e6b8380f5a1827d491e6297969e824f2cc653b7
Signed-off-by: default avatarEmilia Haligowska <emilia.haligowska@intel.com>
Signed-off-by: default avatarMaciej Mis <maciej.mis@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/19733


Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
parent 1e46e023

scripts/rpc.py

+13 −4
Original line number Diff line number Diff line
@@ -3524,6 +3524,11 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 


    args = parser.parse_args()



    try:

        use_go_client = int(os.getenv('SPDK_JSONRPC_GO_CLIENT', 0)) == 1

    except ValueError:

        use_go_client = False



    if sys.stdin.isatty() and not hasattr(args, 'func'):

        # No arguments and no data piped through stdin

        parser.print_help()
@@ -3540,6 +3545,10 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
                continue



            try:

                if use_go_client:

                    tmp_args.client = rpc.client.JSONRPCGoClient(tmp_args.server_addr,

                                                                 log_level=getattr(logging, tmp_args.verbose.upper()))

                else:

                    tmp_args.client = rpc.client.JSONRPCClient(

                        tmp_args.server_addr, tmp_args.port, tmp_args.timeout,

                        log_level=getattr(logging, tmp_args.verbose.upper()), conn_retries=tmp_args.conn_retries)
@@ -3554,7 +3563,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
        print_dict = null_print

        print_json = null_print

        print_array = null_print

    elif args.go_client:

    elif args.go_client or use_go_client:

        try:

            args.client = rpc.client.JSONRPCGoClient(args.server_addr,

                                                     log_level=getattr(logging, args.verbose.upper()))