[SDFAB-1197] First stab to update ONOS to py3
Update has been performed only on the scripts and the
executables strictly necessary for the following use cases:
- Build (including Intellij)
- Tests (including Intellij)
- Docker build (including dev and yourkit)
- Upload snapshot (including local)
- Release
Finally, fix the ability to run ONOS using onos-local targets,
stc and docker stc (aka up4 stc env). Last but not least, updated
the azul image to a newer one which exports also the PYTHONENCODING
Change-Id: Ie96f3a9c76dbba83b1fc3896a372f1045d3d7ccc
diff --git a/tools/test/bin/atomix-gen-config b/tools/test/bin/atomix-gen-config
index c3c89ac..d32ca98 100755
--- a/tools/test/bin/atomix-gen-config
+++ b/tools/test/bin/atomix-gen-config
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
usage: atomix-gen-config [-h] [-s PARTITION_SIZE] [-n NUM_PARTITIONS]
[node_ip] [filename] [node_ip [node_ip ...]]
@@ -112,7 +112,7 @@
args = parser.parse_args()
filename = args.filename
partition_size = args.partition_size
- local_member_id = get_local_node(args.node)
+ local_member_id = get_local_node(args.node, args.nodes)
local_member_address = get_local_address(args.node, args.nodes)
nodes = get_nodes(args.nodes)
num_partitions = args.num_partitions
@@ -158,4 +158,4 @@
with open(filename, 'w') as f:
f.write(output)
else:
- print output
+ print(output)
diff --git a/tools/test/bin/onos-gen-config b/tools/test/bin/onos-gen-config
index b73df39..e214d2f 100755
--- a/tools/test/bin/onos-gen-config
+++ b/tools/test/bin/onos-gen-config
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
usage: onos-gen-config [-h] [-s PARTITION_SIZE] [-n NUM_PARTITIONS]
[filename] [node_ip [node_ip ...]]
@@ -87,7 +87,7 @@
args = parser.parse_args()
node = args.node
- print node
+ print(node)
filename = args.filename
nodes = get_nodes(args.nodes)
@@ -106,4 +106,4 @@
with open(filename, 'w') as f:
f.write(output)
else:
- print output
+ print(output)