Merge branch 'master' into jfed-irati-fixes

1 files changed, 5 insertions, 8 deletions

diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py
index c47d0d2..1e75efc 100644
--- a/rumba/prototypes/irati.py
+++ b/rumba/prototypes/irati.py
@@ -36,6 +36,9 @@ logger = log.get_logger(__name__)
 # An experiment over the IRATI implementation
 class Experiment(mod.Experiment):
 
+    def prototype_name(self):
+        return 'irati'
+
     @staticmethod
     def real_sudo(s):
         return 'sudo ' + s
@@ -82,7 +85,7 @@ class Experiment(mod.Experiment):
                 + self.sudo("./install-from-scratch")]
 
         for node in self.nodes:
-            ssh.execute_commands(self.testbed, node.ssh_config,
+            ssh.execute_proxy_commands(self.testbed, node.ssh_config,
                                  cmds, time_out=None)
 
     def setup(self):
@@ -230,16 +233,10 @@ class Experiment(mod.Experiment):
                     next_vlan += 10
                     self.shim2vlan[dif.name] = vlan
 
-        # TODO: what format are the mappings registered in? Is this ok?
-        app_mappings = []
-        for node in self.nodes:
-            app_mappings += [{'name': app, 'dif': self.dif_name(dif)}
-                             for app in node.registrations
-                             for dif in node.registrations[app]]
-
         # If some app directives were specified, use those to build da.map.
         # Otherwise, assume the standard applications are to be mapped in
         # the DIF with the highest rank.
+        app_mappings = []
         if len(app_mappings) == 0:
             if len(self.dif_ordering) > 0:
                 for adm in \