Commit 035f490d authored by Pawel Niedzwiecki's avatar Pawel Niedzwiecki Committed by Daniel Verkamp
Browse files

test/vhost: Use json configuration file in vhost fiotest. 



Change-Id: I0c032913eff08571ed275f939dc191496fa241ec
Signed-off-by: default avatarPawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/411677


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
parent 43c5429d

test/vhost/fiotest/autotest.sh

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ if [[ $test_type =~ "spdk_vhost" ]]; then 
	notice ""

	notice "running SPDK"

	notice ""

	spdk_vhost_run --conf-path=$AUTOTEST_BASE_DIR

	spdk_vhost_run --json-path=$AUTOTEST_BASE_DIR

	notice ""

fi

test/vhost/fiotest/conf.json

0 → 100644
+80 −0
Original line number Diff line number Diff line 
{

  "subsystems": [

    {

      "subsystem": "copy",

      "config": null

    },

    {

      "subsystem": "interface",

      "config": null

    },

    {

      "subsystem": "net_framework",

      "config": null

    },

    {

      "subsystem": "bdev",

      "config": [

        {

          "params": {

            "base_bdev": "Nvme0n1",

            "split_size_mb": 0,

            "split_count": 4

          },

          "method": "construct_split_vbdev"

        },

        {

          "params": {

            "block_size": 4096,

            "num_blocks": 32768

          },

          "method": "construct_malloc_bdev"

        },

        {

          "params": {

            "block_size": 4096,

            "num_blocks": 32768

          },

          "method": "construct_malloc_bdev"

        }

      ]

    },

    {

      "subsystem": "nbd",

      "config": []

    },

    {

      "subsystem": "scsi",

      "config": null

    },

    {

      "subsystem": "vhost",

      "config": [

        {

          "params": {

            "cpumask": "0x1",

            "ctrlr": "vhost.0"

          },

          "method": "construct_vhost_scsi_controller"

        },

        {

          "params": {

            "scsi_target_num": 0,

            "bdev_name": "Malloc0",

            "ctrlr": "vhost.0"

          },

          "method": "add_vhost_scsi_lun"

        },

        {

          "params": {

            "dev_name": "Malloc1",

            "readonly": true,

            "ctrlr": "vhost.1",

            "cpumask": "0x1"

          },

          "method": "construct_vhost_blk_controller"

        }

      ]

    }

  ]

}

test/vhost/fiotest/vhost.conf.in

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
[Global]



[Ioat]

  Disable Yes



[Malloc]

  NumberOfLuns 2

  LunSizeInMB 128

  BlockSize 4096



[Split]

  Split Nvme0n1 4



[VhostScsi0]

  Name vhost.0

  Dev 0 Malloc0

  Cpumask 0x1



[VhostBlk0]

  Name vhost.1

  Dev Malloc1

  ReadOnly yes

  Cpumask 0x1