DPDK patches and discussions
 help / color / mirror / Atom feed
* [PATCH 0/2] format telemetry scripts using black
@ 2025-10-17 13:56 Bruce Richardson
  2025-10-17 13:56 ` [PATCH 1/2] usertools/dpdk-telemetry: correct script formatting Bruce Richardson
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Bruce Richardson @ 2025-10-17 13:56 UTC (permalink / raw)
  To: dev; +Cc: Bruce Richardson

Run "black" tool on the dpdk-telemetry scripts to enforce coding style for python scripts.

Bruce Richardson (2):
  usertools/dpdk-telemetry: correct script formatting
  usertools/dpdk-telemetry-client: correct script formatting

 usertools/dpdk-telemetry-client.py | 49 +++++++++-------
 usertools/dpdk-telemetry.py        | 90 +++++++++++++++++-------------
 2 files changed, 79 insertions(+), 60 deletions(-)

--
2.48.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 1/2] usertools/dpdk-telemetry: correct script formatting
  2025-10-17 13:56 [PATCH 0/2] format telemetry scripts using black Bruce Richardson
@ 2025-10-17 13:56 ` Bruce Richardson
  2025-10-17 13:56 ` [PATCH 2/2] usertools/dpdk-telemetry-client: " Bruce Richardson
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Bruce Richardson @ 2025-10-17 13:56 UTC (permalink / raw)
  To: dev; +Cc: Bruce Richardson

Auto-format the dpdk-telemetry script using "black" tool, to ensure it
meets default DPDK python formatting style.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 usertools/dpdk-telemetry.py | 90 +++++++++++++++++++++----------------
 1 file changed, 51 insertions(+), 39 deletions(-)

diff --git a/usertools/dpdk-telemetry.py b/usertools/dpdk-telemetry.py
index b025f86731..d428a3b707 100755
--- a/usertools/dpdk-telemetry.py
+++ b/usertools/dpdk-telemetry.py
@@ -18,13 +18,13 @@
 
 # global vars
 TELEMETRY_VERSION = "v2"
-SOCKET_NAME = 'dpdk_telemetry.{}'.format(TELEMETRY_VERSION)
-DEFAULT_PREFIX = 'rte'
+SOCKET_NAME = "dpdk_telemetry.{}".format(TELEMETRY_VERSION)
+DEFAULT_PREFIX = "rte"
 CMDS = []
 
 
 def read_socket(sock, buf_len, echo=True, pretty=False):
-    """ Read data from socket and return it in JSON format """
+    """Read data from socket and return it in JSON format"""
     reply = sock.recv(buf_len).decode()
     try:
         ret = json.loads(reply)
@@ -39,11 +39,11 @@ def read_socket(sock, buf_len, echo=True, pretty=False):
 
 
 def get_app_name(pid):
-    """ return the app name for a given PID, for printing """
-    proc_cmdline = os.path.join('/proc', str(pid), 'cmdline')
+    """return the app name for a given PID, for printing"""
+    proc_cmdline = os.path.join("/proc", str(pid), "cmdline")
     try:
         with open(proc_cmdline) as f:
-            argv0 = f.read(1024).split('\0')[0]
+            argv0 = f.read(1024).split("\0")[0]
             return os.path.basename(argv0)
     except IOError as e:
         # ignore file not found errors
@@ -53,41 +53,40 @@ def get_app_name(pid):
 
 
 def find_sockets(path):
-    """ Find any possible sockets to connect to and return them """
-    return glob.glob(os.path.join(path, SOCKET_NAME + '*'))
+    """Find any possible sockets to connect to and return them"""
+    return glob.glob(os.path.join(path, SOCKET_NAME + "*"))
 
 
 def print_socket_options(prefix, paths):
-    """ Given a set of socket paths, give the commands needed to connect """
+    """Given a set of socket paths, give the commands needed to connect"""
     cmd = sys.argv[0]
     if prefix != DEFAULT_PREFIX:
         cmd += " -f " + prefix
     for s in sorted(paths):
         sock_name = os.path.basename(s)
         if sock_name.endswith(TELEMETRY_VERSION):
-            print("- {}  # Connect with '{}'".format(os.path.basename(s),
-                                                     cmd))
+            print("- {}  # Connect with '{}'".format(os.path.basename(s), cmd))
         else:
-            print("- {}  # Connect with '{} -i {}'".format(os.path.basename(s),
-                                                           cmd,
-                                                           s.split(':')[-1]))
+            print(
+                "- {}  # Connect with '{} -i {}'".format(os.path.basename(s), cmd, s.split(":")[-1])
+            )
 
 
 def get_dpdk_runtime_dir(fp):
-    """ Using the same logic as in DPDK's EAL, get the DPDK runtime directory
-    based on the file-prefix and user """
-    run_dir = os.environ.get('RUNTIME_DIRECTORY')
+    """Using the same logic as in DPDK's EAL, get the DPDK runtime directory
+    based on the file-prefix and user"""
+    run_dir = os.environ.get("RUNTIME_DIRECTORY")
     if not run_dir:
-        if (os.getuid() == 0):
-            run_dir = '/var/run'
+        if os.getuid() == 0:
+            run_dir = "/var/run"
         else:
-            run_dir = os.environ.get('XDG_RUNTIME_DIR', '/tmp')
-    return os.path.join(run_dir, 'dpdk', fp)
+            run_dir = os.environ.get("XDG_RUNTIME_DIR", "/tmp")
+    return os.path.join(run_dir, "dpdk", fp)
 
 
 def list_fp():
-    """ List all available file-prefixes to user """
-    path = get_dpdk_runtime_dir('')
+    """List all available file-prefixes to user"""
+    path = get_dpdk_runtime_dir("")
     sockets = glob.glob(os.path.join(path, "*", SOCKET_NAME + "*"))
     prefixes = []
     if not sockets:
@@ -98,18 +97,17 @@ def list_fp():
         prefixes.append(os.path.relpath(os.path.dirname(s), start=path))
     for p in sorted(set(prefixes)):
         print(p)
-        print_socket_options(p, glob.glob(os.path.join(path, p,
-                                                       SOCKET_NAME + "*")))
+        print_socket_options(p, glob.glob(os.path.join(path, p, SOCKET_NAME + "*")))
 
 
 def handle_socket(args, path):
-    """ Connect to socket and handle user input """
-    prompt = ''  # this evaluates to false in conditions
+    """Connect to socket and handle user input"""
+    prompt = ""  # this evaluates to false in conditions
     sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)
     global CMDS
 
     if os.isatty(sys.stdin.fileno()):
-        prompt = '--> '
+        prompt = "--> "
         print("Connecting to " + path)
     try:
         sock.connect(path)
@@ -142,7 +140,7 @@ def handle_socket(args, path):
     try:
         text = input(prompt).strip()
         while text != "quit":
-            if text.startswith('/'):
+            if text.startswith("/"):
                 sock.send(text.encode())
                 read_socket(sock, output_buf_len, pretty=prompt)
             text = input(prompt).strip()
@@ -153,8 +151,8 @@ def handle_socket(args, path):
 
 
 def readline_complete(text, state):
-    """ Find any matching commands from the list based on user input """
-    all_cmds = ['quit'] + CMDS
+    """Find any matching commands from the list based on user input"""
+    all_cmds = ["quit"] + CMDS
     if text:
         matches = [c for c in all_cmds if c.startswith(text)]
     else:
@@ -163,17 +161,31 @@ def readline_complete(text, state):
 
 
 if __name__ == "__main__":
-    readline.parse_and_bind('tab: complete')
+    readline.parse_and_bind("tab: complete")
     readline.set_completer(readline_complete)
-    readline.set_completer_delims(readline.get_completer_delims().replace('/', ''))
+    readline.set_completer_delims(readline.get_completer_delims().replace("/", ""))
 
     parser = argparse.ArgumentParser()
-    parser.add_argument('-f', '--file-prefix', default=DEFAULT_PREFIX,
-                        help='Provide file-prefix for DPDK runtime directory')
-    parser.add_argument('-i', '--instance', default='0', type=int,
-                        help='Provide instance number for DPDK application')
-    parser.add_argument('-l', '--list', action="store_true", default=False,
-                        help='List all possible file-prefixes and exit')
+    parser.add_argument(
+        "-f",
+        "--file-prefix",
+        default=DEFAULT_PREFIX,
+        help="Provide file-prefix for DPDK runtime directory",
+    )
+    parser.add_argument(
+        "-i",
+        "--instance",
+        default="0",
+        type=int,
+        help="Provide instance number for DPDK application",
+    )
+    parser.add_argument(
+        "-l",
+        "--list",
+        action="store_true",
+        default=False,
+        help="List all possible file-prefixes and exit",
+    )
     args = parser.parse_args()
     if args.list:
         list_fp()
-- 
2.48.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 2/2] usertools/dpdk-telemetry-client: correct script formatting
  2025-10-17 13:56 [PATCH 0/2] format telemetry scripts using black Bruce Richardson
  2025-10-17 13:56 ` [PATCH 1/2] usertools/dpdk-telemetry: correct script formatting Bruce Richardson
