commit 8723cadc21f085a96cd9d58498484244ff09e509
author You Wang <you@onlab.us> Fri Oct 14 20:16:41 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Fri Oct 14 20:16:41 2016 +0000
tree bb21d9618479ebaf2348d767ba7c17689f9d188e
parent 15124dfea7cafffce9f2847d47a9898ade8e83ff
parent b8c2c849aba27a2093f627bd23ea92c4ba9e498b

Merge "Calculate ScaleTopo latency"

TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.params

diff --git a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.params b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.params
index 0976c40..d166de3 100644
--- a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.params
+++ b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.params
@@ -36,6 +36,7 @@
     <SLEEP>
         <startup>15</startup>
         <cfgGossip>2</cfgGossip>
+        <SetNetCfgSleep>5</SetNetCfgSleep>
     </SLEEP>
 
     <MININET>

TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py

diff --git a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
index 120d112..77e45ea 100644
--- a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
+++ b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
@@ -43,6 +43,7 @@
             wrapperFile3 = main.params[ 'DEPENDENCY' ][ 'wrapper3' ]
             main.startUpSleep = int( main.params[ 'SLEEP' ][ 'startup' ] )
             main.gossipTime = int( main.params[ 'SLEEP'][ 'cfgGossip' ] )
+            main.SetNetCfgSleep = int( main.params[ 'SLEEP' ][ 'SetNetCfgSleep' ] )
             gitPull = main.params[ 'GIT' ][ 'pull' ]
             main.cellData = {}  # for creating cell file
             main.hostsData = {}
@@ -402,6 +403,7 @@
         Add some device configurations and then check they are distributed
         to all nodes
         """
+        import time
         main.case( "Add Network configurations to the cluster" )
         main.caseExplanation = "Add Network Configurations for devices" +\
                                " not discovered yet. One device is allowed" +\
@@ -419,6 +421,8 @@
                                                subjectKey="of:0000000000000001",
                                                configKey="basic" )
         s1Result = False
+        #Wait 5 secs after set up netCfg
+        time.sleep( main.SetNetCfgSleep )
         if setS1Allow:
             # Check what we set is what is in ONOS
             getS1 = main.ONOSrest1.getNetCfg( subjectClass="devices",
@@ -427,6 +431,7 @@
             onosCfg = pprint( getS1 )
             sentCfg = pprint( s1Json )
             if onosCfg == sentCfg:
+                main.log.info( "ONOS NetCfg match what was sent" )
                 s1Result = True
             else:
                 main.log.error( "ONOS NetCfg doesn't match what was sent" )
@@ -449,6 +454,7 @@
                                                   subjectKey="of:0000000000000003",
                                                   configKey="basic" )
         s3Result = False
+        time.sleep( main.SetNetCfgSleep )
         if setS3Disallow:
             # Check what we set is what is in ONOS
             getS3 = main.ONOSrest1.getNetCfg( subjectClass="devices",
@@ -457,6 +463,7 @@
             onosCfg = pprint( getS3 )
             sentCfg = pprint( s3Json )
             if onosCfg == sentCfg:
+                main.log.info("ONOS NetCfg match what was sent")
                 s3Result = True
             else:
                 main.log.error( "ONOS NetCfg doesn't match what was sent" )