Add Stratum support for SRDynamicConf
- Add bmv2 switch support to cord_fabric topo file
- Fix some error handling for SR tests
- Updating testcases to run for SR Stratum tests
- Fix Tost-ONOS docker image tag for onos-2.2
- Update make command for changed variable names
- Fix expected hosts files for SRDhcprelay
- Fix case 12 config
- Add config for cases 3 and 4
- Create generic files
Change-Id: I39d499baaf69eb047e261fd2d6b6f2e846707719
(cherry picked from commit c15b8dfb3093c1b693ea05227ada9a9f1c6d4afb)
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE03.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE03.host
new file mode 100644
index 0000000..9428e54
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE03.host
@@ -0,0 +1,16 @@
+{
+ "onos":
+ {
+ "00:AA:00:00:00:01/None": "10.0.2.1",
+ "00:AA:00:00:00:02/None": "10.0.2.2",
+ "00:AA:00:00:00:03/None": "10.0.3.1",
+ "00:AA:00:00:00:04/None": "10.0.3.2"
+ },
+ "network":
+ {
+ "h1": "10.0.2.1",
+ "h2": "10.0.2.2",
+ "h3": "10.0.3.1",
+ "h4": "10.0.3.2"
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE04.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE04.host
new file mode 100644
index 0000000..9428e54
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE04.host
@@ -0,0 +1,16 @@
+{
+ "onos":
+ {
+ "00:AA:00:00:00:01/None": "10.0.2.1",
+ "00:AA:00:00:00:02/None": "10.0.2.2",
+ "00:AA:00:00:00:03/None": "10.0.3.1",
+ "00:AA:00:00:00:04/None": "10.0.3.2"
+ },
+ "network":
+ {
+ "h1": "10.0.2.1",
+ "h2": "10.0.2.2",
+ "h3": "10.0.3.1",
+ "h4": "10.0.3.2"
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE12.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE12.host
index d99eef6..7241b17 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE12.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/CASE12.host
@@ -1,10 +1,10 @@
{
"onos":
{
- "00:AA:00:00:00:01/None": "2000::201",
- "00:AA:00:00:00:02/None": "2000::202",
- "00:AA:00:00:00:03/None": "2000::301",
- "00:AA:00:00:00:04/None": "2000::302"
+ "00:BB:00:00:00:01/None": "2000::201",
+ "00:BB:00:00:00:02/None": "2000::202",
+ "00:BB:00:00:00:03/None": "2000::301",
+ "00:BB:00:00:00:04/None": "2000::302"
},
"network":
{
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v4.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v4.host
new file mode 100644
index 0000000..9428e54
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v4.host
@@ -0,0 +1,16 @@
+{
+ "onos":
+ {
+ "00:AA:00:00:00:01/None": "10.0.2.1",
+ "00:AA:00:00:00:02/None": "10.0.2.2",
+ "00:AA:00:00:00:03/None": "10.0.3.1",
+ "00:AA:00:00:00:04/None": "10.0.3.2"
+ },
+ "network":
+ {
+ "h1": "10.0.2.1",
+ "h2": "10.0.2.2",
+ "h3": "10.0.3.1",
+ "h4": "10.0.3.2"
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v4tagged.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v4tagged.host
new file mode 100644
index 0000000..5927f93
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v4tagged.host
@@ -0,0 +1,16 @@
+{
+ "onos":
+ {
+ "00:AA:00:00:00:01/20": "10.0.2.1",
+ "00:AA:00:00:00:02/20": "10.0.2.2",
+ "00:AA:00:00:00:03/30": "10.0.3.1",
+ "00:AA:00:00:00:04/30": "10.0.3.2"
+ },
+ "network":
+ {
+ "h1": "10.0.2.1",
+ "h2": "10.0.2.2",
+ "h3": "10.0.3.1",
+ "h4": "10.0.3.2"
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v6.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v6.host
new file mode 100644
index 0000000..7241b17
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v6.host
@@ -0,0 +1,16 @@
+{
+ "onos":
+ {
+ "00:BB:00:00:00:01/None": "2000::201",
+ "00:BB:00:00:00:02/None": "2000::202",
+ "00:BB:00:00:00:03/None": "2000::301",
+ "00:BB:00:00:00:04/None": "2000::302"
+ },
+ "network":
+ {
+ "h1v6": "2000::201",
+ "h2v6": "2000::202",
+ "h3v6": "2000::301",
+ "h4v6": "2000::302"
+ }
+}
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v6tagged.host b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v6tagged.host
new file mode 100644
index 0000000..411e2f4
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/host/v6tagged.host
@@ -0,0 +1,16 @@
+{
+ "onos":
+ {
+ "00:BB:00:00:00:01/40": "2000::201",
+ "00:BB:00:00:00:02/40": "2000::202",
+ "00:BB:00:00:00:03/50": "2000::301",
+ "00:BB:00:00:00:04/50": "2000::302"
+ },
+ "network":
+ {
+ "h1v6": "2000::201",
+ "h2v6": "2000::202",
+ "h3v6": "2000::301",
+ "h4v6": "2000::302"
+ }
+}