@ 2025-10-17 13:56 ` Bruce Richardson
  2025-10-17 14:19 ` [PATCH v2 0/2] format telemetry scripts using black Bruce Richardson
  2025-10-17 15:08 ` [PATCH 0/2] format telemetry scripts using black Stephen Hemminger
  3 siblings, 0 replies; 7+ messages in thread
From: Bruce Richardson @ 2025-10-17 13:56 UTC (permalink / raw)
  To: dev; +Cc: Bruce Richardson

Auto-format the dpdk-telemetry-client script using "black" tool, to
ensure it meets default DPDK python formatting style.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 usertools/dpdk-telemetry-client.py | 49 +++++++++++++++++-------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py
index e3bb1c9ee0..f65d2e0be4 100755
--- a/usertools/dpdk-telemetry-client.py
+++ b/usertools/dpdk-telemetry-client.py
@@ -9,13 +9,13 @@
 
 BUFFER_SIZE = 200000
 
-METRICS_REQ = "{\"action\":0,\"command\":\"ports_all_stat_values\",\"data\":null}"
-API_REG = "{\"action\":1,\"command\":\"clients\",\"data\":{\"client_path\":\""
-API_UNREG = "{\"action\":2,\"command\":\"clients\",\"data\":{\"client_path\":\""
-GLOBAL_METRICS_REQ = "{\"action\":0,\"command\":\"global_stat_values\",\"data\":null}"
+METRICS_REQ = '{"action":0,"command":"ports_all_stat_values","data":null}'
+API_REG = '{"action":1,"command":"clients","data":{"client_path":"'
+API_UNREG = '{"action":2,"command":"clients","data":{"client_path":"'
+GLOBAL_METRICS_REQ = '{"action":0,"command":"global_stat_values","data":null}'
 DEFAULT_FP = "/var/run/dpdk/default_client"
-DEFAULT_PREFIX = 'rte'
-RUNTIME_SOCKET_NAME = 'telemetry'
+DEFAULT_PREFIX = "rte"
+RUNTIME_SOCKET_NAME = "telemetry"
 
 
 class Socket:
@@ -56,8 +56,7 @@ def getFilepath(self, file_path):
         self.file_path = file_path
 
     def setRunpath(self, file_prefix):
-        self.run_path = os.path.join(get_dpdk_runtime_dir(file_prefix),
-                                     RUNTIME_SOCKET_NAME)
+        self.run_path = os.path.join(get_dpdk_runtime_dir(file_prefix), RUNTIME_SOCKET_NAME)
 
     def register(self):
         # Connects a client to DPDK-instance
@@ -69,7 +68,7 @@ def register(self):
             print("Error - Socket binding error: " + str(msg) + "\n")
         self.socket.recv_fd.settimeout(2)
         self.socket.send_fd.connect(self.run_path)
-        JSON = (API_REG + self.file_path + "\"}}")
+        JSON = API_REG + self.file_path + '"}}'
         self.socket.send_fd.sendall(JSON.encode())
 
         self.socket.recv_fd.listen(1)
@@ -77,7 +76,7 @@ def register(self):
 
     def unregister(self):
         # Unregister a given client
-        self.socket.client_fd.send((API_UNREG + self.file_path + "\"}}").encode())
+        self.socket.client_fd.send((API_UNREG + self.file_path + '"}}').encode())
         self.socket.client_fd.close()
 
     def requestMetrics(self):
@@ -133,25 +132,33 @@ def interactiveMenu(self, sleep_time):
 
 
 def get_dpdk_runtime_dir(fp):
-    """ Using the same logic as in DPDK's EAL, get the DPDK runtime directory
-    based on the file-prefix and user """
-    run_dir = os.environ.get('RUNTIME_DIRECTORY')
+    """Using the same logic as in DPDK's EAL, get the DPDK runtime directory
+    based on the file-prefix and user"""
+    run_dir = os.environ.get("RUNTIME_DIRECTORY")
     if not run_dir:
-        if (os.getuid() == 0):
-            run_dir = '/var/run'
+        if os.getuid() == 0:
+            run_dir = "/var/run"
         else:
-            run_dir = os.environ.get('XDG_RUNTIME_DIR', '/tmp')
-    return os.path.join(run_dir, 'dpdk', fp)
+            run_dir = os.environ.get("XDG_RUNTIME_DIR", "/tmp")
+    return os.path.join(run_dir, "dpdk", fp)
 
 
 if __name__ == "__main__":
 
     sleep_time = 1
     parser = argparse.ArgumentParser()
-    parser.add_argument('-f', '--file-prefix', default=DEFAULT_PREFIX,
-                        help='Provide file-prefix for DPDK runtime directory')
-    parser.add_argument('sock_path', nargs='?', default=DEFAULT_FP,
-                        help='Provide socket file path connected by legacy client')
+    parser.add_argument(
+        "-f",
+        "--file-prefix",
+        default=DEFAULT_PREFIX,
+        help="Provide file-prefix for DPDK runtime directory",
+    )
+    parser.add_argument(
+        "sock_path",
+        nargs="?",
+        default=DEFAULT_FP,
+        help="Provide socket file path connected by legacy client",
+    )
     args = parser.parse_args()
 
     client = Client()
-- 
2.48.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 0/2] format telemetry scripts using black
  2025-10-17 13:56 [PATCH 0/2] format telemetry scripts using black Bruce Richardson
  2025-10-17 13:56 ` [PATCH 1/2] usertools/dpdk-telemetry: correct script formatting Bruce Richardson
  2025-10-17 13:56 ` [PATCH 2/2] usertools/dpdk-telemetry-client: " Bruce Richardson
@ 2025-10-17 14:19 ` Bruce Richardson
  2025-10-17 14:19   ` [PATCH v2 1/2] usertools/dpdk-telemetry.py: correct script formatting Bruce Richardson
  2025-10-17 14:19   ` [PATCH v2 2/2] usertools/dpdk-telemetry-client: " Bruce Richardson
  2025-10-17 15:08 ` [PATCH 0/2] format telemetry scripts using black Stephen Hemminger
  3 siblings, 2 replies; 7+ messages in thread
From: Bruce Richardson @ 2025-10-17 14:19 UTC (permalink / raw)
  To: dev; +Cc: Bruce Richardson

Run "black" tool on the dpdk-telemetry scripts to enforce coding style
for python scripts.

V2:
* use correct baseline of "main" for patches

Bruce Richardson (2):
  usertools/dpdk-telemetry.py: correct script formatting
  usertools/dpdk-telemetry-client: correct script formatting

 usertools/dpdk-telemetry-client.py | 49 +++++++++--------
 usertools/dpdk-telemetry.py        | 86 ++++++++++++++++--------------
 2 files changed, 75 insertions(+), 60 deletions(-)

--
2.48.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 1/2] usertools/dpdk-telemetry.py: correct script formatting
  2025-10-17 14:19 ` [PATCH v2 0/2] format telemetry scripts using black Bruce Richardson
