Merge "Fixes for scaleTopo test"
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" )
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>