From 7bab86ff1683f32d739f1da9565f83bef5ff7e3b Mon Sep 17 00:00:00 2001
From: Marco Capitani <m.capitani@nextworks.it>
Date: Wed, 10 May 2017 17:43:28 +0200
Subject: jfed-irati small fixes for compatibility

---
 rumba/testbeds/jfed.py | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to 'rumba/testbeds')

diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index 5394146..60d6605 100644
--- a/rumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -27,7 +27,7 @@ import tarfile
 
 import rumba.model as mod
 import rumba.log as log
-
+from rumba import ssh_support
 
 logger = log.get_logger(__name__)
 
@@ -164,22 +164,47 @@ class Testbed(mod.Testbed):
         rspec = xml.parse(self.manifest)
         xml_nodes = rspec.getElementsByTagName("node")
 
+        dir_path = os.path.dirname(os.path.abspath(__file__))
+
         # Complete details of the nodes after swapin
         for xml_node in xml_nodes:
             n_name = xml_node.getAttribute("client_id")
             intfs = xml_node.getElementsByTagName("interface")
 
+            got = False
             for node in experiment.nodes:
                 if node.name == n_name:
                     node_n = node
+                    got = True
+            if not got:
+                logger.error("Not found node %s", n_name)
 
             for intf in intfs:
+                aux_mac_address = intf.getAttribute("mac_address")
+                mac = ":".join(
+                    [aux_mac_address[i:i+2] for i in range(0, 12, 2)]
+                )
+                ssh_support.copy_path_to_testbed(
+                    self,
+                    node_n.ssh_config,
+                    os.path.join(dir_path, 'mac2ifname.sh'),
+                    '')
+                ssh_support.execute_command(
+                    self,
+                    node_n.ssh_config,
+                    'cd ~ && chmod a+x mac2ifname.sh')
+                ifname = ssh_support.execute_command(
+                    self,
+                    node_n.ssh_config,
+                    './mac2ifname.sh ' + mac
+                )
                 i_name = intf.getAttribute("client_id")
                 for ipcp in node_n.ipcps:
                     if isinstance(ipcp, mod.ShimEthIPCP):
                         if self.if_id[ipcp] == i_name:
-                            comp_id = intf.getAttribute("component_id")
-                            comp_arr = comp_id.split(":")
-                            ipcp.ifname = comp_arr[-1]
+                            ipcp.ifname = ifname
+                            # comp_id = intf.getAttribute("component_id")
+                            # comp_arr = comp_id.split(":")
+                            # ipcp.ifname = comp_arr[-1]
                             # xml_ip = intf.getElementsByTagName("ip")
                             # interface.ip = xml_ip[0].getAttribute("address")
-- 
cgit v1.2.3