@ 2025-10-17 14:19   ` Bruce Richardson
  2025-10-17 14:19   ` [PATCH v2 2/2] usertools/dpdk-telemetry-client: " Bruce Richardson
  1 sibling, 0 replies; 7+ messages in thread
From: Bruce Richardson @ 2025-10-17 14:19 UTC (permalink / raw)
  To: dev; +Cc: Bruce Richardson

Auto-format the dpdk-telemetry script using "black" tool, to ensure it
meets default DPDK python formatting style. Allow line lengths up to 100
chars rather than default 88.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 usertools/dpdk-telemetry.py | 86 ++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 39 deletions(-)

diff --git a/usertools/dpdk-telemetry.py b/usertools/dpdk-telemetry.py
index 568f222a03..09258a1f7e 100755
--- a/usertools/dpdk-telemetry.py
+++ b/usertools/dpdk-telemetry.py
@@ -18,13 +18,13 @@
 
 # global vars
 TELEMETRY_VERSION = "v2"
-SOCKET_NAME = 'dpdk_telemetry.{}'.format(TELEMETRY_VERSION)
-DEFAULT_PREFIX = 'rte'
+SOCKET_NAME = "dpdk_telemetry.{}".format(TELEMETRY_VERSION)
+DEFAULT_PREFIX = "rte"
 CMDS = []
 
 
 def read_socket(sock, buf_len, echo=True, pretty=False):
