X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FDPDK%2FDPDKTools.py;h=ecb23fb4c3b62d106ad9d0b3b13dbeb7210d1e44;hp=d7a780b223ff685620910b90c9c9e65d5f6b3779;hb=d68951ac245150eeefa6e0f4156e4c1b5c9e9325;hpb=ed0258a440cfad7023d643f717ab78ac568dc59b

diff --git a/resources/libraries/python/DPDK/DPDKTools.py b/resources/libraries/python/DPDK/DPDKTools.py
index d7a780b223..ecb23fb4c3 100644
--- a/resources/libraries/python/DPDK/DPDKTools.py
+++ b/resources/libraries/python/DPDK/DPDKTools.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -16,12 +16,12 @@
 
 from robot.api import logger
 
-from resources.libraries.python.ssh import SSH, exec_cmd_no_error
 from resources.libraries.python.Constants import Constants
+from resources.libraries.python.ssh import SSH, exec_cmd_no_error
 from resources.libraries.python.topology import NodeType, Topology
 
 
-class DPDKTools(object):
+class DPDKTools:
     """This class implements:
     - Initialization of DPDK environment,
     - Cleanup of DPDK environment.
@@ -41,7 +41,7 @@ class DPDKTools(object):
         :type dut_if2: str
         :raises RuntimeError: If it fails to bind the interfaces to igb_uio.
         """
-        if dut_node['type'] == NodeType.DUT:
+        if dut_node[u"type"] == NodeType.DUT:
             pci_address1 = Topology.get_interface_pci_addr(dut_node, dut_if1)
             pci_address2 = Topology.get_interface_pci_addr(dut_node, dut_if2)
 
@@ -49,17 +49,15 @@ class DPDKTools(object):
             ssh.connect(dut_node)
 
             arch = Topology.get_node_arch(dut_node)
-            cmd = '{fwdir}/tests/dpdk/dpdk_scripts/init_dpdk.sh '\
-                  '{pci1} {pci2} {arch}'.format(fwdir=Constants.REMOTE_FW_DIR,
-                                                pci1=pci_address1,
-                                                pci2=pci_address2,
-                                                arch=arch)
+            cmd = f"{Constants.REMOTE_FW_DIR}/tests/dpdk/dpdk_scripts" \
+                f"/init_dpdk.sh {pci_address1} {pci_address2} {arch}"
 
             ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600)
             if ret_code != 0:
-                raise RuntimeError('Failed to bind the interfaces to igb_uio '
-                                   'at node {name}'.\
-                                    format(name=dut_node['host']))
+                raise RuntimeError(
+                    f"Failed to bind the interfaces to igb_uio at node "
+                    f"{dut_node['host']}"
+                )
 
     @staticmethod
     def cleanup_dpdk_environment(dut_node, dut_if1, dut_if2):
@@ -75,7 +73,7 @@ class DPDKTools(object):
         :type dut_if2: str
         :raises RuntimeError: If it fails to cleanup the dpdk.
         """
-        if dut_node['type'] == NodeType.DUT:
+        if dut_node[u"type"] == NodeType.DUT:
             pci_address1 = Topology.get_interface_pci_addr(dut_node, dut_if1)
             if1_driver = Topology.get_interface_driver(dut_node, dut_if1)
             pci_address2 = Topology.get_interface_pci_addr(dut_node, dut_if2)
@@ -84,15 +82,15 @@ class DPDKTools(object):
             ssh = SSH()
             ssh.connect(dut_node)
 
-            cmd = '{fwdir}/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh ' \
-                  '{drv1} {pci1} {drv2} {pci2}'.\
-                  format(fwdir=Constants.REMOTE_FW_DIR, drv1=if1_driver,
-                         pci1=pci_address1, drv2=if2_driver, pci2=pci_address2)
+            cmd = f"{Constants.REMOTE_FW_DIR}/tests/dpdk/dpdk_scripts" \
+                f"/cleanup_dpdk.sh {if1_driver} {pci_address1} {if2_driver} " \
+                f"{pci_address2}"
 
             ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600)
             if ret_code != 0:
-                raise RuntimeError('Failed to cleanup the dpdk at node {name}'.
-                                   format(name=dut_node['host']))
+                raise RuntimeError(
+                    f"Failed to cleanup the dpdk at node {dut_node[u'host']}"
+                )
 
     @staticmethod
     def install_dpdk_test(node):
@@ -106,17 +104,16 @@ class DPDKTools(object):
         """
         arch = Topology.get_node_arch(node)
 
-        command = ('{fwdir}/tests/dpdk/dpdk_scripts/install_dpdk.sh {arch}'.
-                   format(fwdir=Constants.REMOTE_FW_DIR, arch=arch))
-        message = 'Install the DPDK failed!'
+        command = f"{Constants.REMOTE_FW_DIR}/tests/dpdk/dpdk_scripts" \
+            f"/install_dpdk.sh {arch}"
+        message = u"Install the DPDK failed!"
         exec_cmd_no_error(node, command, timeout=600, message=message)
 
-        command = ('cat {fwdir}/dpdk*/VERSION'.
-                   format(fwdir=Constants.REMOTE_FW_DIR))
-        message = 'Get DPDK version failed!'
+        command = f"cat {Constants.REMOTE_FW_DIR}/dpdk*/VERSION"
+        message = u"Get DPDK version failed!"
         stdout, _ = exec_cmd_no_error(node, command, message=message)
 
-        logger.info('DPDK Version: {version}'.format(version=stdout))
+        logger.info(f"DPDK Version: {stdout}")
 
     @staticmethod
     def install_dpdk_test_on_all_duts(nodes):
@@ -127,6 +124,6 @@ class DPDKTools(object):
         :type nodes: dict
         :returns: nothing
         """
-        for node in nodes.values():
-            if node['type'] == NodeType.DUT:
+        for node in list(nodes.values()):
+            if node[u"type"] == NodeType.DUT:
                 DPDKTools.install_dpdk_test(node)