Adding upstream version 16.2.11+ds.upstream/16.2.11+dsupstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

13 files changed, 279 insertions, 0 deletions

diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_details_lvs.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_details_lvs.test.match
new file mode 100644
index 000000000..efb34b9e7
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_details_lvs.test.match
@@ -0,0 +1,9 @@
+{
+  "base_bdev": "Malloc0",
+  "block_size": 512,
+  "cluster_size": 4194304,
+  "free_clusters": 1,
+  "name": "lvs0",
+  "total_data_clusters": 9,
+  "uuid": "$(S)"
+}
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost.test.match
new file mode 100644
index 000000000..afab7ba56
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost.test.match
@@ -0,0 +1,32 @@
+{
+  "aliases": [],
+  "assigned_rate_limits": {
+    "r_mbytes_per_sec": $(N),
+    "rw_ios_per_sec": $(N),
+    "rw_mbytes_per_sec": $(N),
+    "w_mbytes_per_sec": $(N)
+  },
+  "block_size": $(N),
+  "claimed": false,
+  "driver_specific": {
+    "split": {
+      "base_bdev": "Nvme0n1",
+      "offset_blocks": $(N)
+    }
+  },
+  "name": "Nvme0n1p0",
+  "num_blocks": $(N),
+  "product_name": "Split Disk",
+  "supported_io_types": {
+    "flush": $(S),
+    "nvme_admin": $(S),
+    "nvme_io": $(S),
+    "read": $(S),
+    "reset": $(S),
+    "unmap": $(S),
+    "write": $(S),
+    "write_zeroes": $(S)
+  },
+  "uuid": "$(S)",
+  "zoned": false
+}
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost_ctrl.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost_ctrl.test.match
new file mode 100644
index 000000000..7e045fb7d
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost_ctrl.test.match
@@ -0,0 +1,22 @@
+{
+  "backend_specific": {
+    "scsi": [
+      {
+        "id": 0,
+        "luns": [
+          {
+            "bdev_name": "Malloc2",
+            "id": 0
+          }
+        ],
+        "scsi_dev_num": 0,
+        "target_name": "Target 0"
+      }
+    ]
+  },
+  "cpumask": "0x3",
+  "ctrlr": "vhost_scsi1",
+  "delay_base_us": 20,
+  "iops_threshold": 1000000,
+  "socket": "$(S)/vhost_scsi1"
+}
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost_target.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost_target.test.match
new file mode 100644
index 000000000..8a31e49f0
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_details_vhost_target.test.match
@@ -0,0 +1,11 @@
+{
+  "id": 0,
+  "luns": [
+    {
+      "bdev_name": "Malloc2",
+      "id": 0
+    }
+  ],
+  "scsi_dev_num": 0,
+  "target_name": "Target 0"
+}
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_iscsi.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_iscsi.test.match
new file mode 100644
index 000000000..ffb314921
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_iscsi.test.match
@@ -0,0 +1,55 @@
+o- iscsi ..................................................................................................................... [...]
+  o- auth_groups ....................................................................................................... [Groups: 2]
+  | o- group1 ......................................................................................................... [Secrets: 3]
+  | | o- user=test1, secret=test1, muser=mutual_test1, msecret=mutual_test1 .................................................. [...]
+  | | o- user=test2, secret=test2, muser=mutual_test2, msecret=mutual_test2 .................................................. [...]
+  | | o- user=test3, secret=test3, muser=mutual_test3, msecret=mutual_test3 .................................................. [...]
+  | o- group2 ......................................................................................................... [Secrets: 1]
+  |   o- user=test4, secret=test4, muser=mutual_test4, msecret=mutual_test4 .................................................. [...]
+  o- global_params ........................................................................................................... [...]
+  | o- allow_duplicated_isid: False .......................................................................................... [...]
+  | o- chap_group: 1 ......................................................................................................... [...]
+  | o- default_time2retain: 20 ............................................................................................... [...]
+  | o- default_time2wait: 2 .................................................................................................. [...]
+  | o- disable_chap: True .................................................................................................... [...]
+  | o- error_recovery_level: 0 ............................................................................................... [...]
+  | o- first_burst_length: 8192 .............................................................................................. [...]
+  | o- immediate_data: True .................................................................................................. [...]
+  | o- max_connections_per_session: 2 ........................................................................................ [...]
+  | o- max_queue_depth: 64 ................................................................................................... [...]
+  | o- max_sessions: 128 ..................................................................................................... [...]
+  | o- mutual_chap: False .................................................................................................... [...]
+  | o- node_base: iqn.2016-06.io.spdk ........................................................................................ [...]
+  | o- nop_in_interval: 30 ................................................................................................... [...]
+  | o- nop_timeout: 60 ....................................................................................................... [...]
+  | o- require_chap: False ................................................................................................... [...]
+  o- initiator_groups ........................................................................................ [Initiator groups: 2]
+  | o- initiator_group2 ............................................................................................ [Initiators: 2]
+  | | o- hostname=ANW, netmask=$(N).$(N).$(N).$(N)/32 $(S) [...]
+  | | o- hostname=ANY, netmask=$(N).$(N).$(N).$(N)/32 $(S) [...]
+  | o- initiator_group3 ............................................................................................ [Initiators: 1]
+  |   o- hostname=ANZ, netmask=$(N).$(N).$(N).$(N)/32 $(S) [...]
+  o- iscsi_connections ............................................................................................ [Connections: 0]
+  o- portal_groups .............................................................................................. [Portal groups: 2]
+  | o- portal_group1 .................................................................................................. [Portals: 2]
+  | | o- host=127.0.0.1, port=3261 ........................................................................................... [...]
+  | | o- host=127.0.0.1, port=3263 ........................................................................................... [...]
+  | o- portal_group2 .................................................................................................. [Portals: 1]
+  |   o- host=127.0.0.1, port=3262 ........................................................................................... [...]
+  o- target_nodes ................................................................................................ [Target nodes: 2]
+    o- iqn.2016-06.io.spdk:Target0 ......................................................................... [Id: 0, QueueDepth: 64]
+    | o- auths ........................................ [disable_chap: True, require_chap: False, mutual_chap: False, chap_group: 1]
+    | o- luns ............................................................................................................ [Luns: 2]
+    | | o- lun 0 ......................................................................................................... [Malloc0]
+    | | o- lun 1 ......................................................................................................... [Malloc1]
+    | o- pg_ig_maps ................................................................................................ [Pg_ig_maps: 3]
+    |   o- portal_group1 - initiator_group2 .................................................................................. [...]
+    |   o- portal_group1 - initiator_group3 .................................................................................. [...]
+    |   o- portal_group2 - initiator_group2 .................................................................................. [...]
+    o- iqn.2016-06.io.spdk:Target1 ......................................................................... [Id: 1, QueueDepth: 64]
+      o- auths ....................................... [disable_chap: False, require_chap: False, mutual_chap: False, chap_group: 1]
+      o- luns ............................................................................................................ [Luns: 2]
+      | o- lun 0 ......................................................................................................... [Malloc2]
+      | o- lun 2 ......................................................................................................... [Malloc3]
+      o- pg_ig_maps ................................................................................................ [Pg_ig_maps: 1]
+        o- portal_group1 - initiator_group2 .................................................................................. [...]
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_nvmf.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_nvmf.test.match
new file mode 100644
index 000000000..736c53090
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_nvmf.test.match
@@ -0,0 +1,34 @@
+o- nvmf ...................................................................................................................... [...]
+  o- subsystem ..................................................................................................... [Subsystems: 4]
+  | o- nqn.2014-08.org.nvmexpress.discovery ......................................................... [st=Discovery, Allow any host]
+  | | o- hosts .......................................................................................................... [Hosts: 0]
+  | | o- listen_addresses ........................................................................................... [Addresses: 0]
+  | o- nqn.2014-08.org.spdk:cnode1 ...................................................... [sn=$(S), st=NVMe, Allow any host]
+  | | o- hosts .......................................................................................................... [Hosts: 1]
+  | | | o- nqn.2014-08.org.spdk:cnode2 ....................................................................................... [...]
+  | | o- listen_addresses ........................................................................................... [Addresses: 3]
+  | | | o- $(N).$(N).$(N).$(N):4260 $(S) [RDMA]
+  | | | o- $(N).$(N).$(N).$(N):4261 $(S) [RDMA]
+  | | | o- $(N).$(N).$(N).$(N):4262 $(S) [RDMA]
+  | | o- namespaces ................................................................................................ [Namespaces: 4]
+  | |   o- Malloc3 .................................................................................................... [Malloc3, 1]
+  | |   o- Malloc4 .................................................................................................... [Malloc4, 2]
+  | |   o- Malloc5 .................................................................................................... [Malloc5, 3]
+  | |   o- Malloc6 .................................................................................................... [Malloc6, 4]
+  | o- nqn.2014-08.org.spdk:cnode2 ...................................................... [sn=$(S), st=NVMe, Allow any host]
+  | | o- hosts .......................................................................................................... [Hosts: 0]
+  | | o- listen_addresses ........................................................................................... [Addresses: 1]
+  | | | o- $(N).$(N).$(N).$(N):4260 $(S) [RDMA]
+  | | o- namespaces ................................................................................................ [Namespaces: 1]
+  | |   o- Malloc2 .................................................................................................... [Malloc2, 1]
+  | o- nqn.2014-08.org.spdk:cnode3 ...................................................... [sn=$(S), st=NVMe, Allow any host]
+  |   o- hosts .......................................................................................................... [Hosts: 2]
+  |   | o- nqn.2014-08.org.spdk:cnode1 ....................................................................................... [...]
+  |   | o- nqn.2014-08.org.spdk:cnode2 ....................................................................................... [...]
+  |   o- listen_addresses ........................................................................................... [Addresses: 2]
+  |   | o- $(N).$(N).$(N).$(N):4260 $(S) [RDMA]
+  |   | o- $(N).$(N).$(N).$(N):4261 $(S) [RDMA]
+  |   o- namespaces ................................................................................................ [Namespaces: 1]
+  |     o- Malloc1 .................................................................................................... [Malloc1, 1]
+  o- transport ..................................................................................................... [Transports: 1]
+    o- RDMA .................................................................................................................. [...]
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_pmem.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_pmem.test.match
new file mode 100644
index 000000000..3948afd26
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_pmem.test.match
@@ -0,0 +1,3 @@
+o- pmemblk .............................................................................................................. [Bdevs: 2]
+  o- pmem_bdev0 .......................................................................................... [Size=31.6M, Not claimed]
+  o- pmem_bdev1 .......................................................................................... [Size=31.6M, Not claimed]
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_pmem_info.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_pmem_info.test.match
new file mode 100644
index 000000000..cdebc2ba1
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_pmem_info.test.match
@@ -0,0 +1,12 @@
+[
+  {
+    "num_blocks": 64700,
+    "block_size": 512
+  }
+]
+[
+  {
+    "num_blocks": 64700,
+    "block_size": 512
+  }
+]
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_raid.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_raid.test.match
new file mode 100644
index 000000000..906c1717f
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_raid.test.match
@@ -0,0 +1,17 @@
+o- bdevs ..................................................................................................................... [...]
+  o- aio ................................................................................................................ [Bdevs: 0]
+  o- error .............................................................................................................. [Bdevs: 0]
+  o- iscsi .............................................................................................................. [Bdevs: 0]
+  o- logical_volume ..................................................................................................... [Bdevs: 0]
+  o- malloc ............................................................................................................. [Bdevs: 2]
+  | o- Malloc1 ................................................................................................ [Size=8.0M, Claimed]
+  | o- Malloc2 ................................................................................................ [Size=8.0M, Claimed]
+  o- null ............................................................................................................... [Bdevs: 0]
+  o- nvme ............................................................................................................... [Bdevs: 0]
+  o- pmemblk ............................................................................................................ [Bdevs: 0]
+  o- raid_volume ........................................................................................................ [Bdevs: 1]
+  | o- testraid .......................................................................................... [Size=16.0M, Not claimed]
+  o- rbd ................................................................................................................ [Bdevs: 0]
+  o- split_disk ......................................................................................................... [Bdevs: 0]
+  o- virtioblk_disk ..................................................................................................... [Bdevs: 0]
+  o- virtioscsi_disk .................................................................................................... [Bdevs: 0]
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_rbd.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_rbd.test.match
new file mode 100644
index 000000000..7d1257493
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_rbd.test.match
@@ -0,0 +1,3 @@
+o- rbd .................................................................................................................. [Bdevs: 2]
+  o- Ceph0 ............................................................................................. [Size=1000.0M, Not claimed]
+  o- Ceph1 ............................................................................................. [Size=1000.0M, Not claimed]
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_vhost.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_vhost.test.match
new file mode 100644
index 000000000..2a8c3c738
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_vhost.test.match
@@ -0,0 +1,54 @@
+o- / ......................................................................................................................... [...]
+  o- bdevs ................................................................................................................... [...]
+  | o- aio .............................................................................................................. [Bdevs: 2]
+  | | o- sample0 .......................................................................................... [Size=$(FP)M, Not claimed]
+  | | o- sample1 .......................................................................................... [Size=$(FP)M, Not claimed]
+  | o- error ............................................................................................................ [Bdevs: 2]
+  | | o- EE_Malloc1 ...................................................................................... [Size=$(FP)M, Not claimed]
+  | | o- EE_Malloc4 ...................................................................................... [Size=$(FP)M, Not claimed]
+  | o- iscsi ............................................................................................................ [Bdevs: 0]
+  | o- logical_volume ................................................................................................... [Bdevs: 2]
+  | | o- $(X)-$(X)-$(X)-$(X)-$(X) ................................................ [lvs0/lvol$(FP), Size=$(FP)M, Not claimed]
+  | | o- $(X)-$(X)-$(X)-$(X)-$(X) ................................................ [lvs0/lvol$(FP), Size=$(FP)M, Not claimed]
+  | o- malloc ........................................................................................................... [Bdevs: 6]
+  | | o- Malloc0 ............................................................................................. [Size=$(FP)M, Claimed]
+  | | o- Malloc1 ............................................................................................. [Size=$(FP)M, Claimed]
+  | | o- Malloc2 ......................................................................................... [Size=$(FP)M, Not claimed]
+  | | o- Malloc3 ......................................................................................... [Size=$(FP)M, Not claimed]
+  | | o- Malloc4 ............................................................................................. [Size=$(FP)M, Claimed]
+  | | o- Malloc5 ............................................................................................. [Size=$(FP)M, Claimed]
+  | o- null ............................................................................................................. [Bdevs: 2]
+  | | o- null_bdev0 ...................................................................................... [Size=$(FP)M, Not claimed]
+  | | o- null_bdev1 ...................................................................................... [Size=$(FP)M, Not claimed]
+  | o- nvme ............................................................................................................. [Bdevs: 1]
+  | | o- Nvme0n1 $(S) [Size=$(S), Claimed]
+  | o- pmemblk .......................................................................................................... [Bdevs: 0]
+  | o- raid_volume ...................................................................................................... [Bdevs: 0]
+  | o- rbd .............................................................................................................. [Bdevs: 0]
+  | o- split_disk ....................................................................................................... [Bdevs: 4]
+  | | o- Nvme0n1p0 $(S) [Size=$(FP)G, Not claimed]
+  | | o- Nvme0n1p1 $(S) [Size=$(FP)G, Not claimed]
+  | | o- Nvme0n1p2 $(S) [Size=$(FP)G, Not claimed]
+  | | o- Nvme0n1p3 $(S) [Size=$(FP)G, Not claimed]
+  | o- virtioblk_disk ................................................................................................... [Bdevs: 0]
+  | o- virtioscsi_disk .................................................................................................. [Bdevs: 0]
+  o- lvol_stores .................................................................................................. [Lvol stores: 2]
+  | o- lvs0 $(S) [Size=$(FP)M, Free=$(FP)M]
+  | o- lvs1 $(S) [Size=$(FP)M, Free=$(FP)M]
+  o- vhost ................................................................................................................... [...]
+    o- block ................................................................................................................. [...]
+    | o- vhost_blk1 $(S) [$(S)]
+    | | o- Nvme0n1p0 ......................................................................................................... [...]
+    | o- vhost_blk2 $(S) [$(S), Readonly]
+    |   o- Nvme0n1p1 ......................................................................................................... [...]
+    o- scsi .................................................................................................................. [...]
+      o- vhost_scsi1 $(S) [$(S)]
+      | o- Target_0 .......................................................................................... [LUNs: 1,TargetID: 0]
+      |   o- Malloc2 ......................................................................................................... [...]
+      o- vhost_scsi2 $(S) [$(S)]
+        o- Target_0 .......................................................................................... [LUNs: 1,TargetID: 0]
+        | o- Malloc3 ......................................................................................................... [...]
+        o- Target_1 .......................................................................................... [LUNs: 1,TargetID: 1]
+        | o- Nvme0n1p2 ....................................................................................................... [...]
+        o- Target_2 .......................................................................................... [LUNs: 1,TargetID: 2]
+          o- Nvme0n1p3 ....................................................................................................... [...]
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_virtio_pci.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_virtio_pci.test.match
new file mode 100644
index 000000000..5caf84e56
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_virtio_pci.test.match
@@ -0,0 +1,19 @@
+o- bdevs ..................................................................................................................... [...]
+  o- aio ................................................................................................................ [Bdevs: 0]
+  o- error .............................................................................................................. [Bdevs: 0]
+  o- iscsi .............................................................................................................. [Bdevs: 0]
+  o- logical_volume ..................................................................................................... [Bdevs: 0]
+  o- malloc ............................................................................................................. [Bdevs: 2]
+  | o- Malloc0 ........................................................................................... [Size=32.0M, Not claimed]
+  | o- Malloc1 ........................................................................................... [Size=32.0M, Not claimed]
+  o- null ............................................................................................................... [Bdevs: 0]
+  o- nvme ............................................................................................................... [Bdevs: 0]
+  o- pmemblk ............................................................................................................ [Bdevs: 0]
+  o- raid_volume ........................................................................................................ [Bdevs: 0]
+  o- rbd ................................................................................................................ [Bdevs: 0]
+  o- split_disk ......................................................................................................... [Bdevs: 0]
+  o- virtioblk_disk ..................................................................................................... [Bdevs: 1]
+  | o- virtioblk_pci $(S) [Size=$(FP)M, Not claimed]
+  o- virtioscsi_disk .................................................................................................... [Bdevs: 1]
+    o- virtioscsi_pci ............................................................................................... [$(S)]
+      o- virtioscsi_pcit0 $(S) [Size=$(FP)M, Not claimed]
diff --git a/src/spdk/test/spdkcli/match_files/spdkcli_virtio_user.test.match b/src/spdk/test/spdkcli/match_files/spdkcli_virtio_user.test.match
new file mode 100644
index 000000000..157938e74
--- /dev/null
+++ b/src/spdk/test/spdkcli/match_files/spdkcli_virtio_user.test.match
@@ -0,0 +1,8 @@
+o- vhost ..................................................................................................................... [...]
+  o- block ................................................................................................................... [...]
+  | o- sample_block $(S) [$(S)]
+  |   o- Malloc1 ............................................................................................................. [...]
+  o- scsi .................................................................................................................... [...]
+    o- sample_scsi $(S) [$(S)]
+      o- Target_0 ............................................................................................ [LUNs: 1,TargetID: 0]
+        o- Malloc0 ........................................................................................................... [...]