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/ice/base: introduce and use for each bit iterator
[dpdk.git]
/
usertools
/
dpdk-telemetry-client.py
diff --git
a/usertools/dpdk-telemetry-client.py
b/usertools/dpdk-telemetry-client.py
index
e06d630
..
98d28fa
100755
(executable)
--- a/
usertools/dpdk-telemetry-client.py
+++ b/
usertools/dpdk-telemetry-client.py
@@
-1,8
+1,9
@@
#! /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
from __future__ import print_function
# Copyright(c) 2018 Intel Corporation
from __future__ import print_function
+from __future__ import unicode_literals
import socket
import os
import socket
import os
@@
-22,6
+23,10
@@
try:
except NameError:
raw_input = input # Python 3
except NameError:
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:
def __init__(self):
class Socket:
def __init__(self):
@@
-65,18
+70,19
@@
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:")
@@
-88,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: