X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDUTSetup.py;h=16acfba7adbc7de8bc14bea4a4ddf4267e907438;hp=504022381e4696355d17a07f41e3b9b56c2e585b;hb=6b86c6fa1315f5c12c55bdd289b4e2af7d710c39;hpb=7d849ba64e10b8a7678845ee1dcc091e125dd124 diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index 504022381e..16acfba7ad 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -408,11 +408,11 @@ class DUTSetup: # sriov is not supported and we want 0 VFs # no need to do anything return - else: - raise RuntimeError( - f"Can't configure {numvfs} VFs on {pf_pci_addr} device " - f"on {node[u'host']} since it doesn't support SR-IOV." - ) + + raise RuntimeError( + f"Can't configure {numvfs} VFs on {pf_pci_addr} device " + f"on {node[u'host']} since it doesn't support SR-IOV." + ) pci = pf_pci_addr.replace(u":", r"\:") command = f"sh -c \"echo {numvfs} | " \ @@ -572,10 +572,9 @@ class DUTSetup: # the directory doesn't exist which means the device is not bound # to any driver return None - else: - cmd = f"basename $(readlink -f {driver_path})" - ret_val, _ = exec_cmd_no_error(node, cmd) - return ret_val.strip() + cmd = f"basename $(readlink -f {driver_path})" + ret_val, _ = exec_cmd_no_error(node, cmd) + return ret_val.strip() @staticmethod def verify_kernel_module(node, module, force_load=False): @@ -677,7 +676,7 @@ class DUTSetup: ) # workaround to avoid installation of vpp-api-python exec_cmd_no_error( - node, u"rm -f {vpp_pkg_dir}vpp-api-python.deb", + node, f"rm -f {vpp_pkg_dir}vpp-api-python.deb", timeout=120, sudo=True ) exec_cmd_no_error( @@ -694,7 +693,7 @@ class DUTSetup: ) # workaround to avoid installation of vpp-api-python exec_cmd_no_error( - node, u"rm -f {vpp_pkg_dir}vpp-api-python.rpm", + node, f"rm -f {vpp_pkg_dir}vpp-api-python.rpm", timeout=120, sudo=True ) exec_cmd_no_error(