Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reconf tests: Fix async measurements
[csit.git]
/
resources
/
tools
/
trex
/
trex_server_info.py
diff --git
a/resources/tools/trex/trex_server_info.py
b/resources/tools/trex/trex_server_info.py
index
e9de6f9
..
b957495
100755
(executable)
--- a/
resources/tools/trex/trex_server_info.py
+++ b/
resources/tools/trex/trex_server_info.py
@@
-1,6
+1,6
@@
-#!/usr/bin/python
+#!/usr/bin/python
3
-# Copyright (c) 201
6
Cisco and/or its affiliates.
+# Copyright (c) 201
9
Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@
-17,8
+17,8
@@
Requirements:
- T-REX: https://github.com/cisco-system-traffic-generator/trex-core
Requirements:
- T-REX: https://github.com/cisco-system-traffic-generator/trex-core
- - compiled and running T-REX process (eg. ./t-rex-64 -i
-c 4
)
- - trex
_stl_lib
.api library
+ - compiled and running T-REX process (eg. ./t-rex-64 -i)
+ - trex
.stl
.api library
- Script must be executed on a node with T-REX instance
Functionality:
- Script must be executed on a node with T-REX instance
Functionality:
@@
-28,50
+28,25
@@
Functionality:
import sys
import sys
-sys.path.insert(0, "/opt/trex-core-2.
35
/scripts/automation/"+\
- "trex_control_plane/
stl
/")
-from trex
_stl_lib
.api import *
+sys.path.insert(0, "/opt/trex-core-2.
61
/scripts/automation/"+\
+ "trex_control_plane/
interactive
/")
+from trex
.stl
.api import *
-
-def get_server_system_info():
- """Check server info and quit.
-
- :return: nothing
- """
-
- # create client
+def main():
+ """Check server info and quit."""
client = STLClient()
client = STLClient()
-
try:
# connect to server
client.connect()
try:
# connect to server
client.connect()
- # get server info
- print client.get_server_system_info()
+ # get server info
+ print(client.get_server_system_info())
except STLError as ex_error:
except STLError as ex_error:
- print
_error(str(ex_error)
)
+ print
(ex_error, file=sys.stderr
)
sys.exit(1)
sys.exit(1)
-
finally:
client.disconnect()
finally:
client.disconnect()
-def print_error(msg):
- """Print error message on stderr.
-
- :param msg: Error message to print.
- :type msg: string
- :return: nothing
- """
-
- sys.stderr.write(msg+'\n')
-
-
-def main():
- """Main function."""
-
- get_server_system_info()
-
-
if __name__ == "__main__":
main()
if __name__ == "__main__":
main()