From: Donald Sharp <sharpd@nvidia.com>
Date: Tue, 23 Nov 2021 12:24:34 +0000 (-0500)
Subject: tests: Move area configuration to interface for ospv3
X-Git-Tag: base_8.2~169^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a335c38bc02372ca78eae18c0747791f618da186;p=mirror%2Ffrr.git

tests: Move area configuration to interface for ospv3

The test_ospf_dual_stack test had area configuration
under the `router ospf6` nodes.  This is getting
lots of warning messages from the cli.  Let's remove
this.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.json b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.json
index c8a3ce783b..cdb8813b3d 100644
--- a/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.json
+++ b/tests/topotests/ospf_dual_stack/test_ospf_dual_stack.json
@@ -23,7 +23,8 @@
                     },
                      "ospf6": {
                         "hello_interval": 1,
-                        "dead_interval": 4
+                        "dead_interval": 4,
+                        "area": "1.1.1.1"
                     }
                }
             },
@@ -36,9 +37,7 @@
             "ospf6": {
                 "router_id": "1.1.1.1",
                 "neighbors": {
-                    "r3": {
-                        "area": "1.1.1.1"
-                    }
+                    "r3": {}
                 }
             }
         },
@@ -56,7 +55,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "1.1.1.1"
                     }
                 },
                 "r4": {
@@ -71,7 +71,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "0.0.0.0"
                     }
                 }
             },
@@ -85,8 +86,8 @@
             "ospf6": {
                 "router_id": "2.2.2.2",
                 "neighbors": {
-                    "r3": { "area": "1.1.1.1" },
-                    "r4": { "area": "0.0.0.0" }
+                    "r3": {},
+                    "r4": {}
                 }
             }
         },
@@ -104,7 +105,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "1.1.1.1"
                     }
                 },
                 "r2": {
@@ -119,7 +121,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "1.1.1.1"
                     }
                 },
                 "r4": {
@@ -134,7 +137,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "0.0.0.0"
                     }
                 }
             },
@@ -149,9 +153,9 @@
             "ospf6": {
                 "router_id": "3.3.3.3",
                 "neighbors": {
-                    "r1": { "area": "1.1.1.1" },
-                    "r2": { "area": "1.1.1.1" },
-                    "r4": { "area": "0.0.0.0" }
+                    "r1": {},
+                    "r2": {},
+                    "r4": {}
                 }
             }
         },
@@ -169,7 +173,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "0.0.0.0"
                     }
                 },
                 "r3": {
@@ -184,7 +189,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "0.0.0.0"
                     }
                 },
                 "r5": {
@@ -199,7 +205,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "2.2.2.2"
                     }
                 }
             },
@@ -214,9 +221,9 @@
             "ospf6": {
                 "router_id": "4.4.4.4",
                 "neighbors": {
-                    "r2": { "area": "0.0.0.0" },
-                    "r3": { "area": "0.0.0.0" },
-                    "r5": { "area": "2.2.2.2" }
+                    "r2": {},
+                    "r3": {},
+                    "r5": {}
                 }
             }
         },
@@ -234,7 +241,8 @@
                     "ospf6": {
                         "hello_interval": 1,
                         "dead_interval": 4,
-                        "network": "point-to-point"
+                        "network": "point-to-point",
+                        "area": "2.2.2.2"
                     }
                 }
             },
@@ -247,7 +255,7 @@
             "ospf6": {
                 "router_id": "5.5.5.5",
                 "neighbors": {
-                    "r4": { "area": "2.2.2.2" }
+                    "r4": {}
                 }
             }
         }