-    """ Read data from socket and return it in JSON format """
+    """Read data from socket and return it in JSON format"""
     reply = sock.recv(buf_len).decode()
     try:
         ret = json.loads(reply)
@@ -39,11 +39,11 @@ def read_socket(sock, buf_len, echo=True, pretty=False):
 
 
 def get_app_name(pid):
-    """ return the app name for a given PID, for printing """
-    proc_cmdline = os.path.join('/proc', str(pid), 'cmdline')
+    """return the app name for a given PID, for printing"""
+    proc_cmdline = os.path.join("/proc", str(pid), "cmdline")
     try:
         with open(proc_cmdline) as f:
-            argv0 = f.read(1024).split('\0')[0]
+            argv0 = f.read(1024).split("\0")[0]
             return os.path.basename(argv0)
     except IOError as e:
         # ignore file not found errors
@@ -53,41 +53,40 @@ def get_app_name(pid):
 
 
 def find_sockets(path):
-    """ Find any possible sockets to connect to and return them """
-    return glob.glob(os.path.join(path, SOCKET_NAME + '*'))
+    """Find any possible sockets to connect to and return them"""
+    return glob.glob(os.path.join(path, SOCKET_NAME + "*"))
 
 
 def print_socket_options(prefix, paths):
-    """ Given a set of socket paths, give the commands needed to connect """
+    """Given a set of socket paths, give the commands needed to connect"""
     cmd = sys.argv[0]
     if prefix != DEFAULT_PREFIX:
         cmd += " -f " + prefix
     for s in sorted(paths):
         sock_name = os.path.basename(s)
         if sock_name.endswith(TELEMETRY_VERSION):
