From 38e72d2e12dada445c7cd0d94432455244f95b3f Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Mon, 23 May 2011 14:17:47 +0200 Subject: [PATCH] minor correction --- examples/wimax_ns3.py | 6 +++--- src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/wimax_ns3.py b/examples/wimax_ns3.py index 7ede58ab..0daa6029 100644 --- a/examples/wimax_ns3.py +++ b/examples/wimax_ns3.py @@ -83,7 +83,7 @@ class Roads09Example(object): ns3_provider = FactoriesProvider(testbed_id, testbed_version) ns3_desc = exp_desc.add_testbed_description(ns3_provider) ns3_desc.set_attribute_value("homeDirectory", self.root_dir) - ns3_desc.set_attribute_value("StopTime", "8.1s") + ns3_desc.set_attribute_value("StopTime", "7.1s") node1 = self.add_ns3_node(ns3_desc) node2 = self.add_ns3_node(ns3_desc) @@ -109,7 +109,7 @@ class Roads09Example(object): udp_server = ns3_desc.create("ns3::UdpServer") udp_server.set_attribute_value("Port", 100) udp_server.set_attribute_value("StartTime", "6s") - udp_server.set_attribute_value("StopTime", "8s") + udp_server.set_attribute_value("StopTime", "7s") udp_server.connector("node").connect(node1.connector("apps")) udp_client = ns3_desc.create("ns3::UdpClient") @@ -119,7 +119,7 @@ class Roads09Example(object): udp_client.set_attribute_value("Interval", "0.5s") udp_client.set_attribute_value("PacketSize", 1024) udp_client.set_attribute_value("StartTime", "6s") - udp_client.set_attribute_value("StopTime", "8s") + udp_client.set_attribute_value("StopTime", "7s") udp_client.connector("node").connect(node2.connector("apps")) xml = exp_desc.to_xml() diff --git a/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py b/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py index fee4bf22..0980ea0b 100644 --- a/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py +++ b/src/nepi/testbeds/ns3/factories_metadata_v3_9_RC3.py @@ -147,8 +147,10 @@ def wimaxascii_trace(testbed_instance, guid, trace_id): testbed_instance.follow_trace(guid, trace_id, filename) filepath = testbed_instance.trace_filename(guid, trace_id) helper = testbed_instance.ns3.WimaxHelper() + asciiHelper = testbed_instance.ns3.AsciiTraceHelper() stream = asciiHelper.CreateFileStream (filepath) helper.EnableAscii(stream, element) + #helper.EnableLogComponents() def wimaxpcap_trace(testbed_instance, guid, trace_id): node_guid = _get_node_guid(testbed_instance, guid) -- 2.43.0