HC2VPP-253 - Bump routing models

This patch updates (for support of SRv6 and MPLS) routing models to:
- hc2vpp-ietf-routing@2018-03-13.yang
  (RFC 8349, https://tools.ietf.org/html/rfc8349)
- hc2vpp-ietf-ipv4-unicast-routing@2018-03-13.yang (RFC 8349)
- hc2vpp-ietf-ipv6-unicast-routing@2018-03-13.yang (RFC 8349)
- hc2vpp-ietf-ipv6-router-advertisements@2018-03-13 (RFC 8349)
- hc2vpp-ietf-routing-types@2017-12-04
  (RFC 8294 ,https://tools.ietf.org/html/rfc8294)
Due to odl bugs these models were changed,
see HC2VPP-298 for more details.

Significant changes in updated models:
- Routing instance was removed, we used vpp-routing-instance
  as single instance before, which is no longer needed.
- Routing-protocol and Routing-protocols were refactored to
  Control-plane-protocol/s. Control-protocol now uses type and name as key
- Route Key was changed from id to ipPrefix
- Next-hop and Next-Hop-list were refactored
See attached routing_postman_collection.json for updated data structures
and examples for both IPv4 and IPv6 routes.
For router advertisements see routing_advertisments_postman_collection.json

Another fixes in this patch:
- fixes in MPLS module due to Routing model updates
- fixes doc module due to changes in Routing model

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

23 files changed, 190 insertions, 166 deletions

diff --git a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithClassifier.json
index 99c987e03..5b4012d83 100644
--- a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithClassifier.json
@@ -3,29 +3,30 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "vpp-ipv4-route": {
+          "vpp-v4ur:vpp-ipv4-route": {
             "classify-table": "classify-table-one"
           },
-          "next-hop-list": {
-            "next-hop": [
-              {
-                "id": "1",
-                "address": "192.168.2.1",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              },
-              {
-                "id": "2",
-                "address": "192.168.2.2",
-                "outgoing-interface": "iface",
-                "weight": "3"
-              }
-            ]
+          "next-hop":{
+            "next-hop-list": {
+              "next-hop": [
+                {
+                  "index": "1",
+                  "next-hop-address": "192.168.2.1",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                },
+                {
+                  "index": "2",
+                  "next-hop-address": "192.168.2.2",
+                  "outgoing-interface": "iface",
+                  "weight": "3"
+                }
+              ]
+            }
           }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json
index 71cefa6cb..a509076aa 100644
--- a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json
+++ b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json
@@ -3,26 +3,27 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "next-hop-list": {
-            "next-hop": [
-              {
-                "id": "1",
-                "address": "192.168.2.1",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              },
-              {
-                "id": "2",
-                "address": "192.168.2.2",
-                "outgoing-interface": "iface",
-                "weight": "3"
-              }
-            ]
+          "next-hop": {
+            "next-hop-list": {
+              "next-hop": [
+                {
+                  "index": "1",
+                  "next-hop-address": "192.168.2.1",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                },
+                {
+                  "index": "2",
+                  "next-hop-address": "192.168.2.2",
+                  "outgoing-interface": "iface",
+                  "weight": "3"
+                }
+              ]
+            }
           }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json
index d4d4a0693..4c49ba9a8 100644
--- a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json
@@ -3,28 +3,29 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "vpp-ipv4-route": {
+          "vpp-v4ur:vpp-ipv4-route": {
           },
-          "next-hop-list": {
-            "next-hop": [
-              {
-                "id": "1",
-                "address": "192.168.2.1",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              },
-              {
-                "id": "2",
-                "address": "192.168.2.2",
-                "outgoing-interface": "iface",
-                "weight": "3"
-              }
-            ]
+          "next-hop": {
+            "next-hop-list": {
+              "next-hop": [
+                {
+                  "index": "1",
+                  "next-hop-address": "192.168.2.1",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                },
+                {
+                  "index": "2",
+                  "next-hop-address": "192.168.2.2",
+                  "outgoing-interface": "iface",
+                  "weight": "3"
+                }
+              ]
+            }
           }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteNoRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteNoRouteAttrs.json
index d987bb6b1..b28ff6e9b 100644
--- a/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteNoRouteAttrs.json
+++ b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteNoRouteAttrs.json
@@ -3,10 +3,11 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "next-hop": "192.168.2.2",
-          "outgoing-interface": "iface"
+          "next-hop": {
+            "next-hop-address" : "192.168.2.2",
+            "outgoing-interface": "iface"
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithClassifier.json
index d00d9a06a..369ddd828 100644
--- a/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithClassifier.json
@@ -3,13 +3,14 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "vpp-ipv4-route": {
-            "classify-table": "classify-table-one"
+          "next-hop": {
+            "next-hop-address" : "192.168.2.2",
+            "outgoing-interface": "iface"
           },
-          "next-hop": "192.168.2.2",
-          "outgoing-interface": "iface"
+          "vpp-ipv4-route" : {
+            "classify-table": "classify-table-one"
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithoutClassifier.json
index 0ef7cf765..9080943c8 100644
--- a/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithoutClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithoutClassifier.json
@@ -3,12 +3,13 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "vpp-ipv4-route": {
+          "next-hop": {
+            "next-hop-address" : "192.168.2.2",
+            "outgoing-interface": "iface"
           },
-          "next-hop": "192.168.2.2",
-          "outgoing-interface": "iface"
+          "vpp-v4ur:vpp-ipv4-route": {
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteBlackhole.json b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteBlackhole.json
index b2ddc238b..04972478e 100644
--- a/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteBlackhole.json
+++ b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteBlackhole.json
@@ -3,9 +3,10 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "special-next-hop": "blackhole"
+          "next-hop": {
+            "special-next-hop-enum": "blackhole"
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteProhibited.json b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteProhibited.json
index fe9faf44c..cee2e1977 100644
--- a/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteProhibited.json
+++ b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteProhibited.json
@@ -3,9 +3,10 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "special-next-hop": "prohibit"
+          "next-hop": {
+            "special-next-hop-enum": "prohibit"
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteReceive.json b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteReceive.json
index c967aa542..8000df11d 100644
--- a/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteReceive.json
+++ b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteReceive.json
@@ -3,9 +3,10 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "special-next-hop": "receive"
+          "next-hop": {
+            "special-next-hop-enum": "receive"
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteUnreachable.json b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteUnreachable.json
index bae467fbd..b52982c47 100644
--- a/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteUnreachable.json
+++ b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteUnreachable.json
@@ -3,11 +3,12 @@
     "ipv4": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "192.168.2.1/24",
-          "special-next-hop": "unreachable"
+          "next-hop": {
+            "special-next-hop-enum": "unreachable"
+          }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json
index c8b1e208e..17fe9d67e 100644
--- a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json
@@ -3,29 +3,30 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
           "vpp-ipv6-route": {
             "classify-table": "classify-table-one"
           },
-          "next-hop-list": {
-            "next-hop": [
-              {
-                "id": "1",
-                "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              },
-              {
-                "id": "2",
-                "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              }
-            ]
+          "next-hop": {
+            "next-hop-list": {
+              "next-hop": [
+                {
+                  "index": "1",
+                  "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                },
+                {
+                  "index": "2",
+                  "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                }
+              ]
+            }
           }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json
index 2e44ebcf5..612db90c0 100644
--- a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json
@@ -3,28 +3,29 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
           "vpp-ipv6-route": {
           },
-          "next-hop-list": {
-            "next-hop": [
-              {
-                "id": "1",
-                "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              },
-              {
-                "id": "2",
-                "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              }
-            ]
+          "next-hop": {
+            "next-hop-list": {
+              "next-hop": [
+                {
+                  "index": "1",
+                  "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                },
+                {
+                  "index": "2",
+                  "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                }
+              ]
+            }
           }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json
index f85b1b716..f34084238 100644
--- a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json
+++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json
@@ -3,26 +3,27 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
-          "next-hop-list": {
-            "next-hop": [
-              {
-                "id": "1",
-                "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              },
-              {
-                "id": "2",
-                "address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-                "outgoing-interface": "iface",
-                "weight": "2"
-              }
-            ]
+          "next-hop": {
+            "next-hop-list": {
+              "next-hop": [
+                {
+                  "index": "1",
+                  "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                },
+                {
+                  "index": "2",
+                  "next-hop-address": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+                  "outgoing-interface": "iface",
+                  "weight": "2"
+                }
+              ]
+            }
           }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json
index c011a8d01..7f09a590e 100644
--- a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json
@@ -3,15 +3,16 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
-          "vpp-ipv6-route": {
-            "classify-table": "classify-table-one"
+          "next-hop": {
+            "next-hop-address" : "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+            "outgoing-interface": "iface"
           },
-          "next-hop": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-          "outgoing-interface": "iface"
+          "vpp-ipv6-route" : {
+            "classify-table": "classify-table-one"
+          }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json
index 1cb663ca7..feca92c88 100644
--- a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json
@@ -3,14 +3,15 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
-          "vpp-ipv6-route": {
+          "next-hop": {
+            "next-hop-address" : "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+            "outgoing-interface": "iface"
           },
-          "next-hop": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-          "outgoing-interface": "iface"
+          "vpp-v6ur:vpp-ipv6-route": {
+          }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json
index a735c193c..fd66f2283 100644
--- a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json
+++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json
@@ -3,12 +3,13 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
           "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
-          "next-hop": "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
-          "outgoing-interface": "iface"
+          "next-hop": {
+            "next-hop-address" : "2001:0db8:0a0b:12f0:0000:0000:0000:0002",
+            "outgoing-interface": "iface"
+          }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json
index 1cc319107..43e8366ff 100644
--- a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json
+++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json
@@ -3,9 +3,10 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
-          "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/24",
-          "special-next-hop": "blackhole"
+          "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
+          "next-hop": {
+            "special-next-hop-enum": "blackhole"
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json
index d69e817d7..e8f0a0e2e 100644
--- a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json
+++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json
@@ -3,9 +3,10 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
-          "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/24",
-          "special-next-hop": "prohibit"
+          "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
+          "next-hop": {
+            "special-next-hop-enum": "prohibit"
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json
index 50d447de0..5296e3f01 100644
--- a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json
+++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json
@@ -3,9 +3,10 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
-          "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/24",
-          "special-next-hop": "receive"
+          "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
+          "next-hop": {
+            "special-next-hop-enum": "receive"
+          }
         }
       ]
     }
diff --git a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json
index c874549d1..2d351956d 100644
--- a/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json
+++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json
@@ -3,11 +3,12 @@
     "ipv6": {
       "route": [
         {
-          "id": 1,
-          "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/24",
-          "special-next-hop": "unreachable"
+          "destination-prefix": "2001:0db8:0a0b:12f0:0000:0000:0000:0001/64",
+          "next-hop": {
+            "special-next-hop-enum": "unreachable"
+          }
         }
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/routing/routing-impl/src/test/resources/ra/complexRa.json b/routing/routing-impl/src/test/resources/ra/complexRa.json
index 05079c656..5e9122354 100644
--- a/routing/routing-impl/src/test/resources/ra/complexRa.json
+++ b/routing/routing-impl/src/test/resources/ra/complexRa.json
@@ -3,14 +3,16 @@
     "interface": [
       {
         "name": "eth0",
-        "ipv6-router-advertisements": {
-          "send-advertisements": "true",
-          "min-rtr-adv-interval": "20",
-          "max-rtr-adv-interval": "100",
-          "default-lifetime": "601",
-          "vpp-routing-ra:suppress-link-layer": "false",
-          "vpp-routing-ra:initial-count": "2",
-          "vpp-routing-ra:initial-interval": "15"
+        "ipv6" :{
+          "ipv6-router-advertisements": {
+            "send-advertisements": "true",
+            "min-rtr-adv-interval": "20",
+            "max-rtr-adv-interval": "100",
+            "default-lifetime": "601",
+            "vpp-routing-ra:suppress-link-layer": "false",
+            "vpp-routing-ra:initial-count": "2",
+            "vpp-routing-ra:initial-interval": "15"
+          }
         }
       }
     ]
diff --git a/routing/routing-impl/src/test/resources/ra/simpleRa.json b/routing/routing-impl/src/test/resources/ra/simpleRa.json
index 4a7ce3464..ef81309da 100644
--- a/routing/routing-impl/src/test/resources/ra/simpleRa.json
+++ b/routing/routing-impl/src/test/resources/ra/simpleRa.json
@@ -3,9 +3,11 @@
     "interface": [
       {
         "name": "eth0",
-        "ipv6-router-advertisements": {
-          "send-advertisements": "true",
-          "managed-flag": "true"
+        "ietf-ip:ipv6": {
+          "hc2vpp-ietf-ipv6-unicast-routing:ipv6-router-advertisements": {
+            "send-advertisements": "true",
+            "managed-flag": "true"
+          }
         }
       }
     ]
diff --git a/routing/routing-impl/src/test/resources/routing.json b/routing/routing-impl/src/test/resources/routing.json
index 95f85414f..2da6abc3e 100644
--- a/routing/routing-impl/src/test/resources/routing.json
+++ b/routing/routing-impl/src/test/resources/routing.json
@@ -1,4 +1,4 @@
 {
-  "default-routing-instance-name": "vpp-routing-instance",
+  "default-routing-id": "0.0.0.0",
   "learned-route-name-prefix": "learned-route"
-}
\ No newline at end of file
+}