-            print("- {}  # Connect with '{}'".format(os.path.basename(s),
-                                                     cmd))
+            print("- {}  # Connect with '{}'".format(os.path.basename(s), cmd))
         else:
-            print("- {}  # Connect with '{} -i {}'".format(os.path.basename(s),
-                                                           cmd,
-                                                           s.split(':')[-1]))
+            print(
+                "- {}  # Connect with '{} -i {}'".format(os.path.basename(s), cmd, s.split(":")[-1])
+            )
 
 
 def get_dpdk_runtime_dir(fp):
-    """ Using the same logic as in DPDK's EAL, get the DPDK runtime directory
-    based on the file-prefix and user """
-    run_dir = os.environ.get('RUNTIME_DIRECTORY')
+    """Using the same logic as in DPDK's EAL, get the DPDK runtime directory
+    based on the file-prefix and user"""
+    run_dir = os.environ.get("RUNTIME_DIRECTORY")
     if not run_dir:
-        if (os.getuid() == 0):
-            run_dir = '/var/run'
+        if os.getuid() == 0:
+            run_dir = "/var/run"
         else:
-            run_dir = os.environ.get('XDG_RUNTIME_DIR', '/tmp')
-    return os.path.join(run_dir, 'dpdk', fp)
+            run_dir = os.environ.get("XDG_RUNTIME_DIR", "/tmp")
+    return os.path.join(run_dir, "dpdk", fp)
 
 
 def list_fp():
