unittest_blkdev: more tests!

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/test/common/test_blkdev.cc b/src/test/common/test_blkdev.cc
index d750ac5999f4c990d00078badc1ed1086d9a9443..d54c5a0aac78ee9b72b547a846abf7aa049117b8 100644 (file)
--- a/src/test/common/test_blkdev.cc
+++ b/src/test/common/test_blkdev.cc
@@ -1,7 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <iostream>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -10,6 +9,9 @@
 #include "common/blkdev.h"
 
 #include "gtest/gtest.h"
+#include <iostream>
+
+  using namespace std;
 
 TEST(blkdev, get_block_device_base) {
   char buf[PATH_MAX*2];
@@ -83,3 +85,44 @@ TEST(blkdev, get_block_device_base) {
     closedir(dir);
   }
 }
+
+TEST(blkdev, device_model)
+{
+  const char* env = getenv("CEPH_ROOT");
+  ASSERT_NE(env, nullptr) << "Environment Variable CEPH_ROOT not found!";
+  string root = string(env) + "/src/test/common/test_blkdev_sys_block";
+  set_block_device_sandbox_dir(root.c_str());
+
+  char model[1000] = {0};
+  block_device_model("sda", model, sizeof(model));
+  printf("model '%s'\n", model);
+  ASSERT_EQ(strcmp(model, "myfancymodel"), 0);
+}
+
+TEST(blkdev, get_block_device_string_property)
+{
+  const char* env = getenv("CEPH_ROOT");
+  ASSERT_NE(env, nullptr) << "Environment Variable CEPH_ROOT not found!";
+  string root = string(env) + "/src/test/common/test_blkdev_sys_block";
+  set_block_device_sandbox_dir(root.c_str());
+
+  char val[1000] = {0};
+  int rc = get_block_device_string_property("sda", "device/model",
+                                           val, sizeof(val));
+  ASSERT_EQ(0, rc);
+  printf("val '%s'\n", val);
+  ASSERT_EQ(strcmp(val, "myfancymodel"), 0);
+}
+
+TEST(blkdev, is_rotational)
+{
+  const char* env = getenv("CEPH_ROOT");
+  ASSERT_NE(env, nullptr) << "Environment Variable CEPH_ROOT not found!";
+  string root = string(env) + "/src/test/common/test_blkdev_sys_block";
+  set_block_device_sandbox_dir(root.c_str());
+
+  ASSERT_FALSE(block_device_is_rotational("sda"));
+  ASSERT_TRUE(block_device_is_rotational("sdb"));
+}
+
+

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sda/device/model b/src/test/common/test_blkdev_sys_block/sys/block/sda/device/model
new file mode 100644 (file)
index 0000000..892d30d
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sda/device/model
@@ -0,0 +1 @@
+myfancymodel

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/bar b/src/test/common/test_blkdev_sys_block/sys/block/sdb/bar
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/dev b/src/test/common/test_blkdev_sys_block/sys/block/sdb/dev
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/device/model b/src/test/common/test_blkdev_sys_block/sys/block/sdb/device/model
new file mode 100644 (file)
index 0000000..892d30d
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/device/model
@@ -0,0 +1 @@
+myfancymodel

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/foo b/src/test/common/test_blkdev_sys_block/sys/block/sdb/foo
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/add_random b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/add_random
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/add_random
@@ -0,0 +1 @@
+1

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_granularity b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_granularity
new file mode 100644 (file)
index 0000000..4d0e90c
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_granularity
@@ -0,0 +1 @@
+512

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_max_bytes b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_max_bytes
new file mode 100644 (file)
index 0000000..eba4c7c
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_max_bytes
@@ -0,0 +1 @@
+2147450880

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_zeroes_data b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_zeroes_data
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/discard_zeroes_data
@@ -0,0 +1 @@
+1

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/hw_sector_size b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/hw_sector_size
new file mode 100644 (file)
index 0000000..4d0e90c
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/hw_sector_size
@@ -0,0 +1 @@
+512

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/fifo_batch b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/fifo_batch
new file mode 100644 (file)
index 0000000..b6a7d89
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/fifo_batch
@@ -0,0 +1 @@
+16

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/front_merges b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/front_merges
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/front_merges
@@ -0,0 +1 @@
+1

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/read_expire b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/read_expire
new file mode 100644 (file)
index 0000000..1b79f38
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/read_expire
@@ -0,0 +1 @@
+500

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/write_expire b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/write_expire
new file mode 100644 (file)
index 0000000..e9c02da
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/write_expire
@@ -0,0 +1 @@
+5000

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/writes_starved b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/writes_starved
new file mode 100644 (file)
index 0000000..0cfbf08
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iosched/writes_starved
@@ -0,0 +1 @@
+2

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iostats b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iostats
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/iostats
@@ -0,0 +1 @@
+1

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/logical_block_size b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/logical_block_size
new file mode 100644 (file)
index 0000000..4d0e90c
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/logical_block_size
@@ -0,0 +1 @@
+512

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_hw_sectors_kb b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_hw_sectors_kb
new file mode 100644 (file)
index 0000000..10130bb
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_hw_sectors_kb
@@ -0,0 +1 @@
+32767

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_integrity_segments b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_integrity_segments
new file mode 100644 (file)
index 0000000..573541a
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_integrity_segments
@@ -0,0 +1 @@
+0

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_sectors_kb b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_sectors_kb
new file mode 100644 (file)
index 0000000..4d0e90c
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_sectors_kb
@@ -0,0 +1 @@
+512

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_segment_size b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_segment_size
new file mode 100644 (file)
index 0000000..e2ed8f4
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_segment_size
@@ -0,0 +1 @@
+65536

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_segments b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_segments
new file mode 100644 (file)
index 0000000..de8febe
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/max_segments
@@ -0,0 +1 @@
+168

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/minimum_io_size b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/minimum_io_size
new file mode 100644 (file)
index 0000000..4d0e90c
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/minimum_io_size
@@ -0,0 +1 @@
+512

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/nomerges b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/nomerges
new file mode 100644 (file)
index 0000000..573541a
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/nomerges
@@ -0,0 +1 @@
+0

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/nr_requests b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/nr_requests
new file mode 100644 (file)
index 0000000..a949a93
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/nr_requests
@@ -0,0 +1 @@
+128

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/optimal_io_size b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/optimal_io_size
new file mode 100644 (file)
index 0000000..573541a
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/optimal_io_size
@@ -0,0 +1 @@
+0

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/physical_block_size b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/physical_block_size
new file mode 100644 (file)
index 0000000..4d0e90c
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/physical_block_size
@@ -0,0 +1 @@
+512

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/queue b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/queue
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/queue
@@ -0,0 +1 @@
+1

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/read_ahead_kb b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/read_ahead_kb
new file mode 100644 (file)
index 0000000..a949a93
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/read_ahead_kb
@@ -0,0 +1 @@
+128

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/rotational b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/rotational
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/rotational
@@ -0,0 +1 @@
+1

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/rq_affinity b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/rq_affinity
new file mode 100644 (file)
index 0000000..d00491f
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/rq_affinity
@@ -0,0 +1 @@
+1

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/scheduler b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/scheduler
new file mode 100644 (file)
index 0000000..7b940d8
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/scheduler
@@ -0,0 +1 @@
+noop [deadline] cfq 

diff --git a/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/write_same_max_bytes b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/write_same_max_bytes
new file mode 100644 (file)
index 0000000..573541a
--- /dev/null
+++ b/src/test/common/test_blkdev_sys_block/sys/block/sdb/queue/write_same_max_bytes
@@ -0,0 +1 @@
+0