commit 57221b08ba619088ed4de26c1843738fd7ec0d18
author Devin Lim <devin@opennetworking.org> Wed Feb 14 15:45:36 2018 -0800
committer Devin Lim <devin@opennetworking.org> Wed Feb 28 13:12:55 2018 -0800
tree 2f5d22c9d4c5d5341b19090775bdac27b1f56529
parent 53dba1e6553fbfd11d77776d30aaef735be1f859

[ONOS-7475] Refactoring SR tests

Change-Id: I10e51fcb8b416167e6a338e9030933162640af89

TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py

diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py
index 1ac4f7a..1bbb0f9 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/SRDhcprelayTest.py
@@ -41,13 +41,11 @@
                    ( description, onosNodes, 's' if onosNodes > 1 else '' ) )
 
         main.cfgName = 'CASE%02d' % testIndex
-        main.configPath = main.path + "/dependencies/"
         main.resultFileName = 'CASE%02d' % testIndex
         main.Cluster.setRunningNode( onosNodes )
         run.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
-        import json
-        with open( "%s/json/%s.host" % ( main.configPath, main.cfgName ) ) as host:
-            main.expectedHosts = json.load( host )
+        run.loadJson( main )
+        run.loadHost( main )
         if hasattr( main, 'Mininet1' ):
             # Run the test with Mininet
             if dualHomed: