git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use print() - import print_function - should be fine for both py2 and py3
[nepi.git]
/
examples
/
planetlab
/
select_nodes.py
diff --git
a/examples/planetlab/select_nodes.py
b/examples/planetlab/select_nodes.py
index
c95ef06
..
f856f52
100644
(file)
--- a/
examples/planetlab/select_nodes.py
+++ b/
examples/planetlab/select_nodes.py
@@
-3,9
+3,8
@@
# Copyright (C) 2014 INRIA
#
# This program is free software: you can redistribute it and/or modify
# Copyright (C) 2014 INRIA
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation;
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-23,6
+22,7
@@
# $ cd <path-to-nepi>
# python examples/planetlab/select_nodes.py -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key> -c <country> -o <operating-system> -n <node-count>
# $ cd <path-to-nepi>
# python examples/planetlab/select_nodes.py -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key> -c <country> -o <operating-system> -n <node-count>
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.ec import ExperimentController
@@
-64,7
+64,7
@@
os = options.os
node_count = options.node_count
def add_node(ec, pl_slice, pl_ssh_key, pl_user, pl_password, country, os):
node_count = options.node_count
def add_node(ec, pl_slice, pl_ssh_key, pl_user, pl_password, country, os):
- node = ec.register_resource("
Planetlab
Node")
+ node = ec.register_resource("
planetlab::
Node")
ec.set(node, "username", pl_slice)
ec.set(node, "identity", pl_ssh_key)
ec.set(node, "pluser", pl_user)
ec.set(node, "username", pl_slice)
ec.set(node, "identity", pl_ssh_key)
ec.set(node, "pluser", pl_user)
@@
-75,7
+75,7
@@
def add_node(ec, pl_slice, pl_ssh_key, pl_user, pl_password, country, os):
if os:
ec.set(node, "operatingSystem", os)
if os:
ec.set(node, "operatingSystem", os)
- ec.set(node, "clean
Home
", True)
+ ec.set(node, "clean
Experiment
", True)
ec.set(node, "cleanProcesses", True)
return node
ec.set(node, "cleanProcesses", True)
return node
@@
-93,10
+93,10
@@
ec.deploy()
ec.wait_deployed(nodes)
ec.wait_deployed(nodes)
-print
"SELECTED HOSTS"
+print
("SELECTED HOSTS")
for node in nodes:
for node in nodes:
- print
ec.get(node, "hostname"
)
+ print
(ec.get(node, "hostname")
)
ec.shutdown()
ec.shutdown()