HC2VPP-253 - Update routing csit jobs

this fixes test failures caused by HC2VPP routing
models bump (https://gerrit.fd.io/r/#/c/10954)

- updates tests for bgp routing
- updates tests for routing
- updates SLAAC test because of changes in rt-advertisements

Change-Id: Iacc37b42e6523f440d77241c18ca8e61d1d01f23
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>

1 files changed, 104 insertions, 82 deletions

diff --git a/resources/test_data/honeycomb/routing.py b/resources/test_data/honeycomb/routing.py
index c28b2212a4..25fefe9426 100644
--- a/resources/test_data/honeycomb/routing.py
+++ b/resources/test_data/honeycomb/routing.py
@@ -63,80 +63,86 @@ def get_variables(node, ip_version, out_interface):
     # route configuration used in tests
     tables_cfg = {
         "table1": {
-            "id": 1,
             "description": "single hop ipv4",
             "destination-prefix":
                 "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
-            "next-hop": ipv4_base["next_hop"],
-            "outgoing-interface": out_interface,
-            "vpp-ipv4-route": {}
+            "next-hop": {
+                "next-hop-address" : ipv4_base["next_hop"],
+                "outgoing-interface": out_interface
+            },
+            "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
         },
         "table2": {
-            "id": 1,
             "description": "multi hop ipv4",
             "destination-prefix":
                 "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
-            "next-hop-list": {
-                "next-hop": [
-                    {
-                        "id": 1,
-                        "address": ipv4_base["next_hop1"],
-                        "outgoing-interface": out_interface,
-                        "weight": "1"
-                    },
-                    {
-                        "id": 2,
-                        "address": ipv4_base["next_hop2"],
-                        "outgoing-interface": out_interface,
-                        "weight": "1"
-                    }
-                ]
+            "next-hop":{
+                "next-hop-list": {
+                    "next-hop": [
+                        {
+                            "index": "1",
+                            "next-hop-address": ipv4_base["next_hop1"],
+                            "outgoing-interface": out_interface,
+                            "weight": "1"
+                        },
+                        {
+                            "index": "2",
+                            "next-hop-address": ipv4_base["next_hop2"],
+                            "outgoing-interface": out_interface,
+                            "weight": "1"
+                        }
+                    ]
+                }
             }
         },
         "table3": {
-            "id": 1,
             "description": "blackhole ipv4",
             "destination-prefix":
                 "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
-            "special-next-hop": "receive"
+            "next-hop": {
+                "special-next-hop-enum": "blackhole"
+            }
         },
         "table4": {
-            "id": 1,
             "description": "single hop ipv6",
             "destination-prefix":
                 "{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]),
-            "next-hop": ipv6_base["next_hop"],
-            "outgoing-interface": out_interface,
-            "vpp-ipv6-route": {}
+            "next-hop": {
+                "next-hop-address": ipv6_base["next_hop"],
+                "outgoing-interface": out_interface
+            },
+            "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}
         },
         "table5": {
-            "id": 1,
             "description": "multi hop ipv6",
             "destination-prefix":
                 "{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]),
-            "next-hop-list": {
-                "next-hop": [
-                    {
-                        "id": 1,
-                        "address": ipv6_base["next_hop1"],
-                        "outgoing-interface": out_interface,
-                        "weight": "1"
-                    },
-                    {
-                        "id": 2,
-                        "address": ipv6_base["next_hop2"],
-                        "outgoing-interface": out_interface,
-                        "weight": "1"
-                    }
-                ]
+            "next-hop":{
+                "next-hop-list": {
+                    "next-hop": [
+                        {
+                            "index": "1",
+                            "next-hop-address": ipv6_base["next_hop1"],
+                            "outgoing-interface": out_interface,
+                            "weight": "1"
+                        },
+                        {
+                            "index": "2",
+                            "next-hop-address": ipv6_base["next_hop2"],
+                            "outgoing-interface": out_interface,
+                            "weight": "1"
+                        }
+                    ]
+                }
             }
         },
         "table6": {
-            "id": 1,
             "description": "blackhole ipv6",
             "destination-prefix":
                 "{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]),
-            "special-next-hop": "blackhole"
+            "next-hop":{
+                "special-next-hop-enum": "blackhole"
+            }
         }
     }
 
@@ -145,69 +151,85 @@ def get_variables(node, ip_version, out_interface):
         "table1_oper": {
             "destination-prefix":
                 "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
-            "next-hop": ipv4_base["next_hop"],
-            "outgoing-interface": out_interface,
-            "vpp-ipv4-route-state": {}
+            "next-hop":{
+                "next-hop-address": ipv4_base["next_hop"],
+                "outgoing-interface": out_interface
+            },
+            "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
         },
         "table2_oper": {
             "destination-prefix":
                 "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
-            "next-hop-list": {
-                "next-hop": [
-                    {
-                        "address": ipv4_base["next_hop1"],
-                        "outgoing-interface": out_interface,
-                        "weight": 1
-                    },
-                    {
-                        "address": ipv4_base["next_hop2"],
-                        "outgoing-interface": out_interface,
-                        "weight": 1
-                    }
-                ]
+            "next-hop":{
+                "next-hop-list": {
+                    "next-hop": [
+                        {
+                            "index": "2",
+                            "next-hop-address": ipv4_base["next_hop2"],
+                            "outgoing-interface": out_interface,
+                            "vpp-ipv4-unicast-routing:weight": 1
+                        },
+                        {
+                            "index": "1",
+                            "next-hop-address": ipv4_base["next_hop1"],
+                            "outgoing-interface": out_interface,
+                            "vpp-ipv4-unicast-routing:weight": 1
+                        }
+                    ]
+                }
             },
-            'vpp-ipv4-route-state': {}
+            "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
         },
         "table3_oper": {
             "destination-prefix":
                 "{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
-            "special-next-hop": "receive",
-            "vpp-ipv4-route-state": {}
+            "next-hop":{
+                "special-next-hop-enum": "blackhole"
+            },
+            "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
         },
         "table4_oper": {
             "destination-prefix":
                 "{0}/{1}".format(ipv6_base["dst_net"],
                                  ipv6_base["prefix_len"]),
-            "next-hop": ipv6_base["next_hop"],
-            "outgoing-interface": out_interface,
-            "vpp-ipv6-route-state": {}
+            "next-hop":{
+                "next-hop-address": ipv6_base["next_hop"],
+                "outgoing-interface": out_interface
+            },
+            "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}
         },
         "table5_oper": {
             "destination-prefix":
                 "{0}/{1}".format(ipv6_base["dst_net"],
                                  ipv6_base["prefix_len"]),
-            "next-hop-list": {
-                "next-hop": [
-                    {
-                        "address": ipv6_base["next_hop1"],
-                        "outgoing-interface": out_interface,
-                        "weight": 1
-                    },
-                    {
-                        "address": ipv6_base["next_hop2"],
-                        "outgoing-interface": out_interface,
-                        "weight": 1
-                    }
-                ]
+            "next-hop":{
+                "next-hop-list": {
+                    "next-hop": [
+                        {
+                            "index": "2",
+                            "next-hop-address": ipv6_base["next_hop2"],
+                            "outgoing-interface": out_interface,
+                            "vpp-ipv6-unicast-routing:weight": 1
+                        },
+                        {
+                            "index": "1",
+                            "next-hop-address": ipv6_base["next_hop1"],
+                            "outgoing-interface": out_interface,
+                            "vpp-ipv6-unicast-routing:weight": 1
+                        }
+                    ]
+                }
             },
-            "vpp-ipv6-route-state": {}
+            "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}
         },
         "table6_oper": {
             "destination-prefix":
                 "{0}/{1}".format(ipv6_base["dst_net"],
                                  ipv6_base["prefix_len"]),
-            "special-next-hop": "blackhole",
-            'vpp-ipv6-route-state': {}
+            "next-hop":{
+                "special-next-hop-enum": "blackhole"
+            },
+            "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}
         }
     }