commit 0a28a74502393b5b1b26156730ca4f3e432d4d6b
author kelvin-onlab <kelvin@onlab.us> Mon May 18 16:03:13 2015 -0700
committer kelvin-onlab <kelvin@onlab.us> Mon May 18 16:03:13 2015 -0700
tree bf38d9f2291d572577a7a169ba97abe0e734dc0b
parent 033cc0f767e39cdbbb83d354b7227ed33ac3f71f
parent b29ccbe88627bc36c96f50747054d554c2ec6ac6

Fixed minor error in teston.py and some conflict issues with master

TestON/tests/FuncStartTemplate/FuncStartTemplate.params

diff --git a/TestON/tests/FuncStartTemplate/FuncStartTemplate.params b/TestON/tests/FuncStartTemplate/FuncStartTemplate.params
index a4c2a6e..310e5f8 100755
--- a/TestON/tests/FuncStartTemplate/FuncStartTemplate.params
+++ b/TestON/tests/FuncStartTemplate/FuncStartTemplate.params
@@ -1,7 +1,7 @@
 <PARAMS>
 
     <testcases>10,9,10,9</testcases>
-    
+
     <SCALE>3,1</SCALE>
     <availableNodes>3</availableNodes>
     <ENV>
@@ -23,7 +23,7 @@
     </CTRL>
     <BENCH>
         <user>admin</user>
-        <ip1>10.128.5.55</ip1>
+        <ip1>OCN</ip1>
     </BENCH>
     <MININET>
         <switch>7</switch>