-    """ List all available file-prefixes to user """
-    path = get_dpdk_runtime_dir('')
+    """List all available file-prefixes to user"""
+    path = get_dpdk_runtime_dir("")
     sockets = glob.glob(os.path.join(path, "*", SOCKET_NAME + "*"))
     prefixes = []
     if not sockets:
@@ -98,18 +97,17 @@ def list_fp():
         prefixes.append(os.path.relpath(os.path.dirname(s), start=path))
     for p in sorted(set(prefixes)):
         print(p)
-        print_socket_options(p, glob.glob(os.path.join(path, p,
-                                                       SOCKET_NAME + "*")))
+        print_socket_options(p, glob.glob(os.path.join(path, p, SOCKET_NAME + "*")))
 
 
 def handle_socket(args, path):
-    """ Connect to socket and handle user input """
-    prompt = ''  # this evaluates to false in conditions
+    """Connect to socket and handle user input"""
+    prompt = ""  # this evaluates to false in conditions
     sock = socket.socket(socket.AF_UNIX, socket.SOCK_SEQPACKET)
     global CMDS
 
     if os.isatty(sys.stdin.fileno()):
-        prompt = '--> '
+        prompt = "--> "
         print("Connecting to " + path)
     try:
         sock.connect(path)
@@ -142,7 +140,7 @@ def handle_socket(args, path):
     try:
         text = input(prompt).strip()
         while text != "quit":
-            if text.startswith('/'):
+            if text.startswith("/"):
                 sock.send(text.encode())
                 read_socket(sock, output_buf_len, pretty=prompt)
             text = input(prompt).strip()
@@ -153,8 +151,8 @@ def handle_socket(args, path):
 
 
 def readline_complete(text, state):
-    """ Find any matching commands from the list based on user input """
-    all_cmds = ['quit'] + CMDS
+    """Find any matching commands from the list based on user input"""
+    all_cmds = ["quit"] + CMDS
     if text:
         matches = [c for c in all_cmds if c.startswith(text)]
     else:
@@ -162,17 +160,27 @@ def readline_complete(text, state):
     return matches[state]
 
 
-readline.parse_and_bind('tab: complete')
+readline.parse_and_bind("tab: complete")
 readline.set_completer(readline_complete)
-readline.set_completer_delims(readline.get_completer_delims().replace('/', ''))
+readline.set_completer_delims(readline.get_completer_delims().replace("/", ""))
 
 parser = argparse.ArgumentParser()
-parser.add_argument('-f', '--file-prefix', default=DEFAULT_PREFIX,
-                    help='Provide file-prefix for DPDK runtime directory')
-parser.add_argument('-i', '--instance', default='0', type=int,
-                    help='Provide instance number for DPDK application')
-parser.add_argument('-l', '--list', action="store_true", default=False,
-                    help='List all possible file-prefixes and exit')
+parser.add_argument(
+    "-f",
+    "--file-prefix",
+    default=DEFAULT_PREFIX,
+    help="Provide file-prefix for DPDK runtime directory",
+)
+parser.add_argument(
+    "-i", "--instance", default="0", type=int, help="Provide instance number for DPDK application"
+)
+parser.add_argument(
+    "-l",
+    "--list",
+    action="store_true",
+    default=False,
+    help="List all possible file-prefixes and exit",
+)
 args = parser.parse_args()
 if args.list:
     list_fp()
