commit 49c218d2e352f47a6a57511ec4c1a1a336783e46
author Flavio Castro <castro.flaviojr@gmail.com> Tue Jun 21 16:55:57 2016 -0700
committer Flavio Castro <castro.flaviojr@gmail.com> Tue Jun 28 09:59:49 2016 -0700
tree fc8d55ff12659320c38d687df230cf7bab6931a0
parent 9a7f2f7924460b4ddf82ec28a9c727ce7337b029

Now test pushes SR configuration via REST

Fixed Styling

Change-Id: I481da929ce9818b3aa73f3386f6c135ed55686a6

TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index 3ba3cc0..1e31cd3 100755
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -1,6 +1,7 @@
 import os

 import imp

 import time

+import json

 

 from core import utilities

 

@@ -34,10 +35,12 @@
         main.cellData = {} # for creating cell file

         main.CLIs = []

         main.ONOSip = []

+        main.RESTs= []

 

         # Assigning ONOS cli handles to a list

         for i in range( 1,  main.maxNodes + 1 ):

             main.CLIs.append( getattr( main, 'ONOScli' + str( i ) ) )

+            main.RESTs.append( getattr( main, 'ONOSrest' + str( i ) ) )

             main.ONOSip.append( main.CLIs[i-1].ip_address )

         # -- INIT SECTION, ONLY RUNS ONCE -- #

         main.startUp = imp.load_source( wrapperFile1,

@@ -108,7 +111,6 @@
         for i in range( main.maxNodes ):

             main.ONOSbench.onosDie( main.ONOSip[ i ] )

         main.step( "Create and Install ONOS package" )

-        main.ONOSbench.handle.sendline( "cp "+main.dependencyPath+"/"+main.cfgName+".json ~/onos/tools/package/config/network-cfg.json")

         packageResult = main.ONOSbench.onosPackage()

 

         onosInstallResult = main.TRUE

@@ -163,6 +165,9 @@
                                  onpass="ONOS summary command succeded",

                                  onfail="ONOS summary command failed" )

 

+        with open( main.dependencyPath + "/" + main.cfgName + ".json" ) as cfg:

+            main.RESTs[main.active].setNetCfg( json.load(cfg) )

+

         if not ready:

             main.log.error( "ONOS startup failed!" )

             main.cleanup()

@@ -245,7 +250,7 @@
         LinkDown = main.Mininet1.link( END1=end1, END2=end2, OPTION="down" )

         main.log.info( "Waiting %s seconds for link down to be discovered" % main.linkSleep )

         time.sleep( main.linkSleep )

-        topology =  utilities.retry( main.CLIs[main.active].checkStatus,

+        topology =  utilities.retry( main.CLIs[ main.active ].checkStatus,

                                      main.FALSE,

                                      kwargs={'numoswitch':switches, 'numolink':links},

                                      attempts=10,

@@ -334,9 +339,9 @@
         Copies ONOS log

         """

         main.Mininet1.stopNet()

-        main.ONOSbench.scp( main.ONOScli1 ,"/opt/onos/log/karaf.log",

+        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.cfgName)

-        for i in range(main.numCtrls):

+        main.ONOSbench.cpLogsToDir( "/tmp/karaf.log", main.logdir,

+                                   copyFileName="karaf.log."+main.cfgName )

+        for i in range( main.numCtrls ):

             main.ONOSbench.onosStop( main.ONOSip[i] )