commit 6ae0d89b4360f3122c0cdeb7c4ba2e7257f0b306
author kelvin-onlab <kelvon@onlab.us> Fri Jan 23 16:55:42 2015 -0800
committer kelvin-onlab <kelvon@onlab.us> Fri Jan 23 16:55:42 2015 -0800
tree 35a8dd73f16ca396413198e35c571b9733203244
parent cf33bdad6c0ce5069767fec03d8317f04384bb8e
parent 71162c60e74f19d35621307bcba2104af924e457

Merge branch 'master' of https://github.com/opennetworkinglab/ONLabTest

TestON/tests/MultiProd/MultiProd.params

diff --git a/TestON/tests/MultiProd/MultiProd.params b/TestON/tests/MultiProd/MultiProd.params
index d0c7a10..8bf1600 100755
--- a/TestON/tests/MultiProd/MultiProd.params
+++ b/TestON/tests/MultiProd/MultiProd.params
@@ -1,6 +1,6 @@
 <PARAMS>
     
-    <testcases>1,4,10,31,32,8,33</testcases>    
+    <testcases>1,4,10,5,6,7,8,6,8,9,31,32,8,33</testcases>    
 
     #Environment variables
     <ENV>

TestON/tests/ProdFunc/ProdFunc.py

diff --git a/TestON/tests/ProdFunc/ProdFunc.py b/TestON/tests/ProdFunc/ProdFunc.py
index 486a5e0..b2797f3 100755
--- a/TestON/tests/ProdFunc/ProdFunc.py
+++ b/TestON/tests/ProdFunc/ProdFunc.py
@@ -1136,9 +1136,9 @@
         main.log.report( "__________________________________" )
         main.log.info( "Adding point intents" )
         main.case(
-            '''Adding bidirectional point for mn hosts
-            ( h8-h18, h9-h19, h10-h20, h11-h21, h12-h22,
-                h13-h23, h14-h24, h15-h25, h16-h26, h17-h27 )''' )
+            "Adding bidirectional point for mn hosts" +
+            "( h8-h18, h9-h19, h10-h20, h11-h21, h12-h22, " +
+            "h13-h23, h14-h24, h15-h25, h16-h26, h17-h27 )" )
 
         main.step( "Add point intents for mn hosts h8 and h18 or" +
                    "ONOS hosts h8 and h12" )