Commit 3b999711 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Tomasz Zawadzki
Browse files

python/rpc: fix iscsi_delete_target_node 'name' parameter 



After following patch all calls through rpc.py go through the cli python lib:
(78e035e7) python/rpc: use client object directly in cli

When it was introduced, iSCSI tets were not executed on CI. Resulting in not
catching the discrepancy between parameters.

iscsi_delete_target_node has 'name' as its actual JSON parameter, where cli lib
used 'target_node_name'. Fix it and align both to use the same parameters.

Change-Id: If9b36be51b78027d2ae2208cb88bb28cdaffead7
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26539


Bypass-Merge-Requirements: Tomasz Zawadzki <tomasz@tzawadzki.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
parent e8da9d71

python/spdk/cli/iscsi.py

+2 −3
Original line number Diff line number Diff line
@@ -450,12 +450,11 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.set_defaults(func=iscsi_initiator_group_remove_initiators)



    def iscsi_delete_target_node(args):

        args.client.iscsi_delete_target_node(

             target_node_name=args.target_node_name)

        args.client.iscsi_delete_target_node(name=args.name)



    p = subparsers.add_parser('iscsi_delete_target_node',

                              help='Delete a target node')

    p.add_argument('target_node_name',

    p.add_argument('name',

                   help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.')

    p.set_defaults(func=iscsi_delete_target_node)

python/spdk/rpc/iscsi.py

+3 −3
Original line number Diff line number Diff line
@@ -565,16 +565,16 @@ def iscsi_initiator_group_remove_initiators( 




@deprecated_method

def iscsi_delete_target_node(client, target_node_name):

def iscsi_delete_target_node(client, name):

    """Delete a target node.



    Args:

        target_node_name: Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.

        name: Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.



    Returns:

        True or False

    """

    params = {'name': target_node_name}

    params = {'name': name}

    return client.call('iscsi_delete_target_node', params)

python/spdk/spdkcli/ui_node_iscsi.py

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class UIISCSIDevices(UINode): 
                    UIISCSIDevice(device, node, self)



    def delete(self, name):

        self.get_root().iscsi_delete_target_node(target_node_name=name)

        self.get_root().iscsi_delete_target_node(name=name)



    def ui_command_create(self, name, alias_name, bdev_name_id_pairs,

                          pg_ig_mappings, queue_depth, g=None, d=None, r=None,