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".

5 files changed, 5 insertions, 22 deletions

diff --git a/data/templates/frr/isis.frr.tmpl b/data/templates/frr/isis.frr.tmpl
index da098abac..7f996b134 100644
--- a/data/templates/frr/isis.frr.tmpl
+++ b/data/templates/frr/isis.frr.tmpl
@@ -1,5 +1,5 @@
 !
-router isis {{ domain }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
+router isis VyOS {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
  net {{ net }}
 {% if dynamic_hostname is defined %}
  hostname dynamic
@@ -134,7 +134,7 @@ router isis {{ domain }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }
 {% if interface is defined and interface is not none %}
 {%   for iface, iface_config in interface.items() %}
 interface {{ iface }} {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
- ip router isis {{ domain }}
+ ip router isis VyOS
 {%     if iface_config.bfd is defined %}
  isis bfd
 {%     endif %}
diff --git a/interface-definitions/include/isis/isis-common-config.xml.i b/interface-definitions/include/isis/isis-common-config.xml.i
index 94a6e3592..8b753b082 100644
--- a/interface-definitions/include/isis/isis-common-config.xml.i
+++ b/interface-definitions/include/isis/isis-common-config.xml.i
@@ -88,15 +88,6 @@
     </node>
   </children>
 </node>
-<leafNode name="domain">
-  <properties>
-    <help>Domain name used for this instance</help>
-    <valueHelp>
-      <format>txt</format>
-      <description>IS-IS routing area domain/tag</description>
-    </valueHelp>
-  </properties>
-</leafNode>
 <node name="domain-password">
   <properties>
     <help>Set the authentication password for a routing domain</help>
diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
index 79d497186..10c722eca 100755
--- a/smoketest/scripts/cli/test_protocols_isis.py
+++ b/smoketest/scripts/cli/test_protocols_isis.py
@@ -25,7 +25,7 @@ from vyos.util import process_named_running
 PROCESS_NAME = 'isisd'
 base_path = ['protocols', 'isis']
 
-domain = 'FOOO'
+domain = 'VyOS'
 net = '49.0001.1921.6800.1002.00'
 
 class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
@@ -45,7 +45,6 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         self.cli_set(['policy', 'route-map', route_map, 'rule', rule, 'action', 'permit'])
         self.cli_set(['policy', 'route-map', route_map, 'rule', rule, 'match', 'ip', 'address', 'prefix-list', prefix_list])
 
-        self.cli_set(base_path + ['domain', domain])
         self.cli_set(base_path + ['net', net])
         self.cli_set(base_path + ['redistribute', 'ipv4', 'connected', 'level-2', 'route-map', route_map])
 
@@ -79,13 +78,11 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         vrf_base = ['vrf', 'name', vrf]
         vrf_iface = 'eth1'
         self.cli_set(vrf_base + ['table', table])
-        self.cli_set(vrf_base + ['protocols', 'isis', 'domain', domain])
         self.cli_set(vrf_base + ['protocols', 'isis', 'net', net])
         self.cli_set(vrf_base + ['protocols', 'isis', 'interface', vrf_iface])
         self.cli_set(['interfaces', 'ethernet', vrf_iface, 'vrf', vrf])
 
         # Also set a default VRF IS-IS config
-        self.cli_set(base_path + ['domain', domain])
         self.cli_set(base_path + ['net', net])
         self.cli_set(base_path + ['interface', 'eth0'])
         self.cli_commit()
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: