From 46201e57172d27fd4054a70f08a0736bd2319e6b Mon Sep 17 00:00:00 2001
From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Tue, 24 May 2011 18:55:18 +0200
Subject: [PATCH] bug fix in traces

---
 examples/vlc_wireless_netns_ns3.py |  5 +----
 src/nepi/core/design.py            | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/examples/vlc_wireless_netns_ns3.py b/examples/vlc_wireless_netns_ns3.py
index 45eb72d4..03c91383 100644
--- a/examples/vlc_wireless_netns_ns3.py
+++ b/examples/vlc_wireless_netns_ns3.py
@@ -161,7 +161,7 @@ class VlcWirelessNetnsNs3Example(object):
         # create vlc server
         # DEBUG!! target = "{#[vlc_client].addr[0].[Address]#}"
         target = "10.0.2.2" 
-        command = "vlc -I dummy -vvv %s --sout '#rtp{dst=%s,port=5004,mux=ts}' vlc:quit" \
+        command = "vlc -I dummy -vvv %s --sout '#rtp{dst=%s,port=5004,mux=ts}' vlc://quit" \
                 % (self.movie, target)
         vlc_server = netns_desc1.create("Application")
         vlc_server.set_attribute_value("command", command)
@@ -190,9 +190,6 @@ class VlcWirelessNetnsNs3Example(object):
         vlc_client.set_attribute_value("command", command)
         vlc_client.set_attribute_value("user", self.user)
         vlc_client.connector("node").connect(node4.connector("apps"))
-        #vlc_trace = vlc_server.get_trace("StderrTrace")
-        #vlc_trace.get_attribute("Filename").value = "vlc_server.err"
-        #vlc_trace.enable()        
 
         #command = "xterm"
         #xterm2 = netns_desc2.create("Application")
diff --git a/src/nepi/core/design.py b/src/nepi/core/design.py
index 309f8e5b..a2a9b2dd 100644
--- a/src/nepi/core/design.py
+++ b/src/nepi/core/design.py
@@ -115,7 +115,7 @@ class Trace(AttributesMap):
         super(Trace, self).__init__()
         self._trace_id = trace_id
         self._help = help       
-        self.enabled = enabled
+        self._enabled = enabled
     
     @property
     def trace_id(self):
@@ -125,6 +125,16 @@ class Trace(AttributesMap):
     def help(self):
         return self._help
 
+    @property
+    def enabled(self):
+        return self._enabled
+
+    def enable(self):
+        self._enabled = True
+
+    def disable(self):
+        self._enabled = False
+
 class Address(AttributesMap):
     def __init__(self):
         super(Address, self).__init__()
@@ -237,7 +247,7 @@ class Box(AttributesMap):
         return self._traces.values()
 
     @property
-    def traces_name(self):
+    def trace_names(self):
         return self._traces.keys()
 
     @property
@@ -260,10 +270,13 @@ class Box(AttributesMap):
         return self._traces[trace_id].help
 
     def enable_trace(self, trace_id):
-        self._traces[trace_id].enabled = True
+        self._traces[trace_id].enable()
 
     def disable_trace(self, trace_id):
-        self._traces[trace_id].enabled = False
+        self._traces[trace_id].disable()
+
+    def is_trace_enabled(self, trace_id):
+        return self._traces[trace_id].enabled
 
     def connector(self, name):
         return self._connectors[name]
-- 
2.47.0