From 59474662c5312557a5bd5433705d7fabbe3cd3a8 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Wed, 17 Aug 2011 17:19:17 +0200 Subject: [PATCH] removed device_name from tunchan. now attribute is if_name --- src/nepi/testbeds/planetlab/interfaces.py | 1 - src/nepi/testbeds/planetlab/metadata.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) 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", ], -- 2.47.0