-- 
2.48.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 2/2] usertools/dpdk-telemetry-client: correct script formatting
  2025-10-17 14:19 ` [PATCH v2 0/2] format telemetry scripts using black Bruce Richardson
  2025-10-17 14:19   ` [PATCH v2 1/2] usertools/dpdk-telemetry.py: correct script formatting Bruce Richardson
@ 2025-10-17 14:19   ` Bruce Richardson
  1 sibling, 0 replies; 7+ messages in thread
From: Bruce Richardson @ 2025-10-17 14:19 UTC (permalink / raw)
  To: dev; +Cc: Bruce Richardson

Auto-format the dpdk-telemetry-client script using "black" tool, to
ensure it meets default DPDK python formatting style.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 usertools/dpdk-telemetry-client.py | 49 +++++++++++++++++-------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py
index e3bb1c9ee0..f65d2e0be4 100755
--- a/usertools/dpdk-telemetry-client.py
+++ b/usertools/dpdk-telemetry-client.py
@@ -9,13 +9,13 @@
 
 BUFFER_SIZE = 200000
 
-METRICS_REQ = "{\"action\":0,\"command\":\"ports_all_stat_values\",\"data\":null}"
-API_REG = "{\"action\":1,\"command\":\"clients\",\"data\":{\"client_path\":\""
-API_UNREG = "{\"action\":2,\"command\":\"clients\",\"data\":{\"client_path\":\""
-GLOBAL_METRICS_REQ = "{\"action\":0,\"command\":\"global_stat_values\",\"data\":null}"
+METRICS_REQ = '{"action":0,"command":"ports_all_stat_values","data":null}'
+API_REG = '{"action":1,"command":"clients","data":{"client_path":"'
+API_UNREG = '{"action":2,"command":"clients","data":{"client_path":"'
+GLOBAL_METRICS_REQ = '{"action":0,"command":"global_stat_values","data":null}'
 DEFAULT_FP = "/var/run/dpdk/default_client"
-DEFAULT_PREFIX = 'rte'
-RUNTIME_SOCKET_NAME = 'telemetry'
+DEFAULT_PREFIX = "rte"
+RUNTIME_SOCKET_NAME = "telemetry"
 
 
 class Socket:
@@ -56,8 +56,7 @@ def getFilepath(self, file_path):
         self.file_path = file_path
 
     def setRunpath(self, file_prefix):
-        self.run_path = os.path.join(get_dpdk_runtime_dir(file_prefix),
-                                     RUNTIME_SOCKET_NAME)
+        self.run_path = os.path.join(get_dpdk_runtime_dir(file_prefix), RUNTIME_SOCKET_NAME)
 
     def register(self):
         # Connects a client to DPDK-instance
@@ -69,7 +68,7 @@ def register(self):
             print("Error - Socket binding error: " + str(msg) + "\n")
         self.socket.recv_fd.settimeout(2)
         self.socket.send_fd.connect(self.run_path)
-        JSON = (API_REG + self.file_path + "\"}}")
+        JSON = API_REG + self.file_path + '"}}'
         self.socket.send_fd.sendall(JSON.encode())
 
         self.socket.recv_fd.listen(1)
@@ -77,7 +76,7 @@ def register(self):
 
     def unregister(self):
         # Unregister a given client
-        self.socket.client_fd.send((API_UNREG + self.file_path + "\"}}").encode())
+        self.socket.client_fd.send((API_UNREG + self.file_path + '"}}').encode())
         self.socket.client_fd.close()
 
     def requestMetrics(self):
@@ -133,25 +132,33 @@ def interactiveMenu(self, sleep_time):
 
 
 def get_dpdk_runtime_dir(fp):
-    """ Using the same logic as in DPDK's EAL, get the DPDK runtime directory
-    based on the file-prefix and user """
-    run_dir = os.environ.get('RUNTIME_DIRECTORY')
+    """Using the same logic as in DPDK's EAL, get the DPDK runtime directory
+    based on the file-prefix and user"""
+    run_dir = os.environ.get("RUNTIME_DIRECTORY")
     if not run_dir:
-        if (os.getuid() == 0):
-            run_dir = '/var/run'
+        if os.getuid() == 0:
+            run_dir = "/var/run"
         else:
-            run_dir = os.environ.get('XDG_RUNTIME_DIR', '/tmp')
-    return os.path.join(run_dir, 'dpdk', fp)
+            run_dir = os.environ.get("XDG_RUNTIME_DIR", "/tmp")
+    return os.path.join(run_dir, "dpdk", fp)
 
 
 if __name__ == "__main__":
 
     sleep_time = 1
     parser = argparse.ArgumentParser()
-    parser.add_argument('-f', '--file-prefix', default=DEFAULT_PREFIX,
-                        help='Provide file-prefix for DPDK runtime directory')
-    parser.add_argument('sock_path', nargs='?', default=DEFAULT_FP,
-                        help='Provide socket file path connected by legacy client')
+    parser.add_argument(
+        "-f",
+        "--file-prefix",
+        default=DEFAULT_PREFIX,
+        help="Provide file-prefix for DPDK runtime directory",
+    )
+    parser.add_argument(
+        "sock_path",
+        nargs="?",
+        default=DEFAULT_FP,
+        help="Provide socket file path connected by legacy client",
+    )
     args = parser.parse_args()
 
     client = Client()
-- 
2.48.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 0/2] format telemetry scripts using black
  2025-10-17 13:56 [PATCH 0/2] format telemetry scripts using black Bruce Richardson
                   ` (2 preceding siblings ...)
  2025-10-17 14:19 ` [PATCH v2 0/2] format telemetry scripts using black Bruce Richardson
@ 2025-10-17 15:08 ` Stephen Hemminger
  3 siblings, 0 replies; 7+ messages in thread
