From 64782b938b12a9c0f7b7bb7a152091f62e4db3a6 Mon Sep 17 00:00:00 2001
From: Vincenzo Maffione <v.maffione@gmail.com>
Date: Mon, 6 Feb 2017 21:33:04 +0100
Subject: rhumba: realize --> swap_in, fix double definition in IRATI class

---
 irati_support.py     | 7 +------
 ouroboros_support.py | 2 +-
 rhumba.py            | 4 ++--
 rlite_support.py     | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/irati_support.py b/irati_support.py
index 59e0c63..d5c66d2 100644
--- a/irati_support.py
+++ b/irati_support.py
@@ -27,11 +27,6 @@ class IRATIExperiment(rhumba.Experiment):
     def __init__(self, testbed, nodes = list()):
         rhumba.Experiment.__init__(self, testbed, nodes)
 
-    def run(self):
-        print("[IRATI experiment] start")
-        self.realize()
-        print("[IRATI experiment] end")
-
     def setup(self):
         cmds = list()
 
@@ -48,7 +43,7 @@ class IRATIExperiment(rhumba.Experiment):
 
     def run(self):
         print("[IRATI experiment] start")
-        self.realize()
+        self.swap_in()
         print("Setting up IRATI on the nodes...")
         self.setup()
         print("[IRATI experiment] end")
diff --git a/ouroboros_support.py b/ouroboros_support.py
index 8631ad0..aca1f5f 100644
--- a/ouroboros_support.py
+++ b/ouroboros_support.py
@@ -51,7 +51,7 @@ class OuroborosExperiment(rhumba.Experiment):
     def run(self):
         print("[Ouroboros experiment] start")
         print("Creating resources...")
-        self.realize()
+        self.swap_in()
         print("Setting up Ouroboros...")
         self.setup_ouroboros()
         print("Binding names...")
diff --git a/rhumba.py b/rhumba.py
index 688985c..1ffd092 100755
--- a/rhumba.py
+++ b/rhumba.py
@@ -292,8 +292,8 @@ class Experiment:
     def del_node(self, node):
         self.nodes.remove(node)
 
-    # Realize the experiment topology, using a testbed-specific setup
-    def realize(self):
+    # Realize the experiment, using a testbed-specific setup
+    def swap_in(self):
         self.links = get_links(self.nodes)
         self.testbed.create_experiment(self.nodes, self.links)
 
diff --git a/rlite_support.py b/rlite_support.py
index b34a2b1..ac1f081 100644
--- a/rlite_support.py
+++ b/rlite_support.py
@@ -44,7 +44,7 @@ class RLITEExperiment(rhumba.Experiment):
 
     def run(self):
         print("[RLITE experiment] start")
-        self.realize()
+        self.swap_in()
         print("Setting up rlite on the nodes...")
         self.setup()
         print("[RLITE experiment] end")
-- 
cgit v1.2.3