From 1d9a575235cf9b8f5b7ffa49814bc73f271be1c9 Mon Sep 17 00:00:00 2001
From: Theo <theojepsen@g-m-a-i-l-dotcom>
Date: Fri, 7 Apr 2017 17:18:46 -0700
Subject: [PATCH] use re substitution for params

---
 docker/scripts/mininet/multi_switch_mininet.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/mininet/multi_switch_mininet.py b/docker/scripts/mininet/multi_switch_mininet.py
index 40415b5..99035b8 100755
--- 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