When running the dpdk-telemetry-client.py with python 3, we get the
following syntax errors:
File "usertools/dpdk-telemetry-client.py", line 70
print "\nResponse: \n", str(data)
^
SyntaxError: invalid syntax
File "usertools/dpdk-telemetry-client.py", line 93
print "\nResponse: \n", str(data)
^
SyntaxError: invalid syntax
File "usertools/dpdk-telemetry-client.py", line 111
file_path = sys.argv[1]
^
TabError: inconsistent use of tabs and spaces in indentation
Import print_function from __future__ and add parentheses where missing.
Also, use spaces for indentation everywhere.
Fixes: d1b94da4a4e0 ("usertools: add client script for telemetry")
Fixes: 53f293c9a783 ("usertools: replace unsafe input function")
Fixes: 4080e46c8078 ("telemetry: support global metrics")
Cc: Andrius Sirvys <[email protected]>
Cc: Ciara Power <[email protected]>
Cc: Kevin Laatz <[email protected]>
Cc: Reshma Pattan <[email protected]>
Cc: [email protected]
Signed-off-by: Robin Jarry <[email protected]>
---
usertools/dpdk-telemetry-client.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/usertools/dpdk-telemetry-client.py
b/usertools/dpdk-telemetry-client.py
index 60fe97af79a8..e06d6306cbd5 100755
--- a/usertools/dpdk-telemetry-client.py
+++ b/usertools/dpdk-telemetry-client.py
@@ -2,6 +2,8 @@
# SPDK-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+from __future__ import print_function
+
import socket
import os
import sys
@@ -16,9 +18,9 @@
DEFAULT_FP = "/var/run/dpdk/default_client"
try:
- raw_input # Python 2
+ raw_input # Python 2
except NameError:
- raw_input = input # Python 3
+ raw_input = input # Python 3
class Socket:
@@ -74,7 +76,7 @@ def unregister(self): # Unregister a given client
def requestMetrics(self): # Requests metrics for given client
self.socket.client_fd.send(METRICS_REQ)
data = self.socket.client_fd.recv(BUFFER_SIZE)
- print "\nResponse: \n", str(data)
+ print("\nResponse: \n", str(data))
def repeatedlyRequestMetrics(self, sleep_time): # Recursively requests
metrics for given client
print("\nPlease enter the number of times you'd like to continuously
request Metrics:")
@@ -88,7 +90,7 @@ def repeatedlyRequestMetrics(self, sleep_time): # Recursively
requests metrics f
def requestGlobalMetrics(self): #Requests global metrics for given client
self.socket.client_fd.send(GLOBAL_METRICS_REQ)
data = self.socket.client_fd.recv(BUFFER_SIZE)
- print "\nResponse: \n", str(data)
+ print("\nResponse: \n", str(data))
def interactiveMenu(self, sleep_time): # Creates Interactive menu within
the script
while self.choice != 4:
@@ -121,10 +123,10 @@ def interactiveMenu(self, sleep_time): # Creates
Interactive menu within the scr
sleep_time = 1
file_path = ""
if (len(sys.argv) == 2):
- file_path = sys.argv[1]
+ file_path = sys.argv[1]
else:
print("Warning - No filepath passed, using default (" + DEFAULT_FP +
").")
- file_path = DEFAULT_FP
+ file_path = DEFAULT_FP
client = Client()
client.getFilepath(file_path)
client.register()
--
2.23.0