aboutsummaryrefslogtreecommitdiff
path: root/rumba/testbeds/jfed.py
diff options
context:
space:
mode:
authorMarco Capitani <m.capitani@nextworks.it>2017-06-30 12:17:16 +0200
committerMarco Capitani <m.capitani@nextworks.it>2017-06-30 12:17:16 +0200
commit815839bf3cac2fcfd2d25a69395055397d55a8bb (patch)
tree128c5acaf009245b87c982ae7e85041c39afee98 /rumba/testbeds/jfed.py
parent50f0edfca9b552d332d250022e0d8c5fdaa531c7 (diff)
downloadrumba-815839bf3cac2fcfd2d25a69395055397d55a8bb.tar.gz
rumba-815839bf3cac2fcfd2d25a69395055397d55a8bb.zip
ssh & model-storyboard: changed ssh API, added node.execute* methods
Diffstat (limited to 'rumba/testbeds/jfed.py')
-rw-r--r--rumba/testbeds/jfed.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index e158048..ad6b98a 100644
--- a/rumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -153,11 +153,13 @@ class Testbed(mod.Testbed):
node.ssh_config.hostname = \
node.name + "." + self.exp_name + "." + \
auth_name_r + "." + self.auth_name
- node.ssh_config.proxycommand = "ssh -i '" + self.cert_file + \
- "' -o StrictHostKeyChecking=no " + \
- self.username + \
- "@bastion.test.iminds.be nc " + \
- node.ssh_config.hostname + " 22"
+ node.ssh_config.proxy_command = "ssh -i '" + self.cert_file + \
+ "' -o StrictHostKeyChecking=no " + \
+ self.username + \
+ "@bastion.test.iminds.be nc " + \
+ node.ssh_config.hostname + " 22"
+ node.ssh_config.username = self.username
+ node.ssh_config.password = self.password
subprocess.call(["java", "-jar", self.jfed_jar, "create", "-S",
self.proj_name, "--rspec",
@@ -172,8 +174,6 @@ class Testbed(mod.Testbed):
rspec = xml.parse(self.manifest)
xml_nodes = rspec.getElementsByTagName("node")
- dir_path = os.path.dirname(os.path.abspath(__file__))
-
# Complete details of the nodes after swapin
logger.info("Sleeping for two seconds to avoid contacting jfed nodes "
"too soon.")