commit d91a70fde362ddd4b8afb1ff87c4a2288dddf296
author You Wang <you@opennetworking.org> Thu Jan 03 15:28:10 2019 -0800
committer You Wang <you@opennetworking.org> Thu Jan 03 15:28:10 2019 -0800
tree 483e48e16bf680566ce97e18169e0cc81c95d98d
parent 25e3bcc66c9e611d1183f4e0a23e61d4207c305d

Fixes for scaleTopo test

Change-Id: I124f2968ececdce37419fa8a5aedd3e8a7bdf905

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 033ba87..fca1a92 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -5421,8 +5421,8 @@
             elif mode == 'first':
                 cmd = cmd + " | grep \'" + searchTerm + "\'" + " | head -n 1"
             elif mode == 'num':
-                cmd = cmd + " | grep -c \'" + searchTerm + "\'"
-                num = self.sendline( cmd )
+                cmd = cmd + " | grep \'" + searchTerm + "\' | wc -l"
+                num = self.lineCount( cmd )
                 return num
             elif mode == 'total':
                 totalLines = self.lineCount( "cat /opt/onos/log/karaf.log | wc -l" )

TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params

diff --git a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
index 39f73bf..fee4291 100755
--- a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
+++ b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.params
@@ -78,7 +78,7 @@
 
     <TOPOLOGY>
         <topology>torus</topology>
-        <scale>10,20,30,40,50,55,60</scale>
+        <scale>10,20,30,40,50</scale>
         <host>True</host>
     </TOPOLOGY>