Commit 25bae0dc authored by Ana Custura's avatar Ana Custura
Browse files

Update TGen traffic model to use TGen version 1.0.0

parent adece5d5
...@@ -74,7 +74,7 @@ class TorperfModel(GeneratableTGenModel): ...@@ -74,7 +74,7 @@ class TorperfModel(GeneratableTGenModel):
else: else:
g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute") g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute")
g.add_node("pause", time="5 minutes") g.add_node("pause", time="5 minutes")
g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="270 seconds", stallout="0 seconds") g.add_node("stream5m", sendsize="0", recvsize="5 mib", timeout="270 seconds", stallout="0 seconds")
g.add_edge("start", "pause") g.add_edge("start", "pause")
...@@ -83,7 +83,7 @@ class TorperfModel(GeneratableTGenModel): ...@@ -83,7 +83,7 @@ class TorperfModel(GeneratableTGenModel):
g.add_edge("pause", "pause") g.add_edge("pause", "pause")
# these are chosen with weighted probability, change edge 'weight' attributes to adjust probability # these are chosen with weighted probability, change edge 'weight' attributes to adjust probability
g.add_edge("pause", "transfer5m") g.add_edge("pause", "stream5m")
return g return g
...@@ -103,10 +103,10 @@ class OneshotModel(GeneratableTGenModel): ...@@ -103,10 +103,10 @@ class OneshotModel(GeneratableTGenModel):
g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute", socksproxy=self.socksproxy) g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute", socksproxy=self.socksproxy)
else: else:
g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute") g.add_node("start", serverport=self.tgen_port, peers=server_str, loglevel="info", heartbeat="1 minute")
g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="15 seconds", stallout="10 seconds") g.add_node("stream5m", sendsize="0", recvsize="5 mib", timeout="270 seconds", stallout="0 seconds")
g.add_edge("start", "transfer5m") g.add_edge("start", "stream5m")
g.add_edge("transfer5m", "start") g.add_edge("stream5m", "start")
return g return g
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment