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
/
update_fedora_repo.py
diff --git
a/examples/planetlab/update_fedora_repo.py
b/examples/planetlab/update_fedora_repo.py
index
7b5d88c
..
cd2a9cd
100644
(file)
--- a/
examples/planetlab/update_fedora_repo.py
+++ b/
examples/planetlab/update_fedora_repo.py
@@
-4,9
+4,8
@@
# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
# Copyright (C) 2013 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
@@
-28,6
+27,8
@@
# $ cd <path-to-nepi>
# python examples/planetlab/update_fedora_repo.py -H <host1,host2,..> -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>
# $ cd <path-to-nepi>
# python examples/planetlab/update_fedora_repo.py -H <host1,host2,..> -s <pl-slice> -u <pl-user> -p <pl-password> -k <pl-ssh-key>
+from __future__ import print_function
+
from nepi.execution.ec import ExperimentController
from optparse import OptionParser, SUPPRESS_HELP
from nepi.execution.ec import ExperimentController
from optparse import OptionParser, SUPPRESS_HELP
@@
-84,8
+85,12
@@
for hostname in hosts:
ec.set(node, "identity", pl_ssh_key)
# The pluser and plpassword are the ones used to login in the PlanetLab web
# site. Replace with your own user and password account information.
ec.set(node, "identity", pl_ssh_key)
# The pluser and plpassword are the ones used to login in the PlanetLab web
# site. Replace with your own user and password account information.
- ec.set(node, "pluser", pl_user)
- ec.set(node, "plpassword", pl_password)
+ if pl_user:
+ ec.set(node, "pluser", pl_user)
+ if pl_password:
+ ec.set(node, "plpassword", pl_password)
+
+ ec.set(node, "critical", False)
# Remove previous results
ec.set(node, "cleanExperiment", True)
ec.set(node, "cleanProcesses", True)
# Remove previous results
ec.set(node, "cleanExperiment", True)
ec.set(node, "cleanProcesses", True)
@@
-101,6
+106,7
@@
for hostname in hosts:
ec.set(app, "command",
"cp /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora.repo.old; "
"cp ${SHARE}/fedora.repo /etc/yum.repos.d/fedora.repo")
ec.set(app, "command",
"cp /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora.repo.old; "
"cp ${SHARE}/fedora.repo /etc/yum.repos.d/fedora.repo")
+ ec.set(app, "critical", False)
ec.register_connection(node, app)
apps.append(app)
ec.register_connection(node, app)
apps.append(app)
@@
-116,6
+122,7
@@
for hostname in hosts:
ec.set(app, "command",
"cp /etc/yum.repos.d/fedora-updates.repo /etc/yum.repos.d/fedora-updates.repo.old; "
"cp ${SHARE}/fedora-updates.repo /etc/yum.repos.d/fedora-updates.repo")
ec.set(app, "command",
"cp /etc/yum.repos.d/fedora-updates.repo /etc/yum.repos.d/fedora-updates.repo.old; "
"cp ${SHARE}/fedora-updates.repo /etc/yum.repos.d/fedora-updates.repo")
+ ec.set(app, "critical", False)
ec.register_connection(node, app)
apps.append(app)
ec.register_connection(node, app)
apps.append(app)
@@
-126,7
+133,10
@@
ec.deploy()
ec.wait_finished(apps)
for app in apps:
ec.wait_finished(apps)
for app in apps:
- print ec.trace(app, "stderr")
+ try:
+ print(ec.trace(app, "stderr"))
+ except:
+ print("NO stderr")
ec.shutdown()
ec.shutdown()