isisd: allow arbitrary order of area/interface configuration

Currently we don't allow to configure the interface before the area is
configured. This approach has the following issues:

1. The area config can be deleted even when we have an interface config
   relying on it. The code is not ready for that - we'll have a whole
   bunch of stale pointers if user does that.
2. The code doesn't correctly process the event of changing the VRF for
   an interface. There is no mechanism to ensure that the area exists
   in the new VRF so currently the circuit still stays in the old VRF.

This commit allows an arbitrary order of area/interface configuration.
There is no more need to configure the area before configuring the
interface.

This change fixes both the issues.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>

3 files changed, 19 insertions, 21 deletions

diff --git a/tests/isisd/test_isis_spf.c b/tests/isisd/test_isis_spf.c
index e06944a03..8fe1ad0b8 100644
--- a/tests/isisd/test_isis_spf.c
+++ b/tests/isisd/test_isis_spf.c
@@ -556,7 +556,6 @@ int main(int argc, char **argv)
 	/* IS-IS inits. */
 	yang_module_load("frr-isisd");
 	isis = isis_new(VRF_DEFAULT_NAME);
-	listnode_add(im->isis, isis);
 	SET_FLAG(im->options, F_ISIS_UNIT_TEST);
 	debug_spf_events |= DEBUG_SPF_EVENTS;
 	debug_lfa |= DEBUG_LFA;
diff --git a/tests/topotests/isis-snmp/test_isis_snmp.py b/tests/topotests/isis-snmp/test_isis_snmp.py
index 07f3335e2..04e043847 100755
--- a/tests/topotests/isis-snmp/test_isis_snmp.py
+++ b/tests/topotests/isis-snmp/test_isis_snmp.py
@@ -243,15 +243,15 @@ def test_r1_scalar_snmp():
 
 
 circtable_test = {
-    "isisCircAdminState": ["on(1)", "on(1)", "on(1)"],
-    "isisCircExistState": ["active(1)", "active(1)", "active(1)"],
-    "isisCircType": ["broadcast(1)", "ptToPt(2)", "staticIn(3)"],
-    "isisCircExtDomain": ["false(2)", "false(2)", "false(2)"],
-    "isisCircLevelType": ["level1(1)", "level1(1)", "level1and2(3)"],
-    "isisCircPassiveCircuit": ["false(2)", "false(2)", "true(1)"],
-    "isisCircMeshGroupEnabled": ["inactive(1)", "inactive(1)", "inactive(1)"],
-    "isisCircSmallHellos": ["false(2)", "false(2)", "false(2)"],
-    "isisCirc3WayEnabled": ["false(2)", "false(2)", "false(2)"],
+    "isisCircAdminState": ["on(1)", "on(1)"],
+    "isisCircExistState": ["active(1)", "active(1)"],
+    "isisCircType": ["broadcast(1)", "ptToPt(2)"],
+    "isisCircExtDomain": ["false(2)", "false(2)"],
+    "isisCircLevelType": ["level1(1)", "level1(1)"],
+    "isisCircPassiveCircuit": ["false(2)", "false(2)"],
+    "isisCircMeshGroupEnabled": ["inactive(1)", "inactive(1)"],
+    "isisCircSmallHellos": ["false(2)", "false(2)"],
+    "isisCirc3WayEnabled": ["false(2)", "false(2)"],
 }
 
 
@@ -266,7 +266,6 @@ def test_r1_isisCircTable():
     oids = []
     oids.append(generate_oid(1, 1, 0))
     oids.append(generate_oid(1, 2, 0))
-    oids.append(generate_oid(1, 3, 0))
 
     # check items
     for item in circtable_test.keys():
@@ -277,21 +276,17 @@ def test_r1_isisCircTable():
 
 
 circleveltable_test = {
-    "isisCircLevelMetric": ["10", "10", "10", "10"],
-    "isisCircLevelWideMetric": ["10", "10", "0", "0"],
-    "isisCircLevelISPriority": ["64", "64", "64", "64"],
-    "isisCircLevelHelloMultiplier": ["10", "10", "10", "10"],
+    "isisCircLevelMetric": ["10", "10"],
+    "isisCircLevelWideMetric": ["10", "10"],
+    "isisCircLevelISPriority": ["64", "64"],
+    "isisCircLevelHelloMultiplier": ["10", "10"],
     "isisCircLevelHelloTimer": [
         "3000 milliseconds",
         "3000 milliseconds",
-        "3000 milliseconds",
-        "3000 milliseconds",
     ],
     "isisCircLevelMinLSPRetransInt": [
         "1 seconds",
         "1 seconds",
-        "0 seconds",
-        "0 seconds",
     ],
 }
 
@@ -307,8 +302,6 @@ def test_r1_isislevelCircTable():
     oids = []
     oids.append(generate_oid(2, 1, "area"))
     oids.append(generate_oid(2, 2, "area"))
-    oids.append(generate_oid(2, 3, "area"))
-    oids.append(generate_oid(2, 3, "domain"))
 
     # check items
     for item in circleveltable_test.keys():
diff --git a/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py b/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py
index 148a89474..c22bd65d2 100644
--- a/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py
+++ b/tests/topotests/isis-sr-topo1/test_isis_sr_topo1.py
@@ -1002,6 +1002,12 @@ def test_isis_adjacencies_step12():
     tgen.net["rt4"].cmd(
         'vtysh -c "conf t" -c "interface eth-rt5" -c "ipv6 router isis 1"'
     )
+    tgen.net["rt4"].cmd(
+        'vtysh -c "conf t" -c "interface eth-rt5" -c "isis network point-to-point"'
+    )
+    tgen.net["rt4"].cmd(
+        'vtysh -c "conf t" -c "interface eth-rt5" -c "isis hello-multiplier 3"'
+    )
     tgen.net["rt6"].cmd(
         'vtysh -c "conf t" -c "router isis 1" -c "segment-routing global-block 16000 23999"'
     )