From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Wed, 17 Aug 2011 15:19:17 +0000 (+0200)
Subject: removed device_name from tunchan. now attribute is if_name
X-Git-Tag: nepi-3.0.0~294^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=59474662c5312557a5bd5433705d7fabbe3cd3a8;p=nepi.git

removed device_name from tunchan. now attribute is if_name
---

diff --git a/src/nepi/testbeds/planetlab/interfaces.py b/src/nepi/testbeds/planetlab/interfaces.py
index 251010df..8d0b5fa8 100644
--- a/src/nepi/testbeds/planetlab/interfaces.py
+++ b/src/nepi/testbeds/planetlab/interfaces.py
@@ -124,7 +124,6 @@ class TunIface(object):
         self.netmask = None
         
         self.up = None
-        self.device_name = None
         self.mtu = None
         self.snat = False
         self.txqueuelen = None
diff --git a/src/nepi/testbeds/planetlab/metadata.py b/src/nepi/testbeds/planetlab/metadata.py
index 2e6adb46..169b8c86 100644
--- a/src/nepi/testbeds/planetlab/metadata.py
+++ b/src/nepi/testbeds/planetlab/metadata.py
@@ -928,8 +928,8 @@ attributes = dict({
                 "value": True,
                 "validation_function": validation.is_bool
             }),
-    "device_name": dict({
-                "name": "name",
+    "if_name": dict({
+                "name": "if_name",
                 "help": "Device name",
                 "type": Attribute.STRING,
                 "flags": Attribute.ExecReadOnly | Attribute.ExecImmutable,
@@ -1210,7 +1210,7 @@ factories_info = dict({
             "configure_function": postconfigure_tuniface,
             "prestart_function": wait_tuniface,
             "box_attributes": [
-                "up", "device_name", "mtu", "snat", "pointopoint",
+                "up", "if_name", "mtu", "snat", "pointopoint",
                 "txqueuelen",
                 "tun_proto", "tun_addr", "tun_port", "tun_key", "tun_cipher",
             ],
@@ -1226,7 +1226,7 @@ factories_info = dict({
             "configure_function": postconfigure_tuniface,
             "prestart_function": wait_tuniface,
             "box_attributes": [
-                "up", "device_name", "mtu", "snat", "pointopoint",
+                "up", "if_name", "mtu", "snat", "pointopoint",
                 "txqueuelen",
                 "tun_proto", "tun_addr", "tun_port", "tun_key", "tun_cipher",
             ],