|WARNING| pw121744 [PATCH] usertools: fix python warnings

[dpdklab@iol.unh.edu]

[-- Attachment #1: Type: text/plain, Size: 4408 bytes --]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/121744

_apply patch failure_

Submitter: Stephen Hemminger <stephen@networkplumber.org>
Date: Monday, January 09 2023 17:07:38 
Applied on: CommitID:373f4c7de8ff350548cacc3d56e788461677f2c7
Apply patch set 121744 failed:

Checking patch usertools/dpdk-telemetry-client.py...
error: while searching for:

import socket
import os
import sys
import time
import argparse


error: patch failed: usertools/dpdk-telemetry-client.py:4
error: while searching for:
DEFAULT_PREFIX = 'rte'
RUNTIME_SOCKET_NAME = 'telemetry'

class Socket:

    def __init__(self):

error: patch failed: usertools/dpdk-telemetry-client.py:18
error: while searching for:
        except:
            print("Error - Sockets could not be closed")

class Client:

    def __init__(self): # Creates a client instance
        self.socket = Socket()
        self.file_path = None
        self.run_path = None

error: patch failed: usertools/dpdk-telemetry-client.py:33
error: while searching for:
    def __del__(self):
        try:
            if self.unregistered == 0:
                self.unregister();
        except:
            print("Error - Client could not be destroyed")

    def getFilepath(self, file_path): # Gets arguments from Command-Line and assigns to instance of client
        self.file_path = file_path

    def setRunpath(self, file_path):
        self.run_path = os.path.join(get_dpdk_runtime_dir(args.file_prefix),
                                     RUNTIME_SOCKET_NAME)

    def register(self): # Connects a client to DPDK-instance
        if os.path.exists(self.file_path):
            os.unlink(self.file_path)
        try:
            self.socket.recv_fd.bind(self.file_path)
        except socket.error as msg:
            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 + "\"}}")

error: patch failed: usertools/dpdk-telemetry-client.py:45
Hunk #5 succeeded at 63 (offset -12 lines).
Hunk #6 succeeded at 102 (offset -12 lines).
Applying patch usertools/dpdk-telemetry-client.py with 4 rejects...
Rejected hunk #1.
Rejected hunk #2.
Rejected hunk #3.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
diff a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py	(rejected hunks)
@@ -4,7 +4,6 @@
 
 import socket
 import os
-import sys
 import time
 import argparse
 
@@ -18,6 +17,7 @@
 DEFAULT_PREFIX = 'rte'
 RUNTIME_SOCKET_NAME = 'telemetry'
 
+
 class Socket:
 
     def __init__(self):
@@ -33,9 +33,11 @@ def __del__(self):
         except:
             print("Error - Sockets could not be closed")
 
+
 class Client:
 
-    def __init__(self): # Creates a client instance
+    def __init__(self):
+        # Creates a client instance
         self.socket = Socket()
         self.file_path = None
         self.run_path = None
@@ -45,24 +47,26 @@ def __init__(self): # Creates a client instance
     def __del__(self):
         try:
             if self.unregistered == 0:
-                self.unregister();
+                self.unregister()
         except:
             print("Error - Client could not be destroyed")
 
-    def getFilepath(self, file_path): # Gets arguments from Command-Line and assigns to instance of client
+    def getFilepath(self, file_path):
+        # Gets arguments from Command-Line and assigns to instance of client
         self.file_path = file_path
 
     def setRunpath(self, file_path):
         self.run_path = os.path.join(get_dpdk_runtime_dir(args.file_prefix),
                                      RUNTIME_SOCKET_NAME)
 
-    def register(self): # Connects a client to DPDK-instance
+    def register(self):
+        # Connects a client to DPDK-instance
         if os.path.exists(self.file_path):
             os.unlink(self.file_path)
         try:
             self.socket.recv_fd.bind(self.file_path)
         except socket.error as msg:
-            print ("Error - Socket binding error: " + str(msg) + "\n")
+            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 + "\"}}")

https://lab.dpdk.org/results/dashboard/patchsets/24925/

UNH-IOL DPDK Community Lab