model, prototypes: enrollment lists contain IPCP objects rather than Node ones

This fixes a conceptual bug, that was leading to unnecessary
workarounds in the prototype plugins.
All the plugins have been modified to use the correct format of
enrollment lists.

1 files changed, 4 insertions, 2 deletions

diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py
index 8da4616..8a06b44 100644
--- a/rumba/prototypes/rlite.py
+++ b/rumba/prototypes/rlite.py
@@ -22,6 +22,8 @@ import rumba.ssh_support as ssh
 import rumba.model as mod
 import rumba.log as log
 
+import time
+
 
 logger = log.get_logger(__name__)
 
@@ -75,7 +77,6 @@ class Experiment(mod.Experiment):
                 # Generate the command to configure the interface
                 # name for the shim-eth
                 if type(ipcp.dif) is mod.ShimEthDIF:
-                    ipcp.ifname = 'eth1'
                     cmds.append("rlite-ctl ipcp-config %s netdev %s"
                                 % (ipcp.name, ipcp.ifname))
 
@@ -102,7 +103,8 @@ class Experiment(mod.Experiment):
                      }
                 cmd = "rlite-ctl ipcp-enroll %(enrollee)s %(dif)s "\
                       "%(lower_dif)s %(enroller)s" % d
-                self.execute_commands(e['enrollee'], [cmd])
+                self.execute_commands(e['enrollee'].node, [cmd])
+                time.sleep(1)
 
     def install_prototype(self):
         logger.info("installing rlite on all nodes")