SRBridging test (CASE-6) Paired-leaf pod
Change-Id: I452cb1619e9d433142626c95c95ed0794b4b749a
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
index 458a4a7..e2b175f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
@@ -34,7 +34,6 @@
self.switchNames[ '2x2' ] = [ "leaf1", "leaf2", "spine101", "spine102" ]
main.switchType = "ovs"
-
def runTest( self, main, test_idx, topology, onosNodes, description, vlan = [] ):
try:
skipPackage = False
@@ -90,7 +89,6 @@
main.log.info( "Using %s switch" % main.switchType )
run.startMininet( main, 'trellis_fabric.py', args=mininet_args )
-
else:
# Run the test with physical devices
run.connectToPhysicalNetwork( main, hostDiscovery=False ) # We don't want to do host discovery in the pod
@@ -112,6 +110,7 @@
leaf_dpid = [ "of:%016d" % ( ls + 1 ) for ls in range( self.topo[ topology ][ 'leaves' ] ) ]
for dpid in leaf_dpid:
run.checkFlowsByDpid( main, dpid, self.topo[ topology ][ 'minFlow-Stratum' if main.useBmv2 else 'minFlow-OvS' ], sleep=5 )
+ run.populateHostsVlan( main, main.Network.hosts.keys() )
run.verifyTopology( main, switches, links, onosNodes )
run.pingAll( main )
except Exception as e:
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE09.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE09.chart
index f52bad8..f1fe795 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE09.chart
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE09.chart
@@ -1,4 +1,4 @@
{
"leaf1": {"expect": "True",
- "hosts":["h1", "ng40"]}
+ "hosts":["h1", "h2"]}
}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE19.chart b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE19.chart
index f1fe795..f52bad8 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE19.chart
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/chart/CASE19.chart
@@ -1,4 +1,4 @@
{
"leaf1": {"expect": "True",
- "hosts":["h1", "h2"]}
+ "hosts":["h1", "ng40"]}
}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
new file mode 100644
index 0000000..a10a0ca
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE06.json.tucson
@@ -0,0 +1,48 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-1-1"
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged":111,
+ "name": "compute-1-2"
+ }
+ ]
+ },
+ "device:leaf1/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged": 111,
+ "name": "compute-2-1"
+ }
+ ]
+ },
+ "device:leaf2/40": {
+ "interfaces": [
+ {
+ "ips": [
+ "10.32.11.126/25"
+ ],
+ "vlan-untagged": 111,
+ "name": "compute-2-2"
+ }
+ ]
+ }
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE06.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE06.cfg
new file mode 100644
index 0000000..ced0429
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE06.cfg
@@ -0,0 +1,24 @@
+{
+"ports":{
+ "device:leaf1/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "192.168.103.1/24"
+ ],
+ "vlan-untagged":102
+ }
+ ]
+ },
+ "device:leaf2/56":{
+ "interfaces":[
+ {
+ "ips":[
+ "192.168.103.2/24"
+ ],
+ "vlan-untagged":102
+ }
+ ]
+ }
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
index ced0429..4cb68f0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE09.cfg
@@ -6,7 +6,7 @@
"ips":[
"192.168.103.1/24"
],
- "vlan-untagged":102
+ "vlan-untagged":[102]
}
]
},
@@ -16,7 +16,7 @@
"ips":[
"192.168.103.2/24"
],
- "vlan-untagged":102
+ "vlan-untagged":[102]
}
]
}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
index 7fe7a67..d5c73e0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE19.cfg
@@ -6,7 +6,7 @@
"ips":[
"192.168.103.1/24"
],
- "vlan-tagged":102
+ "vlan-tagged":[102]
}
]
},
@@ -16,7 +16,7 @@
"ips":[
"192.168.103.2/24"
],
- "vlan-tagged":103
+ "vlan-tagged":[103]
}
]
}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
index c09601a..b09226c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/netcfg/CASE29.cfg
@@ -6,8 +6,8 @@
"ips":[
"192.168.103.1/24"
],
- "vlan-native":103
- "vlan-tagged":102
+ "vlan-native":[103]
+ "vlan-tagged":[102]
}
]
},
@@ -17,8 +17,8 @@
"ips":[
"192.168.103.2/24"
],
- "vlan-native":103
- "vlan-untagged":102
+ "vlan-native":[103]
+ "vlan-untagged":[102]
}
]
}