added scp from ONOScli
Change-Id: Icf0ca7265d3fd8f142ac3d6d6d57142d30023950
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index f3de98f..0b5906f 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1561,7 +1561,7 @@
* fileName: Name of the file
"""
- localtime = time.strftime( '%x %X' )
+ localtime = time.strftime( '%H %M' )
localtime = localtime.replace( "/", "" )
localtime = localtime.replace( " ", "_" )
localtime = localtime.replace( ":", "" )
@@ -1595,7 +1595,7 @@
with multiple file copying
"""
try:
- localtime = time.strftime( '%x %X' )
+ localtime = time.strftime( '%H %M' )
localtime = localtime.replace( "/", "" )
localtime = localtime.replace( " ", "_" )
localtime = localtime.replace( ":", "" )
diff --git a/TestON/tests/USECASE/USECASE_SegmentRouting/USECASE_SegmentRouting.py b/TestON/tests/USECASE/USECASE_SegmentRouting/USECASE_SegmentRouting.py
index f44966b..1a4834b 100755
--- a/TestON/tests/USECASE/USECASE_SegmentRouting/USECASE_SegmentRouting.py
+++ b/TestON/tests/USECASE/USECASE_SegmentRouting/USECASE_SegmentRouting.py
@@ -245,10 +245,10 @@
main.cleanup()
main.exit()
#main.step("Waiting for switch initialization and configuration")
- main.step(" Check whether the flow count is bigger than 80" )
+ main.step(" Check whether the flow count is bigger than 116" )
count = utilities.retry( main.CLIs[0].checkFlowCount,
main.FALSE,
- kwargs={'min':10},
+ kwargs={'min':116},
attempts=10 )
utilities.assertEquals( \
expect=True,
@@ -296,7 +296,12 @@
#if len(main.json) > 0 :
main.ONOSbench.onosStop( main.ONOSip[0] )
main.Mininet1.stopNet()
- main.ONOSbench.cpLogsToDir("/opt/onos/log/karaf.log",main.logdir,
+
+ main.ONOSbench.scp( main.ONOScli1 ,
+ "/opt/onos/log/karaf.log",
+ "/tmp/karaf.log",
+ direction="from" )
+ main.ONOSbench.cpLogsToDir("/tmp/karaf.log",main.logdir,
copyFileName="karaf.log."+main.jsonFile+str(len(main.json)))
#main.ONOSbench.logReport( main.ONOSip[ 0 ],
# [ "INFO" ],