import 15.2.5

[ceph.git] / ceph / src / python-common / ceph / tests / utils.py

diff --git a/ceph/src/python-common/ceph/tests/utils.py b/ceph/src/python-common/ceph/tests/utils.py
index ebba43094bc10451044d7d459c366753d80d7fde..04b8a4e38955425441d5b80d2c8dbb6f71b2d6a1 100644 (file)
--- a/ceph/src/python-common/ceph/tests/utils.py
+++ b/ceph/src/python-common/ceph/tests/utils.py
@@ -8,12 +8,14 @@ except ImportError:
 
 def _mk_device(rotational=True,
                locked=False,
-               size="394.27 GB"):
+               size="394.27 GB",
+               vendor='Vendor',
+               model='Model'):
     return [Device(
         path='??',
         sys_api={
             "rotational": '1' if rotational else '0',
-            "vendor": "Vendor",
+            "vendor": vendor,
             "human_readable_size": size,
             "partitions": {},
             "locked": int(locked),
@@ -21,7 +23,7 @@ def _mk_device(rotational=True,
             "removable": "0",
             "path": "??",
             "support_discard": "",
-            "model": "Model",
+            "model": model,
             "ro": "0",
             "nr_requests": "128",
             "size": 423347879936  # ignore coversion from human_readable_size