SR fixes
- Update trellis-* app versions
- Fix xconnect configuration
- Avoid reserved MPLS labels
Change-Id: Ie7755f6afc4fcb3480e7f218f7e2e76f70c57531
diff --git a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/README.md b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/README.md
index 59c1214..1debd8a 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/README.md
+++ b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/README.md
@@ -12,5 +12,5 @@
- 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 topology is a 2x2 Leaf-spine
diff --git a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.params b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.params
index 3bd8457..bb154b2 100755
--- a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/SRLinkFailure.params
@@ -16,13 +16,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/SRLinkFailure/dependencies/SRLinkFailFuncs.py b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/dependencies/SRLinkFailFuncs.py
index 6a8dd7e..4f07fe5 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/dependencies/SRLinkFailFuncs.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRLinkFailure/dependencies/SRLinkFailFuncs.py
@@ -50,6 +50,8 @@
run.loadJson( main )
run.loadChart( main )
run.startMininet( main, 'cord_fabric.py', args=self.topo[ Topo ][ 2 ] )
+ # xconnects need to be loaded after topology
+ run.loadXconnects( main )
# pre-configured routing and bridging test
run.checkFlows( main, minFlowCount=minFlow )
run.pingAll( main )