HONEYCOMB-325 - Null pointer while routing attr not defined

Fixes multiple null pointers

Change-Id: Iaa1df9a8b0a886d1835fe7cb87bcf7cf5130c6f5
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

20 files changed, 84 insertions, 0 deletions

diff --git a/routing/routing-impl/src/test/resources/ipv4/multiHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithClassifier.json
index 99c987e03..99c987e03 100644
--- a/routing/routing-impl/src/test/resources/ipv4/multiHopRouteWithClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithClassifier.json
diff --git a/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json
new file mode 100644
index 000000000..71cefa6cb
--- /dev/null
+++ b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithNoRouteAttrs.json
@@ -0,0 +1,28 @@
+{
+  "static-routes": {
+    "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"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/routing/routing-impl/src/test/resources/ipv4/multiHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json
index d4d4a0693..d4d4a0693 100644
--- a/routing/routing-impl/src/test/resources/ipv4/multiHopRouteWithoutClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv4/multihop/multiHopRouteWithoutClassifier.json
diff --git a/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteNoRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteNoRouteAttrs.json
new file mode 100644
index 000000000..d987bb6b1
--- /dev/null
+++ b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteNoRouteAttrs.json
@@ -0,0 +1,14 @@
+{
+  "static-routes": {
+    "ipv4": {
+      "route": [
+        {
+          "id": 1,
+          "destination-prefix": "192.168.2.1/24",
+          "next-hop": "192.168.2.2",
+          "outgoing-interface": "iface"
+        }
+      ]
+    }
+  }
+}
diff --git a/routing/routing-impl/src/test/resources/ipv4/simpleHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithClassifier.json
index d00d9a06a..d00d9a06a 100644
--- a/routing/routing-impl/src/test/resources/ipv4/simpleHopRouteWithClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithClassifier.json
diff --git a/routing/routing-impl/src/test/resources/ipv4/simpleHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithoutClassifier.json
index 0ef7cf765..0ef7cf765 100644
--- a/routing/routing-impl/src/test/resources/ipv4/simpleHopRouteWithoutClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv4/simplehop/simpleHopRouteWithoutClassifier.json
diff --git a/routing/routing-impl/src/test/resources/ipv4/specialHopRouteBlackhole.json b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteBlackhole.json
index b2ddc238b..b2ddc238b 100644
--- a/routing/routing-impl/src/test/resources/ipv4/specialHopRouteBlackhole.json
+++ b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteBlackhole.json
diff --git a/routing/routing-impl/src/test/resources/ipv4/specialHopRouteProhibited.json b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteProhibited.json
index fe9faf44c..fe9faf44c 100644
--- a/routing/routing-impl/src/test/resources/ipv4/specialHopRouteProhibited.json
+++ b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteProhibited.json
diff --git a/routing/routing-impl/src/test/resources/ipv4/specialHopRouteReceive.json b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteReceive.json
index c967aa542..c967aa542 100644
--- a/routing/routing-impl/src/test/resources/ipv4/specialHopRouteReceive.json
+++ b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteReceive.json
diff --git a/routing/routing-impl/src/test/resources/ipv4/specialHopRouteUnreachable.json b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteUnreachable.json
index bae467fbd..bae467fbd 100644
--- a/routing/routing-impl/src/test/resources/ipv4/specialHopRouteUnreachable.json
+++ b/routing/routing-impl/src/test/resources/ipv4/specialhop/specialHopRouteUnreachable.json
diff --git a/routing/routing-impl/src/test/resources/ipv6/multiHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json
index c8b1e208e..c8b1e208e 100644
--- a/routing/routing-impl/src/test/resources/ipv6/multiHopRouteWithClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithClassifier.json
diff --git a/routing/routing-impl/src/test/resources/ipv6/multiHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json
index 2e44ebcf5..2e44ebcf5 100644
--- a/routing/routing-impl/src/test/resources/ipv6/multiHopRouteWithoutClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutClassifier.json
diff --git a/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json
new file mode 100644
index 000000000..f85b1b716
--- /dev/null
+++ b/routing/routing-impl/src/test/resources/ipv6/multihop/multiHopRouteWithoutRouteAttrs.json
@@ -0,0 +1,28 @@
+{
+  "static-routes": {
+    "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"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/routing/routing-impl/src/test/resources/ipv6/simpleHopRouteWithClassifier.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json
index c011a8d01..c011a8d01 100644
--- a/routing/routing-impl/src/test/resources/ipv6/simpleHopRouteWithClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithClassifier.json
diff --git a/routing/routing-impl/src/test/resources/ipv6/simpleHopRouteWithoutClassifier.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json
index 1cb663ca7..1cb663ca7 100644
--- a/routing/routing-impl/src/test/resources/ipv6/simpleHopRouteWithoutClassifier.json
+++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutClassifier.json
diff --git a/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json
new file mode 100644
index 000000000..a735c193c
--- /dev/null
+++ b/routing/routing-impl/src/test/resources/ipv6/simplehop/simpleHopRouteWithoutRouteAttrs.json
@@ -0,0 +1,14 @@
+{
+  "static-routes": {
+    "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"
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/routing/routing-impl/src/test/resources/ipv6/specialHopRouteBlackhole.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json
index 1cc319107..1cc319107 100644
--- a/routing/routing-impl/src/test/resources/ipv6/specialHopRouteBlackhole.json
+++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteBlackhole.json
diff --git a/routing/routing-impl/src/test/resources/ipv6/specialHopRouteProhibited.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json
index d69e817d7..d69e817d7 100644
--- a/routing/routing-impl/src/test/resources/ipv6/specialHopRouteProhibited.json
+++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteProhibited.json
diff --git a/routing/routing-impl/src/test/resources/ipv6/specialHopRouteReceive.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json
index 50d447de0..50d447de0 100644
--- a/routing/routing-impl/src/test/resources/ipv6/specialHopRouteReceive.json
+++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteReceive.json
diff --git a/routing/routing-impl/src/test/resources/ipv6/specialHopRouteUnreachable.json b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json
index c874549d1..c874549d1 100644
--- a/routing/routing-impl/src/test/resources/ipv6/specialHopRouteUnreachable.json
+++ b/routing/routing-impl/src/test/resources/ipv6/specialhop/specialHopRouteUnreachable.json