Merge branch 'master' into jfed-irati-fixes (rumba access)

1 files changed, 6 insertions, 3 deletions

diff --git a/rumba/model.py b/rumba/model.py
index c1c6f5d..9818ac7 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -524,8 +524,11 @@ class Experiment:
     def dump_ssh_info(self):
         f = open('ssh_info', 'w')
         for node in self.nodes:
-            f.write("%s %s %s %s\n" % (node.name, self.testbed.username,
-                            node.ssh_config.hostname, node.ssh_config.port))
+            f.write("%s;%s;%s;%s;%s\n" % (node.name,
+                                          self.testbed.username,
+                                          node.ssh_config.hostname,
+                                          node.ssh_config.port,
+                                          node.ssh_config.proxycommand))
         f.close()
 
     # Examine the nodes and DIFs, compute the registration and enrollment
@@ -643,7 +646,7 @@ class Server:
     def get_new_clients(self, interval):
         """
         Returns a list of clients of size appropriate to the server's rate.
-         
+
         The list's size should be a sample from Poisson(arrival_rate) over
         interval seconds.
         Hence, the average size should be interval * arrival_rate.