nvmftests: sync upstream code cleanup

README.md

@@ -14,14 +14,14 @@ nvmftests
 
     The main objective of this framework is to have a platform in place which
     can provide :-
-        1. Classes and methods for each component in the NVMeOF subsystem.
-        2. Ability to build NVMeOF subsystem based on the configuration file.
-        3. Ability to issue sequential and parallel commands to the different
-           namespaces and controllers from the host and target side.
+    2.1. Classes and methods for each component in the NVMeOF subsystem.
+    2.2. Ability to build NVMeOF subsystem based on the configuration file.
+    2.3. Ability to issue sequential and parallel commands to the different
+         namespaces and controllers from the host and target side.
 
     All the testcases are written in python3 and nose2 format.
 
-3. Class hierarchy, design Considerations and directory structure
+3. Class hierarchy, design considerations and directory structure
 -----------------------------------------------------------------
 
     This framework follows a simple class hierarchy. Each test is a
@@ -74,7 +74,6 @@ nvmftests
             |-- shell           :- shell command related wrappers.
             |-- log             :- module logger helpers.
 
-
 4. Adding new testcases
 -----------------------
 
@@ -152,23 +151,24 @@ nvmftests
 ---------------------
 
     There are two types of config files used by the framework :-
-    1. nvmftests.json :- ($NVMFTESTSHOME/tests/config/nvmftests.json) file
-       contains the information about various testcase parameters.
-    2. loop.json :- This file is auto-generated by the test framework
-       for the target configuration based on the parameters set in the
-       nvmftests.json.
+    7.1. nvmftests.json :- ($NVMFTESTSHOME/tests/config/nvmftests.json)
+         file contains the information about various testcase parameters.
+    7.2. loop.json :- This file is auto-generated by the test framework
+         for the target configuration based on the parameters set in the
+         nvmftests.json.
 
-9. Dependencies
+8. Dependencies
 ---------------
 
-    9.1. Python( >= 3.0)
-    9.2. nose(http://nose.readthedocs.io
-    9.3. nose2(Installation guide http://nose2.readthedocs.io/)
-    9.4. pep8(https://pypi.python.org/pypi/setuptools-pep8)
-    9.5. flake8(https://pypi.python.org/pypi/flake8)
-    9.6. pylint(https://www.pylint.org/)
-    9.7. Epydoc(http://epydoc.sourceforge.net/)
-    9.8. nvme-cli(https://github.com/linux-nvme/nvme-cli.git)
+    8.1. Python(>= 3.0)
+    8.2. nose(http://nose.readthedocs.io
+    8.3. nose2(Installation guide http://nose2.readthedocs.io/)
+    8.4. pep8(https://pypi.python.org/pypi/setuptools-pep8)
+    8.5. flake8(https://pypi.python.org/pypi/flake8)
+    8.6. pylint(https://www.pylint.org/)
+    8.7. Epydoc(http://epydoc.sourceforge.net/)
+    8.8. nvme-cli(https://github.com/linux-nvme/nvme-cli.git)
+    8.9. fio(https://github.com/axboe/fio)
 
     Python package management system pip can be used to install most of the
     listed packages(https://pip.pypa.io/en/stable/installing/) :-

tests/loop.json

@@ -29,7 +29,7 @@
                 {
                     "device": {
                         "nguid": "00000000-0000-0000-0000-000000000000", 
-                        "path": "/dev/loop0"
+                        "path": "/dev/nvme0n1"
                     }, 
                     "enable": 1, 
                     "nsid": 1

tests/test_nvmf_create_pci_target.py

@@ -67,3 +67,4 @@ def test_create_pci_target(self):
         print("Now Running " + self.__class__.__name__)
         ret = self.host_subsys.config(self.target_config_file)
         assert_equal(ret, True, "ERROR : host config failed")
+        raw_input("Press enter to continue ...")

utils/__init__.py

@@ -25,7 +25,6 @@
 from .diskio import dd
 from .diskio import fio
 
-
 from .misc import Loopback
 from .misc import GenBlk
 from .misc import NVMePCIeBlk

utils/misc/generic_blk_dev.py

@@ -26,6 +26,7 @@
 
 from utils.log import Log
 
+
 class GenBlk(object):
     """
     Represents Generic BLK block devices.

utils/misc/nvme_pci.py

@@ -67,6 +67,7 @@ def init(self):
             - Returns :
                 - True on success, False on failure.
         """
+        time.sleep(1)
         ctrl = "XXX "
         try:
             dev_list = os.listdir("/dev/")