No OneTemporary
Actions

Size

56 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
	index 511a5eb8b..5ab7fae14 100755
	--- a/smoketest/scripts/cli/test_protocols_isis.py
	+++ b/smoketest/scripts/cli/test_protocols_isis.py
	@@ -1,322 +1,324 @@
	#!/usr/bin/env python3
	#
	# Copyright (C) 2021-2022 VyOS maintainers and contributors
	#
	# This program is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License version 2 or later as
	# published by the Free Software Foundation.
	#
	# This program is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with this program. If not, see <http://www.gnu.org/licenses/>.

	import unittest

	from base_vyostest_shim import VyOSUnitTestSHIM
	from vyos.configsession import ConfigSessionError
	from vyos.ifconfig import Section
	from vyos.utils.process import process_named_running

	PROCESS_NAME = 'isisd'
	base_path = ['protocols', 'isis']

	domain = 'VyOS'
	net = '49.0001.1921.6800.1002.00'

	class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
	@classmethod
	def setUpClass(cls):
	cls._interfaces = Section.interfaces('ethernet')

	# call base-classes classmethod
	super(TestProtocolsISIS, cls).setUpClass()

	# ensure we can also run this test on a live system - so lets clean
	# out the current configuration :)
	cls.cli_delete(cls, base_path)

	def tearDown(self):
	self.cli_delete(base_path)
	self.cli_commit()

	# Check for running process
	self.assertTrue(process_named_running(PROCESS_NAME))

	def isis_base_config(self):
	self.cli_set(base_path + ['net', net])
	for interface in self._interfaces:
	self.cli_set(base_path + ['interface', interface])

	def test_isis_01_redistribute(self):
	prefix_list = 'EXPORT-ISIS'
	route_map = 'EXPORT-ISIS'
	rule = '10'

	self.cli_set(['policy', 'prefix-list', prefix_list, 'rule', rule, 'action', 'permit'])
	self.cli_set(['policy', 'prefix-list', prefix_list, 'rule', rule, 'prefix', '203.0.113.0/24'])
	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)

	# verify() - net id and interface are mandatory
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()

	self.isis_base_config()
	self.cli_set(base_path + ['redistribute', 'ipv4', 'connected', 'level-2', 'route-map', route_map])
	self.cli_set(base_path + ['log-adjacency-changes'])

	# Commit all changes
	self.cli_commit()

	# Verify all changes
	tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd')
	self.assertIn(f' net {net}', tmp)
	self.assertIn(f' log-adjacency-changes', tmp)
	self.assertIn(f' redistribute ipv4 connected level-2 route-map {route_map}', tmp)

	for interface in self._interfaces:
	tmp = self.getFRRconfig(f'interface {interface}', daemon='isisd')
	self.assertIn(f' ip router isis {domain}', tmp)
	self.assertIn(f' ipv6 router isis {domain}', tmp)

	self.cli_delete(['policy', 'route-map', route_map])
	self.cli_delete(['policy', 'prefix-list', prefix_list])

	def test_isis_02_vrfs(self):
	vrfs = ['red', 'green', 'blue']
	# It is safe to assume that when the basic VRF test works, all other
	# IS-IS related features work, as we entirely inherit the CLI templates
	# and Jinja2 FRR template.
	table = '1000'
	vrf = 'red'
	vrf_base = ['vrf', 'name', vrf]
	vrf_iface = 'eth1'
	self.cli_set(vrf_base + ['table', table])
	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 + ['net', net])
	self.cli_set(base_path + ['interface', 'eth0'])
	self.cli_commit()

	# Verify FRR isisd configuration
	tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd')
	self.assertIn(f'router isis {domain}', tmp)
	self.assertIn(f' net {net}', tmp)

	tmp = self.getFRRconfig(f'router isis {domain} vrf {vrf}', daemon='isisd')
	self.assertIn(f'router isis {domain} vrf {vrf}', tmp)
	self.assertIn(f' net {net}', tmp)

	self.cli_delete(['vrf', 'name', vrf])
	self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])

	def test_isis_04_default_information(self):
	metric = '50'
	route_map = 'default-foo-'

	self.isis_base_config()
	for afi in ['ipv4', 'ipv6']:
	for level in ['level-1', 'level-2']:
	self.cli_set(base_path + ['default-information', 'originate', afi, level, 'always'])
	self.cli_set(base_path + ['default-information', 'originate', afi, level, 'metric', metric])
	self.cli_set(base_path + ['default-information', 'originate', afi, level, 'route-map', route_map + level + afi])

	# Commit all changes
	self.cli_commit()

	# Verify all changes
	tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd')
	self.assertIn(f' net {net}', tmp)

	for afi in ['ipv4', 'ipv6']:
	for level in ['level-1', 'level-2']:
	route_map_name = route_map + level + afi
	self.assertIn(f' default-information originate {afi} {level} always route-map {route_map_name} metric {metric}', tmp)


	def test_isis_05_password(self):
	password = 'foo'

	self.isis_base_config()
	for interface in self._interfaces:
	self.cli_set(base_path + ['interface', interface, 'password', 'plaintext-password', f'{password}-{interface}'])

	self.cli_set(base_path + ['area-password', 'plaintext-password', password])
	self.cli_set(base_path + ['area-password', 'md5', password])
	self.cli_set(base_path + ['domain-password', 'plaintext-password', password])
	self.cli_set(base_path + ['domain-password', 'md5', password])

	# verify() - can not use both md5 and plaintext-password for area-password
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()
	self.cli_delete(base_path + ['area-password', 'md5', password])

	# verify() - can not use both md5 and plaintext-password for domain-password
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()
	self.cli_delete(base_path + ['domain-password', 'md5', password])

	# Commit all changes
	self.cli_commit()

	# Verify all changes
	tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd')
	self.assertIn(f' net {net}', tmp)
	self.assertIn(f' domain-password clear {password}', tmp)
	self.assertIn(f' area-password clear {password}', tmp)

	for interface in self._interfaces:
	tmp = self.getFRRconfig(f'interface {interface}', daemon='isisd')
	self.assertIn(f' isis password clear {password}-{interface}', tmp)

	def test_isis_06_spf_delay_bfd(self):
	network = 'point-to-point'
	holddown = '10'
	init_delay = '50'
	long_delay = '200'
	short_delay = '100'
	time_to_learn = '75'
	bfd_profile = 'isis-bfd'

	self.cli_set(base_path + ['net', net])
	for interface in self._interfaces:
	self.cli_set(base_path + ['interface', interface, 'network', network])
	self.cli_set(base_path + ['interface', interface, 'bfd', 'profile', bfd_profile])

	self.cli_set(base_path + ['spf-delay-ietf', 'holddown', holddown])
	# verify() - All types of spf-delay must be configured
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()

	self.cli_set(base_path + ['spf-delay-ietf', 'init-delay', init_delay])
	# verify() - All types of spf-delay must be configured
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()

	self.cli_set(base_path + ['spf-delay-ietf', 'long-delay', long_delay])
	# verify() - All types of spf-delay must be configured
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()

	self.cli_set(base_path + ['spf-delay-ietf', 'short-delay', short_delay])
	# verify() - All types of spf-delay must be configured
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()
	self.cli_set(base_path + ['spf-delay-ietf', 'time-to-learn', time_to_learn])

	# Commit all changes
	self.cli_commit()

	# Verify all changes
	tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd')
	self.assertIn(f' net {net}', tmp)
	self.assertIn(f' spf-delay-ietf init-delay {init_delay} short-delay {short_delay} long-delay {long_delay} holddown {holddown} time-to-learn {time_to_learn}', tmp)

	for interface in self._interfaces:
	tmp = self.getFRRconfig(f'interface {interface}', daemon='isisd')
	self.assertIn(f' ip router isis {domain}', tmp)
	self.assertIn(f' ipv6 router isis {domain}', tmp)
	self.assertIn(f' isis network {network}', tmp)
	self.assertIn(f' isis bfd', tmp)
	self.assertIn(f' isis bfd profile {bfd_profile}', tmp)

	def test_isis_07_segment_routing_configuration(self):
	global_block_low = "300"
	global_block_high = "399"
	local_block_low = "400"
	local_block_high = "499"
	interface = 'lo'
	maximum_stack_size = '5'
	prefix_one = '192.168.0.1/32'
	prefix_two = '192.168.0.2/32'
	prefix_three = '192.168.0.3/32'
	prefix_four = '192.168.0.4/32'
	prefix_one_value = '1'
	prefix_two_value = '2'
	prefix_three_value = '60000'
	prefix_four_value = '65000'

	self.cli_set(base_path + ['net', net])
	self.cli_set(base_path + ['interface', interface])
	self.cli_set(base_path + ['segment-routing', 'maximum-label-depth', maximum_stack_size])
	self.cli_set(base_path + ['segment-routing', 'global-block', 'low-label-value', global_block_low])
	self.cli_set(base_path + ['segment-routing', 'global-block', 'high-label-value', global_block_high])
	self.cli_set(base_path + ['segment-routing', 'local-block', 'low-label-value', local_block_low])
	self.cli_set(base_path + ['segment-routing', 'local-block', 'high-label-value', local_block_high])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_one, 'index', 'value', prefix_one_value])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_one, 'index', 'explicit-null'])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_two, 'index', 'value', prefix_two_value])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_two, 'index', 'no-php-flag'])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_three, 'absolute', 'value', prefix_three_value])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_three, 'absolute', 'explicit-null'])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_four, 'absolute', 'value', prefix_four_value])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_four, 'absolute', 'no-php-flag'])

	# Commit all changes
	self.cli_commit()

	# Verify all changes
	tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd')
	self.assertIn(f' net {net}', tmp)
	self.assertIn(f' segment-routing on', tmp)
	self.assertIn(f' segment-routing global-block {global_block_low} {global_block_high} local-block {local_block_low} {local_block_high}', tmp)
	self.assertIn(f' segment-routing node-msd {maximum_stack_size}', tmp)
	self.assertIn(f' segment-routing prefix {prefix_one} index {prefix_one_value} explicit-null', tmp)
	self.assertIn(f' segment-routing prefix {prefix_two} index {prefix_two_value} no-php-flag', tmp)
	self.assertIn(f' segment-routing prefix {prefix_three} absolute {prefix_three_value} explicit-null', tmp)
	self.assertIn(f' segment-routing prefix {prefix_four} absolute {prefix_four_value} no-php-flag', tmp)

	def test_isis_08_ldp_sync(self):
	holddown = "500"
	interface = 'lo'

	self.cli_set(base_path + ['net', net])
	self.cli_set(base_path + ['interface', interface])
	self.cli_set(base_path + ['ldp-sync', 'holddown', holddown])

	# Commit main ISIS changes
	self.cli_commit()

	# Verify main ISIS changes
	tmp = self.getFRRconfig(f'router isis {domain}', daemon='isisd')
	self.assertIn(f' net {net}', tmp)
	self.assertIn(f' mpls ldp-sync', tmp)
	self.assertIn(f' mpls ldp-sync holddown {holddown}', tmp)

	for interface in self._interfaces:
	self.cli_set(base_path + ['interface', interface, 'ldp-sync', 'holddown', holddown])

	- # Commit interface changes for holddown
	- self.cli_commit()
	+ # Commit interface changes for holddown
	+ self.cli_commit()

	+ for interface in self._interfaces:
	# Verify interface changes for holddown
	tmp = self.getFRRconfig(f'interface {interface}', daemon='isisd')
	self.assertIn(f'interface {interface}', tmp)
	self.assertIn(f' ip router isis {domain}', tmp)
	self.assertIn(f' ipv6 router isis {domain}', tmp)
	self.assertIn(f' isis mpls ldp-sync holddown {holddown}', tmp)

	for interface in self._interfaces:
	self.cli_set(base_path + ['interface', interface, 'ldp-sync', 'disable'])

	- # Commit interface changes for disable
	- self.cli_commit()
	+ # Commit interface changes for disable
	+ self.cli_commit()

	+ for interface in self._interfaces:
	# Verify interface changes for disable
	tmp = self.getFRRconfig(f'interface {interface}', daemon='isisd')
	self.assertIn(f'interface {interface}', tmp)
	self.assertIn(f' ip router isis {domain}', tmp)
	self.assertIn(f' ipv6 router isis {domain}', tmp)
	self.assertIn(f' no isis mpls ldp-sync', tmp)

	if __name__ == '__main__':
	unittest.main(verbosity=2)
	diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
	index 80befbfd6..a6850db71 100755
	--- a/smoketest/scripts/cli/test_protocols_ospf.py
	+++ b/smoketest/scripts/cli/test_protocols_ospf.py
	@@ -1,510 +1,540 @@
	#!/usr/bin/env python3
	#
	# Copyright (C) 2021-2022 VyOS maintainers and contributors
	#
	# This program is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License version 2 or later as
	# published by the Free Software Foundation.
	#
	# This program is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with this program. If not, see <http://www.gnu.org/licenses/>.

	import unittest

	from base_vyostest_shim import VyOSUnitTestSHIM

	from vyos.configsession import ConfigSessionError
	from vyos.ifconfig import Section
	from vyos.utils.process import process_named_running

	PROCESS_NAME = 'ospfd'
	base_path = ['protocols', 'ospf']

	route_map = 'foo-bar-baz10'

	class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
	@classmethod
	def setUpClass(cls):
	super(TestProtocolsOSPF, cls).setUpClass()

	cls.cli_set(cls, ['policy', 'route-map', route_map, 'rule', '10', 'action', 'permit'])
	cls.cli_set(cls, ['policy', 'route-map', route_map, 'rule', '20', 'action', 'permit'])

	# ensure we can also run this test on a live system - so lets clean
	# out the current configuration :)
	cls.cli_delete(cls, base_path)

	@classmethod
	def tearDownClass(cls):
	cls.cli_delete(cls, ['policy', 'route-map', route_map])
	super(TestProtocolsOSPF, cls).tearDownClass()

	def tearDown(self):
	# Check for running process
	self.assertTrue(process_named_running(PROCESS_NAME))
	self.cli_delete(base_path)
	self.cli_commit()

	def test_ospf_01_defaults(self):
	# commit changes
	self.cli_set(base_path)
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' auto-cost reference-bandwidth 100', frrconfig)
	self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults

	def test_ospf_02_simple(self):
	router_id = '127.0.0.1'
	abr_type = 'ibm'
	bandwidth = '1000'
	metric = '123'

	self.cli_set(base_path + ['auto-cost', 'reference-bandwidth', bandwidth])
	self.cli_set(base_path + ['parameters', 'router-id', router_id])
	self.cli_set(base_path + ['parameters', 'abr-type', abr_type])
	self.cli_set(base_path + ['parameters', 'opaque-lsa'])
	self.cli_set(base_path + ['parameters', 'rfc1583-compatibility'])
	self.cli_set(base_path + ['log-adjacency-changes', 'detail'])
	self.cli_set(base_path + ['default-metric', metric])
	self.cli_set(base_path + ['passive-interface', 'default'])
	self.cli_set(base_path + ['area', '10', 'area-type', 'stub'])
	self.cli_set(base_path + ['area', '10', 'network', '10.0.0.0/16'])
	self.cli_set(base_path + ['area', '10', 'range', '10.0.1.0/24'])
	self.cli_set(base_path + ['area', '10', 'range', '10.0.2.0/24', 'not-advertise'])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' compatible rfc1583', frrconfig)
	self.assertIn(f' auto-cost reference-bandwidth {bandwidth}', frrconfig)
	self.assertIn(f' ospf router-id {router_id}', frrconfig)
	self.assertIn(f' ospf abr-type {abr_type}', frrconfig)
	self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
	self.assertIn(f' capability opaque', frrconfig)
	self.assertIn(f' default-metric {metric}', frrconfig)
	self.assertIn(f' passive-interface default', frrconfig)
	self.assertIn(f' area 10 stub', frrconfig)
	self.assertIn(f' network 10.0.0.0/16 area 10', frrconfig)
	self.assertIn(f' area 10 range 10.0.1.0/24', frrconfig)
	self.assertNotIn(f' area 10 range 10.0.1.0/24 not-advertise', frrconfig)
	self.assertIn(f' area 10 range 10.0.2.0/24 not-advertise', frrconfig)


	def test_ospf_03_access_list(self):
	acl = '100'
	seq = '10'
	protocols = ['bgp', 'connected', 'isis', 'kernel', 'rip', 'static']

	self.cli_set(['policy', 'access-list', acl, 'rule', seq, 'action', 'permit'])
	self.cli_set(['policy', 'access-list', acl, 'rule', seq, 'source', 'any'])
	self.cli_set(['policy', 'access-list', acl, 'rule', seq, 'destination', 'any'])
	for ptotocol in protocols:
	self.cli_set(base_path + ['access-list', acl, 'export', ptotocol])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
	for ptotocol in protocols:
	self.assertIn(f' distribute-list {acl} out {ptotocol}', frrconfig) # defaults
	self.cli_delete(['policy', 'access-list', acl])


	def test_ospf_04_default_originate(self):
	seq = '100'
	metric = '50'
	metric_type = '1'

	self.cli_set(base_path + ['default-information', 'originate', 'metric', metric])
	self.cli_set(base_path + ['default-information', 'originate', 'metric-type', metric_type])
	self.cli_set(base_path + ['default-information', 'originate', 'route-map', route_map])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
	self.assertIn(f' default-information originate metric {metric} metric-type {metric_type} route-map {route_map}', frrconfig)

	# Now set 'always'
	self.cli_set(base_path + ['default-information', 'originate', 'always'])
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f' default-information originate always metric {metric} metric-type {metric_type} route-map {route_map}', frrconfig)


	def test_ospf_05_options(self):
	global_distance = '128'
	intra_area = '100'
	inter_area = '110'
	external = '120'
	on_startup = '30'
	on_shutdown = '60'
	refresh = '50'
	aggregation_timer = '100'
	summary_nets = {
	'10.0.1.0/24' : {},
	'10.0.2.0/24' : {'tag' : '50'},
	'10.0.3.0/24' : {'no_advertise' : {}},
	}

	self.cli_set(base_path + ['distance', 'global', global_distance])
	self.cli_set(base_path + ['distance', 'ospf', 'external', external])
	self.cli_set(base_path + ['distance', 'ospf', 'intra-area', intra_area])

	self.cli_set(base_path + ['max-metric', 'router-lsa', 'on-startup', on_startup])
	self.cli_set(base_path + ['max-metric', 'router-lsa', 'on-shutdown', on_shutdown])

	self.cli_set(base_path + ['mpls-te', 'enable'])
	self.cli_set(base_path + ['refresh', 'timers', refresh])

	self.cli_set(base_path + ['aggregation', 'timer', aggregation_timer])

	for summary, summary_options in summary_nets.items():
	self.cli_set(base_path + ['summary-address', summary])
	if 'tag' in summary_options:
	self.cli_set(base_path + ['summary-address', summary, 'tag', summary_options['tag']])
	if 'no_advertise' in summary_options:
	self.cli_set(base_path + ['summary-address', summary, 'no-advertise'])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' mpls-te on', frrconfig)
	self.assertIn(f' mpls-te router-address 0.0.0.0', frrconfig) # default
	self.assertIn(f' distance {global_distance}', frrconfig)
	self.assertIn(f' distance ospf intra-area {intra_area} external {external}', frrconfig)
	self.assertIn(f' max-metric router-lsa on-startup {on_startup}', frrconfig)
	self.assertIn(f' max-metric router-lsa on-shutdown {on_shutdown}', frrconfig)
	self.assertIn(f' refresh timer {refresh}', frrconfig)

	self.assertIn(f' aggregation timer {aggregation_timer}', frrconfig)
	for summary, summary_options in summary_nets.items():
	self.assertIn(f' summary-address {summary}', frrconfig)
	if 'tag' in summary_options:
	tag = summary_options['tag']
	self.assertIn(f' summary-address {summary} tag {tag}', frrconfig)
	if 'no_advertise' in summary_options:
	self.assertIn(f' summary-address {summary} no-advertise', frrconfig)

	# enable inter-area
	self.cli_set(base_path + ['distance', 'ospf', 'inter-area', inter_area])
	self.cli_commit()

	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f' distance ospf intra-area {intra_area} inter-area {inter_area} external {external}', frrconfig)


	def test_ospf_06_neighbor(self):
	priority = '10'
	poll_interval = '20'
	neighbors = ['1.1.1.1', '2.2.2.2', '3.3.3.3']
	for neighbor in neighbors:
	self.cli_set(base_path + ['neighbor', neighbor, 'priority', priority])
	self.cli_set(base_path + ['neighbor', neighbor, 'poll-interval', poll_interval])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	for neighbor in neighbors:
	self.assertIn(f' neighbor {neighbor} priority {priority} poll-interval {poll_interval}', frrconfig) # default

	def test_ospf_07_redistribute(self):
	metric = '15'
	metric_type = '1'
	redistribute = ['bgp', 'connected', 'isis', 'kernel', 'rip', 'static']

	for protocol in redistribute:
	self.cli_set(base_path + ['redistribute', protocol, 'metric', metric])
	self.cli_set(base_path + ['redistribute', protocol, 'route-map', route_map])
	self.cli_set(base_path + ['redistribute', protocol, 'metric-type', metric_type])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	for protocol in redistribute:
	self.assertIn(f' redistribute {protocol} metric {metric} metric-type {metric_type} route-map {route_map}', frrconfig)

	def test_ospf_08_virtual_link(self):
	networks = ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']
	area = '10'
	shortcut = 'enable'
	virtual_link = '192.0.2.1'
	hello = '6'
	retransmit = '5'
	transmit = '5'
	dead = '40'

	self.cli_set(base_path + ['area', area, 'shortcut', shortcut])
	self.cli_set(base_path + ['area', area, 'virtual-link', virtual_link, 'hello-interval', hello])
	self.cli_set(base_path + ['area', area, 'virtual-link', virtual_link, 'retransmit-interval', retransmit])
	self.cli_set(base_path + ['area', area, 'virtual-link', virtual_link, 'transmit-delay', transmit])
	self.cli_set(base_path + ['area', area, 'virtual-link', virtual_link, 'dead-interval', dead])
	for network in networks:
	self.cli_set(base_path + ['area', area, 'network', network])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' area {area} shortcut {shortcut}', frrconfig)
	self.assertIn(f' area {area} virtual-link {virtual_link} hello-interval {hello} retransmit-interval {retransmit} transmit-delay {transmit} dead-interval {dead}', frrconfig)
	for network in networks:
	self.assertIn(f' network {network} area {area}', frrconfig)


	def test_ospf_09_interface_configuration(self):
	interfaces = Section.interfaces('ethernet')
	password = 'vyos1234'
	bandwidth = '10000'
	cost = '150'
	network = 'point-to-point'
	priority = '200'
	bfd_profile = 'vyos-test'

	self.cli_set(base_path + ['passive-interface', 'default'])
	for interface in interfaces:
	base_interface = base_path + ['interface', interface]
	self.cli_set(base_interface + ['authentication', 'plaintext-password', password])
	self.cli_set(base_interface + ['bandwidth', bandwidth])
	self.cli_set(base_interface + ['bfd', 'profile', bfd_profile])
	self.cli_set(base_interface + ['cost', cost])
	self.cli_set(base_interface + ['mtu-ignore'])
	self.cli_set(base_interface + ['network', network])
	self.cli_set(base_interface + ['priority', priority])
	self.cli_set(base_interface + ['passive', 'disable'])

	# commit changes
	self.cli_commit()

	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' passive-interface default', frrconfig)

	for interface in interfaces:
	+ # Can not use daemon for getFRRconfig() as bandwidth parameter belongs to zebra process
	config = self.getFRRconfig(f'interface {interface}')
	self.assertIn(f'interface {interface}', config)
	self.assertIn(f' ip ospf authentication-key {password}', config)
	self.assertIn(f' ip ospf bfd', config)
	self.assertIn(f' ip ospf bfd profile {bfd_profile}', config)
	self.assertIn(f' ip ospf cost {cost}', config)
	self.assertIn(f' ip ospf mtu-ignore', config)
	self.assertIn(f' ip ospf network {network}', config)
	self.assertIn(f' ip ospf priority {priority}', config)
	self.assertIn(f' no ip ospf passive', config)
	self.assertIn(f' bandwidth {bandwidth}', config)

	+ # T5467: Remove interface from OSPF process and VRF
	+ self.cli_delete(base_path + ['interface'])
	+ self.cli_commit()
	+
	+ for interface in interfaces:
	+ # T5467: It must also be removed from FRR config
	+ frrconfig = self.getFRRconfig(f'interface {interface}', daemon=PROCESS_NAME)
	+ self.assertNotIn(f'interface {interface}', frrconfig)
	+ # There should be no OSPF related command at all under the interface
	+ self.assertNotIn(f' ip ospf', frrconfig)
	+
	def test_ospf_11_interface_area(self):
	area = '0'
	interfaces = Section.interfaces('ethernet')

	self.cli_set(base_path + ['area', area, 'network', '10.0.0.0/8'])
	for interface in interfaces:
	self.cli_set(base_path + ['interface', interface, 'area', area])

	# we can not have bot area network and interface area set
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()
	self.cli_delete(base_path + ['area', area, 'network'])

	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)

	for interface in interfaces:
	- config = self.getFRRconfig(f'interface {interface}')
	+ config = self.getFRRconfig(f'interface {interface}', daemon=PROCESS_NAME)
	self.assertIn(f'interface {interface}', config)
	self.assertIn(f' ip ospf area {area}', config)

	def test_ospf_12_vrfs(self):
	# It is safe to assume that when the basic VRF test works, all
	# other OSPF related features work, as we entirely inherit the CLI
	# templates and Jinja2 FRR template.
	table = '1000'
	vrf = 'blue'
	vrf_base = ['vrf', 'name', vrf]
	vrf_iface = 'eth1'
	+ area = '1'
	+
	self.cli_set(vrf_base + ['table', table])
	- self.cli_set(vrf_base + ['protocols', 'ospf', 'interface', vrf_iface])
	+ self.cli_set(vrf_base + ['protocols', 'ospf', 'interface', vrf_iface, 'area', area])
	self.cli_set(['interfaces', 'ethernet', vrf_iface, 'vrf', vrf])

	# Also set a default VRF OSPF config
	self.cli_set(base_path)
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' auto-cost reference-bandwidth 100', frrconfig)
	self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults

	- frrconfig = self.getFRRconfig(f'router ospf vrf {vrf}')
	+ frrconfig = self.getFRRconfig(f'router ospf vrf {vrf}', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf vrf {vrf}', frrconfig)
	self.assertIn(f' auto-cost reference-bandwidth 100', frrconfig)
	self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults

	+ frrconfig = self.getFRRconfig(f'interface {vrf_iface}', daemon=PROCESS_NAME)
	+ self.assertIn(f'interface {vrf_iface}', frrconfig)
	+ self.assertIn(f' ip ospf area {area}', frrconfig)
	+
	+ # T5467: Remove interface from OSPF process and VRF
	+ self.cli_delete(vrf_base + ['protocols', 'ospf', 'interface'])
	+ self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])
	+ self.cli_commit()
	+
	+ # T5467: It must also be removed from FRR config
	+ frrconfig = self.getFRRconfig(f'interface {vrf_iface}', daemon=PROCESS_NAME)
	+ self.assertNotIn(f'interface {vrf_iface}', frrconfig)
	+ # There should be no OSPF related command at all under the interface
	+ self.assertNotIn(f' ip ospf', frrconfig)
	+
	# cleanup
	self.cli_delete(['vrf', 'name', vrf])
	self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])

	def test_ospf_13_export_list(self):
	# Verify explort-list works on ospf-area
	acl = '100'
	seq = '10'
	area = '0.0.0.10'
	network = '10.0.0.0/8'

	-
	self.cli_set(['policy', 'access-list', acl, 'rule', seq, 'action', 'permit'])
	self.cli_set(['policy', 'access-list', acl, 'rule', seq, 'source', 'any'])
	self.cli_set(['policy', 'access-list', acl, 'rule', seq, 'destination', 'any'])
	self.cli_set(base_path + ['area', area, 'network', network])
	self.cli_set(base_path + ['area', area, 'export-list', acl])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # default
	self.assertIn(f' network {network} area {area}', frrconfig)
	self.assertIn(f' area {area} export-list {acl}', frrconfig)


	def test_ospf_14_segment_routing_configuration(self):
	global_block_low = "300"
	global_block_high = "399"
	local_block_low = "400"
	local_block_high = "499"
	interface = 'lo'
	maximum_stack_size = '5'
	prefix_one = '192.168.0.1/32'
	prefix_two = '192.168.0.2/32'
	prefix_one_value = '1'
	prefix_two_value = '2'

	self.cli_set(base_path + ['interface', interface])
	self.cli_set(base_path + ['segment-routing', 'maximum-label-depth', maximum_stack_size])
	self.cli_set(base_path + ['segment-routing', 'global-block', 'low-label-value', global_block_low])
	self.cli_set(base_path + ['segment-routing', 'global-block', 'high-label-value', global_block_high])
	self.cli_set(base_path + ['segment-routing', 'local-block', 'low-label-value', local_block_low])
	self.cli_set(base_path + ['segment-routing', 'local-block', 'high-label-value', local_block_high])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_one, 'index', 'value', prefix_one_value])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_one, 'index', 'explicit-null'])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_two, 'index', 'value', prefix_two_value])
	self.cli_set(base_path + ['segment-routing', 'prefix', prefix_two, 'index', 'no-php-flag'])

	# Commit all changes
	self.cli_commit()

	# Verify all changes
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f' segment-routing on', frrconfig)
	self.assertIn(f' segment-routing global-block {global_block_low} {global_block_high} local-block {local_block_low} {local_block_high}', frrconfig)
	self.assertIn(f' segment-routing node-msd {maximum_stack_size}', frrconfig)
	self.assertIn(f' segment-routing prefix {prefix_one} index {prefix_one_value} explicit-null', frrconfig)
	self.assertIn(f' segment-routing prefix {prefix_two} index {prefix_two_value} no-php-flag', frrconfig)

	def test_ospf_15_ldp_sync(self):
	holddown = "500"
	interface = 'lo'
	interfaces = Section.interfaces('ethernet')

	self.cli_set(base_path + ['interface', interface])
	self.cli_set(base_path + ['ldp-sync', 'holddown', holddown])

	# Commit main OSPF changes
	self.cli_commit()

	# Verify main OSPF changes
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig)
	self.assertIn(f' mpls ldp-sync holddown {holddown}', frrconfig)

	for interface in interfaces:
	self.cli_set(base_path + ['interface', interface, 'ldp-sync', 'holddown', holddown])

	- # Commit interface changes for holddown
	- self.cli_commit()
	+ # Commit interface changes for holddown
	+ self.cli_commit()

	+ for interface in interfaces:
	# Verify interface changes for holddown
	- config = self.getFRRconfig(f'interface {interface}')
	+ config = self.getFRRconfig(f'interface {interface}', daemon=PROCESS_NAME)
	self.assertIn(f'interface {interface}', config)
	self.assertIn(f' ip ospf dead-interval 40', config)
	self.assertIn(f' ip ospf mpls ldp-sync', config)
	self.assertIn(f' ip ospf mpls ldp-sync holddown {holddown}', config)

	for interface in interfaces:
	self.cli_set(base_path + ['interface', interface, 'ldp-sync', 'disable'])

	- # Commit interface changes for disable
	- self.cli_commit()
	+ # Commit interface changes for disable
	+ self.cli_commit()

	+ for interface in interfaces:
	# Verify interface changes for disable
	- config = self.getFRRconfig(f'interface {interface}')
	+ config = self.getFRRconfig(f'interface {interface}', daemon=PROCESS_NAME)
	self.assertIn(f'interface {interface}', config)
	self.assertIn(f' ip ospf dead-interval 40', config)
	self.assertIn(f' no ip ospf mpls ldp-sync', config)

	def test_ospf_16_graceful_restart(self):
	period = '300'
	supported_grace_time = '400'
	router_ids = ['192.0.2.1', '192.0.2.2']

	self.cli_set(base_path + ['capability', 'opaque'])
	self.cli_set(base_path + ['graceful-restart', 'grace-period', period])
	self.cli_set(base_path + ['graceful-restart', 'helper', 'planned-only'])
	self.cli_set(base_path + ['graceful-restart', 'helper', 'no-strict-lsa-checking'])
	self.cli_set(base_path + ['graceful-restart', 'helper', 'supported-grace-time', supported_grace_time])
	for router_id in router_ids:
	self.cli_set(base_path + ['graceful-restart', 'helper', 'enable', 'router-id', router_id])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf')
	+ frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf', frrconfig)
	self.assertIn(f' capability opaque', frrconfig)
	self.assertIn(f' graceful-restart grace-period {period}', frrconfig)
	self.assertIn(f' graceful-restart helper planned-only', frrconfig)
	self.assertIn(f' no graceful-restart helper strict-lsa-checking', frrconfig)
	self.assertIn(f' graceful-restart helper supported-grace-time {supported_grace_time}', frrconfig)
	for router_id in router_ids:
	self.assertIn(f' graceful-restart helper enable {router_id}', frrconfig)

	if __name__ == '__main__':
	unittest.main(verbosity=2)
	diff --git a/smoketest/scripts/cli/test_protocols_ospfv3.py b/smoketest/scripts/cli/test_protocols_ospfv3.py
	index 64dfa18db..0d6c6c691 100755
	--- a/smoketest/scripts/cli/test_protocols_ospfv3.py
	+++ b/smoketest/scripts/cli/test_protocols_ospfv3.py
	@@ -1,311 +1,331 @@
	#!/usr/bin/env python3
	#
	# Copyright (C) 2021-2022 VyOS maintainers and contributors
	#
	# This program is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License version 2 or later as
	# published by the Free Software Foundation.
	#
	# This program is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with this program. If not, see <http://www.gnu.org/licenses/>.

	import unittest

	from base_vyostest_shim import VyOSUnitTestSHIM

	from vyos.configsession import ConfigSessionError
	from vyos.ifconfig import Section
	from vyos.utils.process import process_named_running

	PROCESS_NAME = 'ospf6d'
	base_path = ['protocols', 'ospfv3']

	route_map = 'foo-bar-baz-0815'

	router_id = '192.0.2.1'
	default_area = '0'

	class TestProtocolsOSPFv3(VyOSUnitTestSHIM.TestCase):
	@classmethod
	def setUpClass(cls):
	super(TestProtocolsOSPFv3, cls).setUpClass()

	cls.cli_set(cls, ['policy', 'route-map', route_map, 'rule', '10', 'action', 'permit'])
	cls.cli_set(cls, ['policy', 'route-map', route_map, 'rule', '20', 'action', 'permit'])

	# ensure we can also run this test on a live system - so lets clean
	# out the current configuration :)
	cls.cli_delete(cls, base_path)

	@classmethod
	def tearDownClass(cls):
	cls.cli_delete(cls, ['policy', 'route-map', route_map])
	super(TestProtocolsOSPFv3, cls).tearDownClass()

	def tearDown(self):
	# Check for running process
	self.assertTrue(process_named_running(PROCESS_NAME))
	self.cli_delete(base_path)
	self.cli_commit()

	def test_ospfv3_01_basic(self):
	seq = '10'
	prefix = '2001:db8::/32'
	acl_name = 'foo-acl-100'

	self.cli_set(['policy', 'access-list6', acl_name, 'rule', seq, 'action', 'permit'])
	self.cli_set(['policy', 'access-list6', acl_name, 'rule', seq, 'source', 'any'])

	self.cli_set(base_path + ['parameters', 'router-id', router_id])
	self.cli_set(base_path + ['area', default_area, 'range', prefix, 'advertise'])
	self.cli_set(base_path + ['area', default_area, 'export-list', acl_name])
	self.cli_set(base_path + ['area', default_area, 'import-list', acl_name])

	interfaces = Section.interfaces('ethernet')
	for interface in interfaces:
	self.cli_set(base_path + ['interface', interface, 'area', default_area])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)
	self.assertIn(f' area {default_area} range {prefix}', frrconfig)
	self.assertIn(f' ospf6 router-id {router_id}', frrconfig)
	self.assertIn(f' area {default_area} import-list {acl_name}', frrconfig)
	self.assertIn(f' area {default_area} export-list {acl_name}', frrconfig)

	for interface in interfaces:
	- if_config = self.getFRRconfig(f'interface {interface}', daemon='ospf6d')
	+ if_config = self.getFRRconfig(f'interface {interface}', daemon=PROCESS_NAME)
	self.assertIn(f'ipv6 ospf6 area {default_area}', if_config)

	self.cli_delete(['policy', 'access-list6', acl_name])


	def test_ospfv3_02_distance(self):
	dist_global = '200'
	dist_external = '110'
	dist_inter_area = '120'
	dist_intra_area = '130'

	self.cli_set(base_path + ['distance', 'global', dist_global])
	self.cli_set(base_path + ['distance', 'ospfv3', 'external', dist_external])
	self.cli_set(base_path + ['distance', 'ospfv3', 'inter-area', dist_inter_area])
	self.cli_set(base_path + ['distance', 'ospfv3', 'intra-area', dist_intra_area])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)
	self.assertIn(f' distance {dist_global}', frrconfig)
	self.assertIn(f' distance ospf6 intra-area {dist_intra_area} inter-area {dist_inter_area} external {dist_external}', frrconfig)


	def test_ospfv3_03_redistribute(self):
	route_map = 'foo-bar'
	route_map_seq = '10'
	redistribute = ['bgp', 'connected', 'kernel', 'ripng', 'static']

	self.cli_set(['policy', 'route-map', route_map, 'rule', route_map_seq, 'action', 'permit'])

	for protocol in redistribute:
	self.cli_set(base_path + ['redistribute', protocol, 'route-map', route_map])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)
	for protocol in redistribute:
	self.assertIn(f' redistribute {protocol} route-map {route_map}', frrconfig)


	def test_ospfv3_04_interfaces(self):
	bfd_profile = 'vyos-ipv6'

	self.cli_set(base_path + ['parameters', 'router-id', router_id])
	self.cli_set(base_path + ['area', default_area])

	cost = '100'
	priority = '10'
	interfaces = Section.interfaces('ethernet')
	for interface in interfaces:
	if_base = base_path + ['interface', interface]
	self.cli_set(if_base + ['bfd', 'profile', bfd_profile])
	self.cli_set(if_base + ['cost', cost])
	self.cli_set(if_base + ['instance-id', '0'])
	self.cli_set(if_base + ['mtu-ignore'])
	self.cli_set(if_base + ['network', 'point-to-point'])
	self.cli_set(if_base + ['passive'])
	self.cli_set(if_base + ['priority', priority])
	cost = str(int(cost) + 10)
	priority = str(int(priority) + 5)

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)

	cost = '100'
	priority = '10'
	for interface in interfaces:
	- if_config = self.getFRRconfig(f'interface {interface}', daemon='ospf6d')
	+ if_config = self.getFRRconfig(f'interface {interface}', daemon=PROCESS_NAME)
	self.assertIn(f'interface {interface}', if_config)
	self.assertIn(f' ipv6 ospf6 bfd', if_config)
	self.assertIn(f' ipv6 ospf6 bfd profile {bfd_profile}', if_config)
	self.assertIn(f' ipv6 ospf6 cost {cost}', if_config)
	self.assertIn(f' ipv6 ospf6 mtu-ignore', if_config)
	self.assertIn(f' ipv6 ospf6 network point-to-point', if_config)
	self.assertIn(f' ipv6 ospf6 passive', if_config)
	self.assertIn(f' ipv6 ospf6 priority {priority}', if_config)
	cost = str(int(cost) + 10)
	priority = str(int(priority) + 5)

	+ # Cleanup interfaces
	+ self.cli_delete(base_path + ['interface'])
	+ self.cli_commit()
	+
	+ for interface in interfaces:
	+ if_config = self.getFRRconfig(f'interface {interface}', daemon=PROCESS_NAME)
	+ # There should be no OSPF6 configuration at all after interface removal
	+ self.assertNotIn(f' ipv6 ospf6', if_config)
	+

	def test_ospfv3_05_area_stub(self):
	area_stub = '23'
	area_stub_nosum = '26'

	self.cli_set(base_path + ['area', area_stub, 'area-type', 'stub'])
	self.cli_set(base_path + ['area', area_stub_nosum, 'area-type', 'stub', 'no-summary'])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)
	self.assertIn(f' area {area_stub} stub', frrconfig)
	self.assertIn(f' area {area_stub_nosum} stub no-summary', frrconfig)


	def test_ospfv3_06_area_nssa(self):
	area_nssa = '1.1.1.1'
	area_nssa_nosum = '2.2.2.2'
	area_nssa_default = '3.3.3.3'

	self.cli_set(base_path + ['area', area_nssa, 'area-type', 'nssa'])
	self.cli_set(base_path + ['area', area_nssa, 'area-type', 'stub'])
	# can only set one area-type per OSPFv3 area
	with self.assertRaises(ConfigSessionError):
	self.cli_commit()
	self.cli_delete(base_path + ['area', area_nssa, 'area-type', 'stub'])

	self.cli_set(base_path + ['area', area_nssa_nosum, 'area-type', 'nssa', 'no-summary'])
	self.cli_set(base_path + ['area', area_nssa_nosum, 'area-type', 'nssa', 'default-information-originate'])
	self.cli_set(base_path + ['area', area_nssa_default, 'area-type', 'nssa', 'default-information-originate'])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)
	self.assertIn(f' area {area_nssa} nssa', frrconfig)
	self.assertIn(f' area {area_nssa_nosum} nssa default-information-originate no-summary', frrconfig)
	self.assertIn(f' area {area_nssa_default} nssa default-information-originate', frrconfig)


	def test_ospfv3_07_default_originate(self):
	seq = '100'
	metric = '50'
	metric_type = '1'

	self.cli_set(base_path + ['default-information', 'originate', 'metric', metric])
	self.cli_set(base_path + ['default-information', 'originate', 'metric-type', metric_type])
	self.cli_set(base_path + ['default-information', 'originate', 'route-map', route_map])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)
	self.assertIn(f' default-information originate metric {metric} metric-type {metric_type} route-map {route_map}', frrconfig)

	# Now set 'always'
	self.cli_set(base_path + ['default-information', 'originate', 'always'])
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f' default-information originate always metric {metric} metric-type {metric_type} route-map {route_map}', frrconfig)


	def test_ospfv3_08_vrfs(self):
	# It is safe to assume that when the basic VRF test works, all
	# other OSPF related features work, as we entirely inherit the CLI
	# templates and Jinja2 FRR template.
	table = '1000'
	vrf = 'blue'
	vrf_base = ['vrf', 'name', vrf]
	vrf_iface = 'eth1'
	router_id = '1.2.3.4'
	router_id_vrf = '1.2.3.5'

	self.cli_set(vrf_base + ['table', table])
	self.cli_set(vrf_base + ['protocols', 'ospfv3', 'interface', vrf_iface, 'bfd'])
	self.cli_set(vrf_base + ['protocols', 'ospfv3', 'parameters', 'router-id', router_id_vrf])

	self.cli_set(['interfaces', 'ethernet', vrf_iface, 'vrf', vrf])

	# Also set a default VRF OSPF config
	self.cli_set(base_path + ['parameters', 'router-id', router_id])
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)
	self.assertIn(f' ospf6 router-id {router_id}', frrconfig)

	- frrconfig = self.getFRRconfig(f'interface {vrf_iface}', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig(f'interface {vrf_iface}', daemon=PROCESS_NAME)
	self.assertIn(f'interface {vrf_iface}', frrconfig)
	self.assertIn(f' ipv6 ospf6 bfd', frrconfig)

	- frrconfig = self.getFRRconfig(f'router ospf6 vrf {vrf}', daemon='ospf6d')
	+ frrconfig = self.getFRRconfig(f'router ospf6 vrf {vrf}', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6 vrf {vrf}', frrconfig)
	self.assertIn(f' ospf6 router-id {router_id_vrf}', frrconfig)

	+ # T5467: Remove interface from OSPF process and VRF
	+ self.cli_delete(vrf_base + ['protocols', 'ospfv3', 'interface'])
	+ self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])
	+ self.cli_commit()
	+
	+ # T5467: It must also be removed from FRR config
	+ frrconfig = self.getFRRconfig(f'interface {vrf_iface}', daemon=PROCESS_NAME)
	+ self.assertNotIn(f'interface {vrf_iface}', frrconfig)
	+ # There should be no OSPF related command at all under the interface
	+ self.assertNotIn(f' ipv6 ospf6', frrconfig)
	+
	# cleanup
	self.cli_delete(['vrf', 'name', vrf])
	self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])


	def test_ospfv3_09_graceful_restart(self):
	period = '300'
	supported_grace_time = '400'
	router_ids = ['192.0.2.1', '192.0.2.2']

	self.cli_set(base_path + ['graceful-restart', 'grace-period', period])
	self.cli_set(base_path + ['graceful-restart', 'helper', 'planned-only'])
	self.cli_set(base_path + ['graceful-restart', 'helper', 'lsa-check-disable'])
	self.cli_set(base_path + ['graceful-restart', 'helper', 'supported-grace-time', supported_grace_time])
	for router_id in router_ids:
	self.cli_set(base_path + ['graceful-restart', 'helper', 'enable', 'router-id', router_id])

	# commit changes
	self.cli_commit()

	# Verify FRR ospfd configuration
	- frrconfig = self.getFRRconfig('router ospf6')
	+ frrconfig = self.getFRRconfig('router ospf6', daemon=PROCESS_NAME)
	self.assertIn(f'router ospf6', frrconfig)
	self.assertIn(f' graceful-restart grace-period {period}', frrconfig)
	self.assertIn(f' graceful-restart helper planned-only', frrconfig)
	self.assertIn(f' graceful-restart helper lsa-check-disable', frrconfig)
	self.assertIn(f' graceful-restart helper supported-grace-time {supported_grace_time}', frrconfig)
	for router_id in router_ids:
	self.assertIn(f' graceful-restart helper enable {router_id}', frrconfig)

	if __name__ == '__main__':
	unittest.main(verbosity=2)

File Metadata

Mime Type: text/x-diff
Expires: Fri, Nov 6, 8:51 AM (1 d, 13 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4653581
Default Alt Text: (56 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions