SR fixes
- Update trellis-* app versions
- Fix xconnect configuration
- Avoid reserved MPLS labels
Change-Id: Ie7755f6afc4fcb3480e7f218f7e2e76f70c57531
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/README.md b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/README.md
index 94677cb..6281d56 100755
--- a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/README.md
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/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/SROnosFailure/SROnosFailure.params b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
index 171f0d1..cc1010b 100755
--- a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params
@@ -15,13 +15,13 @@
<useCommonConf>True</useCommonConf>
<useCommonTopo>True</useCommonTopo>
<topology>cord_fabric.py</topology>
- <trellisOar>/home/sdn/segmentrouting-oar-3.0.0-SNAPSHOT.oar</trellisOar>
- <t3Oar>/home/sdn/t3-app-3.0.0-SNAPSHOT.oar</t3Oar>
+ <trellisOar>/home/sdn/segmentrouting-app-3.0.1-SNAPSHOT.oar</trellisOar>
+ <t3Oar>/home/sdn/t3-app-4.0.0-SNAPSHOT.oar</t3Oar>
</DEPENDENCY>
<ENV>
<cellName>productionCell</cellName>
- <cellApps>drivers,hostprovider,openflow-base,netcfghostprovider,netcfglinksprovider</cellApps>
+ <cellApps>drivers,hostprovider,openflow-base,netcfghostprovider,lldpprovider</cellApps>
</ENV>
<GIT>
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params.stratum b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params.stratum
index df9ac3c..c6651d6 100644
--- a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params.stratum
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/SROnosFailure.params.stratum
@@ -44,7 +44,7 @@
<ENV>
<cellName>productionCell</cellName>
- <cellApps>drivers,lldpprovider,hostprovider,netcfghostprovider,drivers.bmv2,pipelines.fabric,segmentrouting,t3 </cellApps>
+ <cellApps>drivers,hostprovider,netcfghostprovider,lldpprovider,drivers.bmv2,pipelines.fabric,segmentrouting,t3 </cellApps>
</ENV>
<ONOS_Configuration>
diff --git a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/SROnosFailureFuncs.py b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/SROnosFailureFuncs.py
index 624745d..679baf0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/SROnosFailureFuncs.py
+++ b/TestON/tests/USECASE/SegmentRouting/SROnosFailure/dependencies/SROnosFailureFuncs.py
@@ -55,6 +55,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, 'CASE{}'.format( caseNum ) )