commit | 28b84eb45556ebd7b11d3eb4d4bdf40b8d146e6d | [log] [tgz] |
---|---|---|
author | andrewonlab <andrew@onlab.us> | Tue Dec 02 15:53:35 2014 -0500 |
committer | andrewonlab <andrew@onlab.us> | Tue Dec 02 15:53:35 2014 -0500 |
tree | 9616f47e22606eb356a2e636714b4c1eb2354825 | |
parent | b66dfa16573e65c8bcb5cb3a0ea09d4d437ecf48 [diff] [blame] | |
parent | e6c7cf47398985b3561f0d427aaa71fb70b6656f [diff] [blame] |
Merge branch 'ONOS-Next' of https://github.com/OPENNETWORKINGLAB/ONLabTest into ONOS-Next Conflicts: TestON/drivers/common/cli/onosclidriver.py
diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.params b/TestON/tests/TopoPerfNext/TopoPerfNext.params index 42512e8..851522c 100644 --- a/TestON/tests/TopoPerfNext/TopoPerfNext.params +++ b/TestON/tests/TopoPerfNext/TopoPerfNext.params
@@ -57,7 +57,9 @@ <linkUpThreshold>0,10000</linkUpThreshold> <linkDownThreshold>0,10000</linkDownThreshold> <swDisc100Threshold>0,10000</swDisc100Threshold> - </TEST> + + <tabletFile>tablets_3node.json</tabletFile> + </TEST> <JSON> <deviceTimestamp>topologyDeviceEventTimestamp</deviceTimestamp>