X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=usertools%2Fdpdk-telemetry-client.py;h=290345dcc463f1106bcd427207597b03c5c3386e;hb=88d57889c9f8034e5075a299e4300a862da6449a;hp=4b0502ff90b5eaf3bf77ac6ca1b8c01834599043;hpb=53f293c9a7833747d90b90bf33d12fe1d4f8ef1e;p=dpdk.git diff --git a/usertools/dpdk-telemetry-client.py b/usertools/dpdk-telemetry-client.py index 4b0502ff90..290345dcc4 100755 --- a/usertools/dpdk-telemetry-client.py +++ b/usertools/dpdk-telemetry-client.py @@ -1,7 +1,9 @@ #! /usr/bin/env python -# SPDK-License-Identifier: BSD-3-Clause +# SPDX-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 @@ GLOBAL_METRICS_REQ = "{\"action\":0,\"command\":\"global_stat_values\",\"data\": 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,11 +76,11 @@ class 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:") - 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): @@ -88,7 +90,7 @@ class Client: 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: @@ -99,7 +101,7 @@ class Client: 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: @@ -121,10 +123,10 @@ if __name__ == "__main__": 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()