X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a6117d74b9284bd77ce00dffbe1b3d5f6aa8c107..60a81418ae15d47b18247171b721e207b71d6279:/teshsuite/python/platform-mix/platform-mix.py

diff --git a/teshsuite/python/platform-mix/platform-mix.py b/teshsuite/python/platform-mix/platform-mix.py
index b138dfb955..ca018a7d17 100644
--- a/teshsuite/python/platform-mix/platform-mix.py
+++ b/teshsuite/python/platform-mix/platform-mix.py
@@ -51,7 +51,8 @@ def load_platform():
   hosts = []
   # dijkstra
   dijkstra = NetZone.create_dijkstra_zone("dijkstra")
-  this_actor.info("Creating zone: " + dijkstra.name)
+  msg_base = "Creating zone: "
+  this_actor.info(msg_base + dijkstra.name)
   dijkstra.set_parent(root)
   host1 = dijkstra.create_host("host1", [1e9, 1e8]).set_core_count(2)
   hosts.append(host1)
@@ -68,7 +69,7 @@ def load_platform():
 
   # vivaldi
   vivaldi = NetZone.create_vivaldi_zone("vivaldi")
-  this_actor.info("Creating zone: " + vivaldi.name)
+  this_actor.info(msg_base + vivaldi.name)
   vivaldi.set_parent(root)
   host3 = vivaldi.create_host("host3", 1e9).set_coordinates("1 1 1").seal()
   host4 = vivaldi.create_host("host4", "1Gf").set_coordinates("2 2 2").seal()
@@ -77,7 +78,7 @@ def load_platform():
 
   # empty
   empty = NetZone.create_empty_zone("empty")
-  this_actor.info("Creating zone: " + empty.name)
+  this_actor.info(msg_base + empty.name)
   empty.set_parent(root)
   host5 = empty.create_host("host5", 1e9)
   hosts.append(host5)
@@ -85,7 +86,7 @@ def load_platform():
 
   # wifi
   wifi = NetZone.create_wifi_zone("wifi")
-  this_actor.info("Creating zone: " + wifi.name)
+  this_actor.info(msg_base + wifi.name)
   wifi.set_parent(root)
   router = wifi.create_router("wifi_router")
   wifi.set_property("access_point", "wifi_router")
@@ -97,15 +98,15 @@ def load_platform():
   wifi.seal()
 
   # create routes between netzones
-  linkA = vivaldi.create_link("linkA", 1e9).seal()
-  linkB = vivaldi.create_link("linkB", "1GBps").seal()
-  linkC = vivaldi.create_link("linkC", "1GBps").seal()
+  link_a = vivaldi.create_link("linkA", 1e9).seal()
+  link_b = vivaldi.create_link("linkB", "1GBps").seal()
+  link_c = vivaldi.create_link("linkC", "1GBps").seal()
   root.add_route(dijkstra.get_netpoint(), vivaldi.get_netpoint(
-  ), host1.get_netpoint(), host3.get_netpoint(), [LinkInRoute(linkA)], True)
+  ), host1.get_netpoint(), host3.get_netpoint(), [LinkInRoute(link_a)], True)
   root.add_route(vivaldi.get_netpoint(), empty.get_netpoint(
-  ), host3.get_netpoint(), host5.get_netpoint(), [LinkInRoute(linkB)], True)
+  ), host3.get_netpoint(), host5.get_netpoint(), [LinkInRoute(link_b)], True)
   root.add_route(empty.get_netpoint(), wifi.get_netpoint(
-  ), host5.get_netpoint(), router, [LinkInRoute(linkC)], True)
+  ), host5.get_netpoint(), router, [LinkInRoute(link_c)], True)
 
   # create actors Sender/Receiver
   Actor.create("sender", hosts[0], Sender(hosts))