From: Stephen Hemminger @ 2025-10-17 15:08 UTC (permalink / raw)
  To: Bruce Richardson; +Cc: dev

On Fri, 17 Oct 2025 14:56:20 +0100
Bruce Richardson <bruce.richardson@intel.com> wrote:

> Run "black" tool on the dpdk-telemetry scripts to enforce coding style for python scripts.
> 
> Bruce Richardson (2):
>   usertools/dpdk-telemetry: correct script formatting
>   usertools/dpdk-telemetry-client: correct script formatting
> 
>  usertools/dpdk-telemetry-client.py | 49 +++++++++-------
>  usertools/dpdk-telemetry.py        | 90 +++++++++++++++++-------------
>  2 files changed, 79 insertions(+), 60 deletions(-)
> 
> --
> 2.48.1
> 

Looks good
Series-Acked-by: Stephen Hemminger <stephen@networkplumber.org>

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2025-10-17 15:08 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-17 13:56 [PATCH 0/2] format telemetry scripts using black Bruce Richardson
2025-10-17 13:56 ` [PATCH 1/2] usertools/dpdk-telemetry: correct script formatting Bruce Richardson
2025-10-17 13:56 ` [PATCH 2/2] usertools/dpdk-telemetry-client: " Bruce Richardson
2025-10-17 14:19 ` [PATCH v2 0/2] format telemetry scripts using black Bruce Richardson
2025-10-17 14:19   ` [PATCH v2 1/2] usertools/dpdk-telemetry.py: correct script formatting Bruce Richardson
2025-10-17 14:19   ` [PATCH v2 2/2] usertools/dpdk-telemetry-client: " Bruce Richardson
2025-10-17 15:08 ` [PATCH 0/2] format telemetry scripts using black Stephen Hemminger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).