Automating tests for SRBridging
Change-Id: Ia6a215a96b51f44d8ab2ad24aca20d56eba05290
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
index 4e5e5fb..458a4a7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
@@ -34,6 +34,7 @@
self.switchNames[ '2x2' ] = [ "leaf1", "leaf2", "spine101", "spine102" ]
main.switchType = "ovs"
+
def runTest( self, main, test_idx, topology, onosNodes, description, vlan = [] ):
try:
skipPackage = False
@@ -93,7 +94,12 @@
else:
# Run the test with physical devices
run.connectToPhysicalNetwork( main, hostDiscovery=False ) # We don't want to do host discovery in the pod
-
+ if main.cfgName:
+ returnValue = run.loadNewJson( main )
+ utilities.assert_equals( expect=main.TRUE,
+ actual=returnValue,
+ onpass="Successfully changed network config",
+ onfail="Failed to changed network config" )
run.checkFlows( main, minFlowCount=self.topo[ topology ][ 'minFlow-Stratum' if main.useBmv2 else 'minFlow-OvS' ] * self.topo[ topology ][ 'leaves' ], sleep=5 )
if main.useBmv2:
switchPrefix = main.params[ 'DEPENDENCY' ].get( 'switchPrefix', '' )
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
index 3300a4b..ced0429 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
@@ -1,5 +1,6 @@
+{
"ports":{
- "decive:leaf1/56":{
+ "device:leaf1/56":{
"interfaces":[
{
"ips":[
@@ -20,3 +21,4 @@
]
}
}
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
index 352ba54..7fe7a67 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
@@ -1,5 +1,6 @@
+{
"ports":{
- "decive:leaf1/56":{
+ "device:leaf1/56":{
"interfaces":[
{
"ips":[
@@ -20,3 +21,4 @@
]
}
}
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
index 9f97e82..c09601a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
@@ -1,5 +1,6 @@
+{
"ports":{
- "decive:leaf1/56":{
+ "device:leaf1/56":{
"interfaces":[
{
"ips":[
@@ -22,3 +23,4 @@
]
}
}
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE39.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE39.cfg
index 6948335..ea119ca 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE39.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE39.cfg
@@ -1,3 +1,4 @@
+{
"ports":{
"device:leaf1/56":{
"interfaces":[
@@ -23,3 +24,4 @@
]
}
}
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE49.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE49.cfg
index 89ceb77..fee5e68 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE49.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE49.cfg
@@ -1,5 +1,6 @@
+{
"ports":{
- "decive:leaf1/56":{
+ "device:leaf1/56":{
"interfaces":[
{
"ips":[
@@ -9,7 +10,7 @@
}
]
},
- "decive:leaf1/56":
+ "device:leaf1/56":
{ "interfaces":[
{
"ips":[
@@ -20,3 +21,4 @@
]
}
}
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE59.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE59.cfg
index 8c462ce..7dfc797 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE59.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE59.cfg
@@ -1,5 +1,6 @@
+{
"ports":{
- "decive:leaf1/56":{
+ "device:leaf1/56":{
"interfaces":[
{
"ips":[
@@ -20,3 +21,4 @@
]
}
}
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE69.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE69.cfg
index 352ba54..7fe7a67 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE69.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE69.cfg
@@ -1,5 +1,6 @@
+{
"ports":{
- "decive:leaf1/56":{
+ "device:leaf1/56":{
"interfaces":[
{
"ips":[
@@ -20,3 +21,4 @@
]
}
}
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE79.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE79.cfg
index b3b04f2..d3a7412 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE79.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE79.cfg
@@ -1,5 +1,6 @@
+{
"ports":{
- "decive:leaf1/56":{
+ "device:leaf1/56":{
"interfaces":[
{
"ips":[
@@ -20,3 +21,4 @@
]
}
}
+}