[ONOS-7475] Refactoring SR tests
Change-Id: I10e51fcb8b416167e6a338e9030933162640af89
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:
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE01.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE01.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE02.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE02.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE11.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE11.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE12.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE12.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE21.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE21.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE22.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE22.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE31.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE31.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE41.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE41.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE51.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE51.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE61.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE61.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE71.host
similarity index 100%
rename from TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.host
rename to TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE71.host
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json
new file mode 100644
index 0000000..e3544bf
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json
@@ -0,0 +1,16 @@
+{
+ "hosts" : {
+ "00:00:00:00:00:09/-1" : {
+ "basic": {
+ "ips": ["10.0.1.9"],
+ "locations": ["of:0000000000000001/3"]
+ }
+ },
+ "00:00:00:00:09:01/-1" : {
+ "basic": {
+ "ips": ["10.0.9.1"],
+ "locations": ["of:0000000000000001/4"]
+ }
+ }
+ }
+}