tests: expand pbr-topo1 to cover DSCP & ECN

Signed-off-by: Wesley Coakley <wcoakley@nvidia.com>

diff --git a/tests/topotests/pbr-topo1/r1/pbr-map.json b/tests/topotests/pbr-topo1/r1/pbr-map.json
index f0738dc5408ddac46996dfac936a01758afb85fd..bfa0ecb849056aa08b812f891860c353df427c20 100644 (file)
--- a/tests/topotests/pbr-topo1/r1/pbr-map.json
+++ b/tests/topotests/pbr-topo1/r1/pbr-map.json
@@ -62,6 +62,32 @@
         },
         "matchDst":"dead:beef::\/64",
         "matchMark":314159
+      },
+      {
+        "sequenceNumber":15,
+        "vrfUnchanged":false,
+        "installed":true,
+        "installedReason":"Valid",
+        "nexthopGroup":{
+          "name":"ASAKUSA15",
+          "installed":true,
+          "installedInternally":1
+        },
+        "matchDst":"dead:beef::/64",
+        "matchDscp":10
+      },
+      {
+        "sequenceNumber":20,
+        "vrfUnchanged":false,
+        "installed":true,
+        "installedReason":"Valid",
+        "nexthopGroup":{
+          "name":"ASAKUSA20",
+          "installed":true,
+          "installedInternally":1
+        },
+        "matchDst":"dead:beef::/64",
+        "matchEcn":1
       }
     ]
   },

diff --git a/tests/topotests/pbr-topo1/r1/pbrd.conf b/tests/topotests/pbr-topo1/r1/pbrd.conf
index 298cba2860c0ac74a2989e7959507cdadf654bd1..45cb7656ab691ad9e44062e51a76abd754840ff5 100644 (file)
--- a/tests/topotests/pbr-topo1/r1/pbrd.conf
+++ b/tests/topotests/pbr-topo1/r1/pbrd.conf
@@ -73,6 +73,16 @@ pbr-map ASAKUSA seq 10
   match mark 314159
   set nexthop c0ff:ee::1
 !
+pbr-map ASAKUSA seq 15
+  match dst-ip dead:beef::/64
+  match dscp af11
+  set nexthop c0ff:ee::1
+!
+pbr-map ASAKUSA seq 20
+  match dst-ip dead:beef::/64
+  match ecn 1
+  set nexthop c0ff:ee::1
+!
 # Interface policies
 int r1-eth1
   pbr-policy EVA