tests: pbr topotests variety of maps and nh-groups

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

diff --git a/tests/topotests/pbr-topo1/r1/pbr-interface.json b/tests/topotests/pbr-topo1/r1/pbr-interface.json
index 452b24dcd70b5fef5975a757cfa37a50d84b2560..e28d9fb149c3ff14a55618f702ece0c167450360 100644 (file)
--- a/tests/topotests/pbr-topo1/r1/pbr-interface.json
+++ b/tests/topotests/pbr-topo1/r1/pbr-interface.json
@@ -8,5 +8,20 @@
     "name":"r1-eth2",
     "policy":"DONNA",
     "valid":true
+  },
+  {
+    "name":"r1-eth3",
+    "policy":"AKIHABARA",
+    "valid":true
+  },
+  {
+    "name":"r1-eth4",
+    "policy":"ASAKUSA",
+    "valid":true
+  },
+  {
+    "name":"r1-noexist",
+    "policy":"NOEXIST",
+    "valid":false
   }
 ]

diff --git a/tests/topotests/pbr-topo1/r1/pbr-map.json b/tests/topotests/pbr-topo1/r1/pbr-map.json
index 6b9eaa9cebadde87e27db085d0aa8495ee8e29a4..3d08b75993c59e05467617b166be4c3a9a02332e 100644 (file)
--- a/tests/topotests/pbr-topo1/r1/pbr-map.json
+++ b/tests/topotests/pbr-topo1/r1/pbr-map.json
@@ -1,21 +1,57 @@
 [
   {
-    "name":"DONNA",
+    "name":"AKIHABARA",
     "valid":true,
     "policies":[
       {
-        "id":3,
         "sequenceNumber":5,
-        "ruleNumber":304,
+        "vrfUnchanged":true,
+        "installed":false,
+        "installedReason":"Valid",
+        "matchDst":"192.168.4.0\/24"
+      }
+    ]
+  },
+  {
+    "name":"ASAKUSA",
+    "valid":true,
+    "policies":[
+      {
+        "sequenceNumber":5,
+        "vrfUnchanged":true,
+        "installed":false,
+        "installedReason":"Valid",
+        "matchDst":"c0ff:ee::\/64"
+      },
+      {
+        "sequenceNumber":10,
         "vrfUnchanged":false,
         "installed":true,
         "installedReason":"Valid",
         "nexthopGroup":{
-          "tableId":10002,
-          "name":"C",
+          "name":"ASAKUSA10",
           "installed":true,
           "installedInternally":1
         },
+        "matchDst":"dead:beef::\/64",
+        "matchMark":314159
+      }
+    ]
+  },
+  {
+    "name":"DONNA",
+    "valid":false,
+    "policies":[
+      {
+        "sequenceNumber":5,
+        "vrfUnchanged":false,
+        "installed":false,
+        "installedReason":"Invalid NH-group",
+        "nexthopGroup":{
+          "name":"B",
+          "installed":false,
+          "installedInternally":0
+        },
         "matchSrc":"1.2.0.0\/16",
         "matchDst":"3.4.5.0\/24"
       }
@@ -26,14 +62,11 @@
     "valid":true,
     "policies":[
       {
-        "id":1,
         "sequenceNumber":5,
-        "ruleNumber":304,
         "vrfUnchanged":false,
         "installed":true,
         "installedReason":"Valid",
         "nexthopGroup":{
-          "tableId":10003,
           "name":"EVA5",
           "installed":true,
           "installedInternally":1
@@ -41,14 +74,12 @@
         "matchSrc":"4.5.6.7\/32"
       },
       {
-        "id":2,
         "sequenceNumber":10,
         "ruleNumber":309,
         "vrfUnchanged":false,
         "installed":true,
         "installedReason":"Valid",
         "nexthopGroup":{
-          "tableId":10000,
           "name":"A",
           "installed":true,
           "installedInternally":1

diff --git a/tests/topotests/pbr-topo1/r1/pbr-nexthop-groups.json b/tests/topotests/pbr-topo1/r1/pbr-nexthop-groups.json
index ff85438ad5824ad71f9733198ebe00346b494bf3..2402293865450b3dc8c7816fa97407622a949f46 100644 (file)
--- a/tests/topotests/pbr-topo1/r1/pbr-nexthop-groups.json
+++ b/tests/topotests/pbr-topo1/r1/pbr-nexthop-groups.json
@@ -1,6 +1,16 @@
 [
   {
-    "id":10000,
+    "name":"ASAKUSA10",
+    "valid":true,
+    "installed":true,
+    "nexthops":[
+      {
+        "nexthop":"c0ff:ee::1",
+        "valid":true
+      }
+    ]
+  },
+  {
     "name":"A",
     "valid":true,
     "installed":true,
@@ -20,19 +30,44 @@
     ]
   },
   {
-    "id":10002,
+    "name":"D",
+    "valid":true,
+    "installed":true,
+    "nexthops":[
+      {
+        "nexthop":"c0ff:ee::3",
+        "valid":true
+      },
+      {
+        "nexthop":"c0ff:ee::2",
+        "valid":true
+      },
+      {
+        "nexthop":"c0ff:ee::1",
+        "valid":true
+      }
+    ]
+  },
+  {
     "name":"C",
     "valid":true,
     "installed":true,
     "nexthops":[
       {
-        "nexthop":"192.168.1.44",
+        "nexthop":"192.168.4.3",
+        "valid":true
+      },
+      {
+        "nexthop":"192.168.4.2",
+        "valid":true
+      },
+      {
+        "nexthop":"192.168.4.1",
         "valid":true
       }
     ]
   },
   {
-    "id":10001,
     "name":"B",
     "valid":false,
     "installed":false,
@@ -44,7 +79,6 @@
     ]
   },
   {
-    "id":10003,
     "name":"EVA5",
     "valid":true,
     "installed":true,

diff --git a/tests/topotests/pbr-topo1/r1/pbrd.conf b/tests/topotests/pbr-topo1/r1/pbrd.conf
index 234683f307c9dcb1d32ecb4ff4b1321251fc495e..f615a971c0fb642b8dd940d92f9b3a4c4ef1391a 100644 (file)
--- a/tests/topotests/pbr-topo1/r1/pbrd.conf
+++ b/tests/topotests/pbr-topo1/r1/pbrd.conf
@@ -1,8 +1,9 @@
+debug pbr
+!
 nexthop-group A
   nexthop 192.168.1.2
   nexthop 192.168.2.2
   nexthop 192.168.3.2
-  nexhtop 192.168.4.2
 !
 # This one is bogus and should
 # never work
@@ -10,7 +11,14 @@ nexthop-group B
    nexthop 192.168.50.1
 !
 nexthop-group C
-   nexthop 192.168.1.44
+   nexthop 192.168.4.1
+   nexthop 192.168.4.2
+   nexthop 192.168.4.3
+!
+nexthop-group D
+   nexthop c0ff:ee::1
+   nexthop c0ff:ee::2
+   nexthop c0ff:ee::3
 !
 pbr-map EVA seq 5
   match src-ip 4.5.6.7/32
@@ -23,11 +31,35 @@ pbr-map EVA seq 10
 pbr-map DONNA seq 5
    match dst-ip 3.4.5.0/24
    match src-ip 1.2.0.0/16
-   set nexthop-group C  
-!  
-
+   set nexthop-group B
+!
+pbr-map AKIHABARA seq 5
+  match dst-ip 192.168.4.0/24
+  set nexthop-group C
+  set vrf unchanged
+!
+pbr-map ASAKUSA seq 5
+  match dst-ip c0ff:ee::/64
+  set nexthop-group D
+  set vrf unchanged
+!
+pbr-map ASAKUSA seq 10
+  match dst-ip dead:beef::/64
+  match mark 314159
+  set nexthop c0ff:ee::1
+!
+# Interface policies
 int r1-eth1
   pbr-policy EVA
 !
 int r1-eth2
   pbr-policy DONNA
+!
+int r1-eth3
+  pbr-policy AKIHABARA
+!
+int r1-eth4
+  pbr-policy ASAKUSA
+!
+int r1-noexist
+  pbr-policy NOEXIST

diff --git a/tests/topotests/pbr-topo1/r1/zebra.conf b/tests/topotests/pbr-topo1/r1/zebra.conf
index f29b146a621f8b2b06581fb24a3feb6792cb0fb6..b9c6dc1bb21495440a4b8b7a81e2d0ecee26a701 100644 (file)
--- a/tests/topotests/pbr-topo1/r1/zebra.conf
+++ b/tests/topotests/pbr-topo1/r1/zebra.conf
@@ -7,5 +7,8 @@ int r1-eth1
 int r1-eth2
   ip address 192.168.3.1/24
 
-int r1-eth3
+interface r1-eth3
   ip address 192.168.4.1/24
+
+int r1-eth4
+  ipv6 address c0ff:ee::/64

diff --git a/tests/topotests/pbr-topo1/test_pbr_topo1.py b/tests/topotests/pbr-topo1/test_pbr_topo1.py
index 2853165d45314a5c399d45476a154cc9332313e9..9939aa7456ba6add811a690dab7296227bd4f1df 100755 (executable)
--- a/tests/topotests/pbr-topo1/test_pbr_topo1.py
+++ b/tests/topotests/pbr-topo1/test_pbr_topo1.py
@@ -61,26 +61,14 @@ class NetworkTopo(Topo):
 
         tgen = get_topogen(self)
 
+        # Populate routers
         for routern in range(1, 2):
             tgen.add_router("r{}".format(routern))
 
-        # On main router
-        # First switch is for a dummy interface (for local network)
-        switch = tgen.add_switch("sw1")
-        switch.add_link(tgen.gears["r1"])
-
-        # Switches for PBR
-        # switch 2 switch is for connection to PBR router
-        switch = tgen.add_switch("sw2")
-        switch.add_link(tgen.gears["r1"])
-
-        # switch 4 is stub on remote PBR router
-        switch = tgen.add_switch("sw4")
-        switch.add_link(tgen.gears["r1"])
-
-        # switch 3 is between PBR routers
-        switch = tgen.add_switch("sw3")
-        switch.add_link(tgen.gears["r1"])
+        # Populate switches
+        for switchn in range(1, 6):
+            switch = tgen.add_switch("sw{}".format(switchn))
+            switch.add_link(tgen.gears["r1"])
 
 
 #####################################################
@@ -95,7 +83,6 @@ def setup_module(module):
     tgen = Topogen(NetworkTopo, module.__name__)
     tgen.start_topology()
 
-    # This is a sample of configuration loading.
     router_list = tgen.routers()
     for rname, router in router_list.iteritems():
         router.load_config(
@@ -106,7 +93,7 @@ def setup_module(module):
         )
 
     tgen.start_router()
-    #gen.mininet_cli()
+
 
 def teardown_module(_mod):
     "Teardown the pytest environment"
@@ -141,19 +128,19 @@ def test_pbr_data():
     router_list = tgen.routers().values()
     for router in router_list:
         intf_file = "{}/{}/pbr-interface.json".format(CWD, router.name)
-
         logger.info(intf_file)
+
         # Read expected result from file
         expected = json.loads(open(intf_file).read())
 
         # Actual output from router
         actual = router.vtysh_cmd("show pbr interface json", isjson=True)
-
         assertmsg = '"show pbr interface" mismatches on {}'.format(router.name)
         assert topotest.json_cmp(actual, expected) is None, assertmsg
 
         map_file = "{}/{}/pbr-map.json".format(CWD, router.name)
         logger.info(map_file)
+
         # Read expected result from file
         expected = json.loads(open(map_file).read())
 
@@ -164,7 +151,8 @@ def test_pbr_data():
         assert topotest.json_cmp(actual, expected) is None, assertmsg
 
         nexthop_file = "{}/{}/pbr-nexthop-groups.json".format(CWD, router.name)
-        
+        logger.info(nexthop_file)
+
         # Read expected result from file
         expected = json.loads(open(nexthop_file).read())
 
@@ -174,7 +162,7 @@ def test_pbr_data():
         assertmsg = '"show pbr nexthop-groups" mismatches on {}'.format(router.name)
         assert topotest.json_cmp(actual, expected) is None, assertmsg
 
+
 if __name__ == "__main__":
     args = ["-s"] + sys.argv[1:]
     sys.exit(pytest.main(args))
-