isis: T3417: drop artificial "domain" node identifying the IS-IS process name

As we and FRR do not support multiple FRR process instances, there is no need
to make this configurable for a user. We rather rely on a solid default "VyOS".

2 files changed, 2 insertions, 7 deletions

diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index adce00ee3..bcd9960ed 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -83,9 +83,6 @@ def verify(isis):
     if not isis or 'deleted' in isis:
         return None
 
-    if 'domain' not in isis:
-        raise ConfigError('Routing domain name/tag must be set!')
-
     if 'net' not in isis:
         raise ConfigError('Network entity is mandatory!')
 
@@ -196,7 +193,7 @@ def apply(isis):
     if 'vrf' in isis:
         vrf = 'vrf ' + isis['vrf']
 
-    frr_cfg.modify_section(f'^router isis \S+ {vrf}', '')
+    frr_cfg.modify_section(f'^router isis VyOS {vrf}', '')
     for key in ['interface', 'interface_removed']:
         if key not in isis:
             continue
diff --git a/src/migration-scripts/isis/0-to-1 b/src/migration-scripts/isis/0-to-1
index 5f51f986e..6773f4009 100755
--- a/src/migration-scripts/isis/0-to-1
+++ b/src/migration-scripts/isis/0-to-1
@@ -38,8 +38,7 @@ if not config.exists(base):
     exit(0)
 
 # Only one IS-IS process is supported, thus this operation is save
-process = config.list_nodes(base)
-isis_base = base + process
+isis_base = base + config.list_nodes(base)
 
 # We need a temporary copy of the config
 tmp_base = ['protocols', 'isis2']
@@ -50,7 +49,6 @@ config.delete(base)
 
 # Rename temporary copy to new final config and set domain key
 config.rename(tmp_base, 'isis')
-config.set(base + ['domain'], process[0])
 
 try:
     with open(file_name, 'w') as f: