aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rumba/prototypes/irati.py3
-rw-r--r--rumba/testbeds/jfed.py2
-rwxr-xr-xrumba/testbeds/mac2ifname.sh2
3 files changed, 5 insertions, 2 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py
index b5f8f6b..f36b59b 100644
--- a/rumba/prototypes/irati.py
+++ b/rumba/prototypes/irati.py
@@ -147,7 +147,6 @@ class Experiment(mod.Experiment):
'genfiles': gen_files,
'genfilesconf': ' '.join(gen_files_conf),
'genfilesbin': gen_files_bin,
- 'installpath': '/usr',
'verb': 'DBG',
'ipcmcomps': ipcm_components}
@@ -167,7 +166,7 @@ class Experiment(mod.Experiment):
cmds += [self.sudo('modprobe rina-default-plugin'),
self.sudo('modprobe shim-eth-vlan'),
self.sudo('modprobe normal-ipcp'),
- self.sudo('%(installpath)s/bin/ipcm -a \"%(ipcmcomps)s\" '
+ self.sudo('ipcm -a \"%(ipcmcomps)s\" '
'-c /etc/%(name)s.ipcm.conf -l %(verb)s &> log &'
% format_args)]
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index 53a812f..54ad860 100644
--- a/rumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -203,6 +203,8 @@ class Testbed(mod.Testbed):
if isinstance(ipcp, mod.ShimEthIPCP):
if self.if_id[ipcp] == i_name:
ipcp.ifname = ifname
+ logger.debug("Node %s interface %s has name %s."
+ % (node_n.name, mac, ifname))
# comp_id = intf.getAttribute("component_id")
# comp_arr = comp_id.split(":")
# ipcp.ifname = comp_arr[-1]
diff --git a/rumba/testbeds/mac2ifname.sh b/rumba/testbeds/mac2ifname.sh
new file mode 100755
index 0000000..5a87ee1
--- /dev/null
+++ b/rumba/testbeds/mac2ifname.sh
@@ -0,0 +1,2 @@
+mac="$1"
+cd / && ./sbin/ifconfig -a | awk '/^[a-z]/ { if ( "'"$mac"'" == $5 ) print $1}'