SR fixes
- Update trellis-* app versions
- Fix xconnect configuration
- Avoid reserved MPLS labels
Change-Id: Ie7755f6afc4fcb3480e7f218f7e2e76f70c57531
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/README.md b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/README.md
index 21e7773..bc53765 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/README.md
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/README.md
@@ -14,7 +14,7 @@
- An updated version of the CPQD switch has to be running to make sure it supports group chaining.
The test is executed using the netcfg subsystem:
- 1) APPS=openflow-base,netcfghostprovider,netcfglinksprovider
+ 1) APPS=openflow-base,netcfghostprovider,lldpprovider
The test runs for different topologies:
- 2x2 Leaf-Spine and 3-node ONOS cluster
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
index 85c0e30..4e17839 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/SRClusterRestart.params
@@ -20,7 +20,7 @@
<ENV>
<cellName>productionCell</cellName>
- <cellApps>drivers,hostprovider,segmentrouting,openflow-base,netcfghostprovider,netcfglinksprovider</cellApps>
+ <cellApps>drivers,hostprovider,segmentrouting,openflow-base,netcfghostprovider,lldpprovider</cellApps>
</ENV>
<GIT>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
index c11e4a0..cead0b4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
@@ -48,6 +48,8 @@
# Run the test with physical devices
# TODO: connect TestON to the physical network
pass
+ # xconnects need to be loaded after topology
+ run.loadXconnects( main )
# pre-configured routing and bridging test
run.checkFlows( main, minFlowCount=minFlow )
run.pingAll( main )