SR fixes
- Update trellis-* app versions
- Fix xconnect configuration
- Avoid reserved MPLS labels
Change-Id: Ie7755f6afc4fcb3480e7f218f7e2e76f70c57531
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
index 87b7b46..9293c8e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
index c9b635a..da60e7e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
@@ -60,7 +60,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -72,7 +72,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
index 87b7b46..9293c8e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
index c9b635a..da60e7e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
@@ -60,7 +60,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -72,7 +72,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
index 7ba4f8b..195d497 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
index f9a70e0..caebe93 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
index baf3268..243f283 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
index 3517e1d..a7efeeb 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
@@ -60,7 +60,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -72,7 +72,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
index baf3268..243f283 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
index 3517e1d..a7efeeb 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
@@ -60,7 +60,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -72,7 +72,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
index caeda8b..b478aff 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
index 5c3f13a..050781e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
index 85d0091..4547dbf 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
index a39ad31..43daa02 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
@@ -60,7 +60,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -72,7 +72,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
index 7e0a83b..6e14ba8 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
@@ -52,7 +52,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -64,7 +64,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
index f950f0c..6f42b53 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
@@ -76,7 +76,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -90,7 +90,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -104,7 +104,7 @@
},
"of:0000000000000003" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 203,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -118,7 +118,7 @@
},
"of:0000000000000004" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 204,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
index 0922c53..a7ba265 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
@@ -76,7 +76,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -90,7 +90,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -104,7 +104,7 @@
},
"of:0000000000000003" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 203,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -118,7 +118,7 @@
},
"of:0000000000000004" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 204,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
index 83cb578..f1a94e1 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
@@ -76,7 +76,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -90,7 +90,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -104,7 +104,7 @@
},
"of:0000000000000003" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 203,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -118,7 +118,7 @@
},
"of:0000000000000004" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 204,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
index 9737d12..0cbde04 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
@@ -76,7 +76,7 @@
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 201,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -90,7 +90,7 @@
},
"of:0000000000000002" : {
"segmentrouting" : {
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 202,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -104,7 +104,7 @@
},
"of:0000000000000003" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 203,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -118,7 +118,7 @@
},
"of:0000000000000004" : {
"segmentrouting" : {
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 204,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,