From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Wed, 21 Mar 2012 21:33:37 +0000 (+0100)
Subject: Bugfix in tunchannel_impl preconfigure. The local hostname was not beeing correctly... 
X-Git-Tag: nepi-3.0.0~163^2~33
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ee111fbea1f62df09e8ec2e56291e1a9c6189dca;p=nepi.git

Bugfix in tunchannel_impl preconfigure. The local hostname was not beeing correctly retrieved.
---

diff --git a/src/nepi/testbeds/planetlab/node.py b/src/nepi/testbeds/planetlab/node.py
index 125c1cbf..52756007 100644
--- a/src/nepi/testbeds/planetlab/node.py
+++ b/src/nepi/testbeds/planetlab/node.py
@@ -92,7 +92,7 @@ class Node(object):
         if not api:
             api = plcapi.PLCAPI()
         self._api = api
-        self._sliceapi = sliceapi
+        self._sliceapi = sliceapi or api
         
         # Attributes
         self.hostname = None
diff --git a/src/nepi/util/tunchannel_impl.py b/src/nepi/util/tunchannel_impl.py
index ec74181f..261ff1f8 100644
--- a/src/nepi/util/tunchannel_impl.py
+++ b/src/nepi/util/tunchannel_impl.py
@@ -247,7 +247,7 @@ def preconfigure_tunchannel(testbed_instance, guid):
     public_addr = os.popen(
         "/sbin/ifconfig "
         "| grep $(ip route | grep default | awk '{print $3}' "
-                "| awk -F. '{print $1\"[.]\"$2}') "
+                "| awk -F. '{print $1\"[.]\"$2}' | head -1) "
         "| head -1 | awk '{print $2}' "
         "| awk -F : '{print $2}'").read().rstrip()
     element.tun_addr = public_addr