commit 118ba58a9e28ee7ed5d0bbdad65a6488c006a7d7
author You Wang <you@onlab.us> Mon Jan 02 17:14:43 2017 -0800
committer You Wang <you@onlab.us> Tue Jan 03 10:23:07 2017 -0800
tree 02e63983cee3bfa7380cd219ee081dbf84ffd53d
parent ec63bdef551ebcfc0b525c5352f4746fae272a01

Bug fix for logSearch function

Change-Id: I4df4edd70f2ae52b55a8bb4c8c4081a228c076c0

TestON/drivers/common/cli/onosclidriver.py

diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 8d43411..d4fe11f 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -5058,7 +5058,7 @@
                     cmd = cmd + " | grep \'" + searchTerm + "\'" + " | head -n 1"
             if mode == 'num':
                 cmd = cmd + " | grep -c \'" + searchTerm + "\'"
-                num = self.sendstartTerm=startTerm1, line( cmd )
+                num = self.sendline( cmd )
                 return num
             if mode == 'total':
                 totalLines = self.sendline( "cat /opt/onos/log/karaf.log | wc -l" )

TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py

diff --git a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py
index 122e7bc..b670e12 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/scaleTopoFunction.py
@@ -56,7 +56,7 @@
 
     '''
     try:
-        termInfo = main.CLIs[ index ].logSearch( mode=Mode, term=term )
+        termInfo = main.CLIs[ index ].logSearch( mode=Mode, searchTerm=term )
         termTime = getTimestampFromString( main, termInfo[ 0 ] )
         roleRequestTime = getRoleRequestTimeFromTshark( main )
         if termTime == -1 or roleRequestTime == -1:
@@ -87,8 +87,8 @@
 
     '''
     try:
-        termInfo1 = main.CLIs[ index ].logSearch( mode=mode1,term=term1 )
-        termInfo2 = main.CLIs[ index ].logSearch( mode=mode2,term=term2 )
+        termInfo1 = main.CLIs[ index ].logSearch( mode=mode1, searchTerm=term1 )
+        termInfo2 = main.CLIs[ index ].logSearch( mode=mode2, searchTerm=term2 )
         if funcMode == 'TD':
             startTime = getTimestampFromString( main, termInfo1[0] )
             endTime = getTimestampFromString ( main, termInfo2[0] )