git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/i40e: fix bitmap free
[dpdk.git]
/
usertools
/
dpdk-telemetry-client.py
diff --git
a/usertools/dpdk-telemetry-client.py
b/usertools/dpdk-telemetry-client.py
index
4b0502f
..
98d28fa
100755
(executable)
--- a/
usertools/dpdk-telemetry-client.py
+++ b/
usertools/dpdk-telemetry-client.py
@@
-1,7
+1,10
@@
#! /usr/bin/env python
#! /usr/bin/env python
-# SPD
K
-License-Identifier: BSD-3-Clause
+# SPD
X
-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
# Copyright(c) 2018 Intel Corporation
+from __future__ import print_function
+from __future__ import unicode_literals
+
import socket
import os
import sys
import socket
import os
import sys
@@
-16,9
+19,13
@@
GLOBAL_METRICS_REQ = "{\"action\":0,\"command\":\"global_stat_values\",\"data\":
DEFAULT_FP = "/var/run/dpdk/default_client"
try:
DEFAULT_FP = "/var/run/dpdk/default_client"
try:
-
raw_input # Python 2
+ raw_input # Python 2
except NameError:
except NameError:
- raw_input = input # Python 3
+ raw_input = input # Python 3
+
+if sys.version_info.major < 3:
+ print("WARNING: Python 2 is deprecated for use in DPDK, and will not work in future releases.", file=sys.stderr)
+ print("Please use Python 3 instead", file=sys.stderr)
class Socket:
class Socket:
@@
-63,22
+70,23
@@
class Client:
self.socket.recv_fd.settimeout(2)
self.socket.send_fd.connect("/var/run/dpdk/rte/telemetry")
JSON = (API_REG + self.file_path + "\"}}")
self.socket.recv_fd.settimeout(2)
self.socket.send_fd.connect("/var/run/dpdk/rte/telemetry")
JSON = (API_REG + self.file_path + "\"}}")
- self.socket.send_fd.sendall(JSON)
+ self.socket.send_fd.sendall(JSON.encode())
+
self.socket.recv_fd.listen(1)
self.socket.client_fd = self.socket.recv_fd.accept()[0]
def unregister(self): # Unregister a given client
self.socket.recv_fd.listen(1)
self.socket.client_fd = self.socket.recv_fd.accept()[0]
def unregister(self): # Unregister a given client
- self.socket.client_fd.send(
API_UNREG + self.file_path + "\"}}"
)
+ self.socket.client_fd.send(
(API_UNREG + self.file_path + "\"}}").encode()
)
self.socket.client_fd.close()
def requestMetrics(self): # Requests metrics for given client
self.socket.client_fd.close()
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)
+ self.socket.client_fd.send(METRICS_REQ
.encode()
)
+ data = self.socket.client_fd.recv(BUFFER_SIZE)
.decode()
+ print
("\nResponse: \n",
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:")
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:")
- n_requests = int(
ast.literal_eval(raw_input("\n:")
))
+ n_requests = int(
raw_input("\n:"
))
print("\033[F") #Removes the user input from screen, cleans it up
print("\033[K")
for i in range(n_requests):
print("\033[F") #Removes the user input from screen, cleans it up
print("\033[K")
for i in range(n_requests):
@@
-86,9
+94,9
@@
class Client:
time.sleep(sleep_time)
def requestGlobalMetrics(self): #Requests global metrics for given client
time.sleep(sleep_time)
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)
+ self.socket.client_fd.send(GLOBAL_METRICS_REQ
.encode()
)
+ data = self.socket.client_fd.recv(BUFFER_SIZE)
.decode()
+ print
("\nResponse: \n",
data)
def interactiveMenu(self, sleep_time): # Creates Interactive menu within the script
while self.choice != 4:
def interactiveMenu(self, sleep_time): # Creates Interactive menu within the script
while self.choice != 4:
@@
-99,7
+107,7
@@
class Client:
print("[4] Unregister client")
try:
print("[4] Unregister client")
try:
- self.choice = int(
ast.literal_eval(raw_input("\n:")
))
+ self.choice = int(
raw_input("\n:"
))
print("\033[F") #Removes the user input for screen, cleans it up
print("\033[K")
if self.choice == 1:
print("\033[F") #Removes the user input for screen, cleans it up
print("\033[K")
if self.choice == 1:
@@
-121,10
+129,10
@@
if __name__ == "__main__":
sleep_time = 1
file_path = ""
if (len(sys.argv) == 2):
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 + ").")
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()
client = Client()
client.getFilepath(file_path)
client.register()