From e782eea28157bb5959c11a09ac3648d27d075ab9 Mon Sep 17 00:00:00 2001
From: Vincenzo Maffione <v.maffione@gmail.com>
Date: Thu, 5 Oct 2017 17:40:21 +0200
Subject: prototypes: rlite: align to the new rlite release

---
 examples/two-layers.py    | 2 +-
 rumba/prototypes/rlite.py | 7 ++++++-
 rumba/testbeds/qemu.py    | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/examples/two-layers.py b/examples/two-layers.py
index b3622fd..6d22673 100755
--- a/examples/two-layers.py
+++ b/examples/two-layers.py
@@ -50,7 +50,7 @@ tb = qemu.Testbed(exp_name = "twolayers",
                   username = "root",
                   password = "root")
 
-exp = irati.Experiment(tb, nodes = [a, b, c, d])
+exp = rl.Experiment(tb, nodes = [a, b, c, d])
 
 print(exp)
 
diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py
index c4c34e6..3700640 100644
--- a/rumba/prototypes/rlite.py
+++ b/rumba/prototypes/rlite.py
@@ -63,7 +63,7 @@ class Experiment(mod.Experiment):
                 "modprobe rlite-shim-eth",
                 "modprobe rlite-shim-udp4",
                 "modprobe rlite-shim-loopback",
-                "rlite-uipcps -v DBG -k 0 &> uipcp.log &"]
+                "rlite-uipcps -v DBG &> uipcp.log &"]
         self.may_sudo(cmds)
 
         for node in self.nodes:
@@ -96,6 +96,11 @@ class Experiment(mod.Experiment):
                     cmds.append("rlite-ctl ipcp-config %s netdev %s"
                                 % (ipcp.name, ipcp.ifname))
 
+                if isinstance(ipcp.dif, mod.NormalDIF) \
+                        and ipcp.dif_bootstrapper:
+                    cmds.append("rlite-ctl ipcp-enroller-enable %s"
+                                % (ipcp.name))
+
             self.may_sudo(cmds)
             self.execute_commands(node, cmds)
 
diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py
index 5c8c7b3..e4a35ab 100644
--- a/rumba/testbeds/qemu.py
+++ b/rumba/testbeds/qemu.py
@@ -143,7 +143,7 @@ class Testbed(mod.Testbed):
         # local images
         url_prefix = "https://bitbucket.org/vmaffione/rina-images/downloads/"
         if not self.bzimage_path:
-            bzimage = '%s.bzImage' % (experiment.prototype_name())
+            bzimage = '%s.prod.bzImage' % (experiment.prototype_name())
             self.bzimage_path = os.path.join(mod.cache_dir, bzimage)
             if not os.path.exists(self.bzimage_path):
                 logger.info("Downloading %s" % (url_prefix + bzimage))
@@ -151,7 +151,7 @@ class Testbed(mod.Testbed):
                             filename=self.bzimage_path)
                 print("\n")
         if not self.initramfs_path:
-            initramfs = '%s.rootfs.cpio' % (experiment.prototype_name())
+            initramfs = '%s.prod.rootfs.cpio' % (experiment.prototype_name())
             self.initramfs_path = os.path.join(mod.cache_dir, initramfs)
             if not os.path.exists(self.initramfs_path):
                 logger.info("Downloading %s" % (url_prefix + initramfs))
-- 
cgit v1.2.3