use re substitution for params

p4lang · Apr 10, 2017 · 1d9a575 · 1d9a575
1 parent 99335a3
commit 1d9a575
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/docker/scripts/mininet/multi_switch_mininet.py b/docker/scripts/mininet/multi_switch_mininet.py
@@ -22,6 +22,7 @@
 import argparse
 import json
 import importlib
+import re
 from time import sleep
 
 from mininet.net import Mininet
@@ -85,7 +86,7 @@ def main():
 
     def formatParams(s):
         for param in params:
-            s = s.replace('$'+param, str(params[param]))
+            s = re.sub('\$'+param+'(\W|$)', str(params[param]) + r'\1', s)
             s = s.replace('${'+param+'}', str(params[param]))
         return s
 
@@ -162,7 +163,6 @@ def formatParams(s):
 
 
     def formatCmd(cmd):
-        cmd = formatParams(cmd)
         for h in net.hosts:
             cmd = cmd.replace(h.name, h.defaultIntf().updateIP())
         return cmd