No OneTemporary
Actions

Size

29 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/op-mode-definitions/dhcp.xml.in b/op-mode-definitions/dhcp.xml.in
	index 6114142f0..027072261 100644
	--- a/op-mode-definitions/dhcp.xml.in
	+++ b/op-mode-definitions/dhcp.xml.in
	@@ -1,236 +1,275 @@
	<?xml version="1.0" encoding="UTF-8"?>
	<interfaceDefinition>
	<node name="show">
	<children>
	<node name="dhcp">
	<properties>
	<help>Show DHCP (Dynamic Host Configuration Protocol) information</help>
	</properties>
	<children>
	<node name="client">
	<properties>
	<help>Show DHCP client information</help>
	</properties>
	<children>
	<node name="leases">
	<properties>
	<help>Show DHCP client leases</help>
	</properties>
	<children>
	<tagNode name="interface">
	<properties>
	<help> Show DHCP client information for a given interface</help>
	<completionHelp>
	<script>${vyos_completion_dir}/list_interfaces --broadcast</script>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_client_leases --family inet --interface $6</command>
	</tagNode>
	</children>
	<command>${vyos_op_scripts_dir}/dhcp.py show_client_leases --family inet</command>
	</node>
	</children>
	</node>
	<node name="server">
	<properties>
	<help>Show DHCP server information</help>
	</properties>
	<children>
	<node name="leases">
	<properties>
	<help>Show DHCP server leases</help>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet</command>
	<children>
	<tagNode name="origin">
	<properties>
	<help>Show DHCP server leases granted by local or remote DHCP server</help>
	<completionHelp>
	<list>local remote</list>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet --origin $6</command>
	</tagNode>
	<tagNode name="pool">
	<properties>
	<help>Show DHCP server leases for a specific pool</help>
	<completionHelp>
	<path>service dhcp-server shared-network-name</path>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet --pool $6</command>
	</tagNode>
	<tagNode name="sort">
	<properties>
	<help>Show DHCP server leases sorted by the specified key</help>
	<completionHelp>
	<list>end hostname ip mac pool remaining start state</list>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet --sort $6</command>
	</tagNode>
	<tagNode name="state">
	<properties>
	<help>Show DHCP server leases with a specific state (can be multiple, comma-separated)</help>
	<completionHelp>
	<list>abandoned active all backup expired free released reset</list>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet --state $6</command>
	</tagNode>
	</children>
	</node>
	<node name="statistics">
	<properties>
	<help>Show DHCP server statistics</help>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_pool_statistics --family inet</command>
	<children>
	<tagNode name="pool">
	<properties>
	<help>Show DHCP server statistics for a specific pool</help>
	<completionHelp>
	<path>service dhcp-server shared-network-name</path>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_pool_statistics --family inet --pool $6</command>
	</tagNode>
	</children>
	</node>
	</children>
	</node>
	</children>
	</node>
	<node name="dhcpv6">
	<properties>
	<help>Show DHCPv6 (IPv6 Dynamic Host Configuration Protocol) information</help>
	</properties>
	<children>
	<node name="server">
	<properties>
	<help>Show DHCPv6 server information</help>
	</properties>
	<children>
	<node name="leases">
	<properties>
	<help>Show DHCPv6 server leases</help>
	</properties>
	<command>sudo ${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet6</command>
	<children>
	<tagNode name="pool">
	<properties>
	<help>Show DHCPv6 server leases for a specific pool</help>
	<completionHelp>
	<path>service dhcpv6-server shared-network-name</path>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet6 --pool $6</command>
	</tagNode>
	<tagNode name="sort">
	<properties>
	<help>Show DHCPv6 server leases sorted by the specified key</help>
	<completionHelp>
	<list>end duid ip last_communication pool remaining state type</list>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet6 --sort $6</command>
	</tagNode>
	<tagNode name="state">
	<properties>
	<help>Show DHCPv6 server leases with a specific state (can be multiple, comma-separated)</help>
	<completionHelp>
	<list>abandoned active all backup expired free released reset</list>
	</completionHelp>
	</properties>
	<command>${vyos_op_scripts_dir}/dhcp.py show_server_leases --family inet6 --state $6</command>
	</tagNode>
	</children>
	</node>
	</children>
	</node>
	</children>
	</node>
	</children>
	</node>
	<node name="restart">
	<children>
	<node name="dhcp">
	<properties>
	<help>Restart DHCP processes</help>
	</properties>
	<children>
	<node name="server">
	<properties>
	<help>Restart DHCP server</help>
	</properties>
	<command>if cli-shell-api existsActive service dhcp-server; then sudo systemctl restart isc-dhcp-server.service; else echo "DHCP server not configured"; fi</command>
	</node>
	<node name="relay-agent">
	<properties>
	<help>Restart DHCP relay-agent</help>
	</properties>
	<command>sudo ${vyos_op_scripts_dir}/restart_dhcp_relay.py --ipv4</command>
	</node>
	</children>
	</node>
	<node name="dhcpv6">
	<properties>
	<help>Restart DHCPv6 processes</help>
	</properties>
	<children>
	<node name="server">
	<properties>
	<help>Restart DHCPv6 server</help>
	</properties>
	<command>if cli-shell-api existsActive service dhcpv6-server; then sudo systemctl restart isc-dhcp-server6.service; else echo "DHCPv6 server not configured"; fi</command>
	</node>
	<node name="relay-agent">
	<properties>
	<help>Restart DHCPv6 relay-agent</help>
	</properties>
	<command>sudo ${vyos_op_scripts_dir}/restart_dhcp_relay.py --ipv6</command>
	</node>
	</children>
	</node>
	</children>
	</node>
	<node name="renew">
	<properties>
	<help>Renew specified variable</help>
	</properties>
	<children>
	<node name="dhcp">
	<properties>
	<help>Renew DHCP client lease</help>
	</properties>
	<children>
	<tagNode name="interface">
	<properties>
	<help>Renew DHCP client lease for specified interface</help>
	<completionHelp>
	<script>${vyos_completion_dir}/list_interfaces</script>
	</completionHelp>
	</properties>
	<command>sudo ${vyos_op_scripts_dir}/dhcp.py renew_client_lease --family inet --interface "$4"</command>
	</tagNode>
	</children>
	</node>
	<node name="dhcpv6">
	<properties>
	<help>Renew DHCPv6 client lease</help>
	</properties>
	<children>
	<tagNode name="interface">
	<properties>
	<help>Renew DHCPv6 client lease for specified interface</help>
	<completionHelp>
	<script>${vyos_completion_dir}/list_interfaces</script>
	</completionHelp>
	</properties>
	<command>sudo ${vyos_op_scripts_dir}/dhcp.py renew_client_lease --family inet6 --interface "$4"</command>
	</tagNode>
	</children>
	</node>
	</children>
	</node>
	+ <node name="release">
	+ <properties>
	+ <help>Release specified variable</help>
	+ </properties>
	+ <children>
	+ <node name="dhcp">
	+ <properties>
	+ <help>Release DHCP client lease</help>
	+ </properties>
	+ <children>
	+ <tagNode name="interface">
	+ <properties>
	+ <help>Release DHCP client lease for specified interface</help>
	+ <completionHelp>
	+ <script>${vyos_completion_dir}/list_interfaces</script>
	+ </completionHelp>
	+ </properties>
	+ <command>sudo ${vyos_op_scripts_dir}/dhcp.py release_client_lease --family inet --interface "$4"</command>
	+ </tagNode>
	+ </children>
	+ </node>
	+ <node name="dhcpv6">
	+ <properties>
	+ <help>Release DHCPv6 client lease</help>
	+ </properties>
	+ <children>
	+ <tagNode name="interface">
	+ <properties>
	+ <help>Release DHCPv6 client lease for specified interface</help>
	+ <completionHelp>
	+ <script>${vyos_completion_dir}/list_interfaces</script>
	+ </completionHelp>
	+ </properties>
	+ <command>sudo ${vyos_op_scripts_dir}/dhcp.py release_client_lease --family inet6 --interface "$4"</command>
	+ </tagNode>
	+ </children>
	+ </node>
	+ </children>
	+ </node>
	</interfaceDefinition>
	diff --git a/src/op_mode/dhcp.py b/src/op_mode/dhcp.py
	index 3229da4ad..dffd99de5 100755
	--- a/src/op_mode/dhcp.py
	+++ b/src/op_mode/dhcp.py
	@@ -1,433 +1,443 @@
	#!/usr/bin/env python3
	#
	# Copyright (C) 2022-2024 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 os
	import sys
	import typing

	from datetime import datetime
	from glob import glob
	from ipaddress import ip_address
	from isc_dhcp_leases import IscDhcpLeases
	from tabulate import tabulate

	import vyos.opmode

	from vyos.base import Warning
	from vyos.configquery import ConfigTreeQuery

	from vyos.utils.process import is_systemd_service_running
	from vyos.utils.process import call

	time_string = "%a %b %d %H:%M:%S %Z %Y"

	config = ConfigTreeQuery()
	lease_valid_states = ['all', 'active', 'free', 'expired', 'released', 'abandoned', 'reset', 'backup']
	sort_valid_inet = ['end', 'mac', 'hostname', 'ip', 'pool', 'remaining', 'start', 'state']
	sort_valid_inet6 = ['end', 'duid', 'ip', 'last_communication', 'pool', 'remaining', 'state', 'type']

	ArgFamily = typing.Literal['inet', 'inet6']
	ArgState = typing.Literal['all', 'active', 'free', 'expired', 'released', 'abandoned', 'reset', 'backup']
	ArgOrigin = typing.Literal['local', 'remote']

	def _utc_to_local(utc_dt):
	return datetime.fromtimestamp((datetime.fromtimestamp(utc_dt) - datetime(1970, 1, 1)).total_seconds())


	def _format_hex_string(in_bytes):
	in_str = bytes(in_bytes).hex()
	out_str = ""
	# if input is divisible by 2, add : every 2 chars
	if len(in_str) > 0 and len(in_str) % 2 == 0:
	out_str = ':'.join(a+b for a,b in zip(in_str[::2], in_str[1::2]))
	else:
	out_str = in_str

	return out_str


	def _find_list_of_dict_index(lst, key='ip', value='') -> int:
	"""
	Find the index entry of list of dict matching the dict value
	Exampe:
	% lst = [{'ip': '192.0.2.1'}, {'ip': '192.0.2.2'}]
	% _find_list_of_dict_index(lst, key='ip', value='192.0.2.2')
	% 1
	"""
	idx = next((index for (index, d) in enumerate(lst) if d[key] == value), None)
	return idx


	def _get_raw_server_leases(family='inet', pool=None, sorted=None, state=[], origin=None) -> list:
	"""
	Get DHCP server leases
	:return list
	"""
	lease_file = '/config/dhcpdv6.leases' if family == 'inet6' else '/config/dhcpd.leases'
	data = []
	leases = IscDhcpLeases(lease_file).get(include_backups=True)
	if pool is None:
	pool = _get_dhcp_pools(family=family)
	aux = False
	else:
	pool = [pool]
	aux = True

	## Search leases for every pool
	for pool_name in pool:
	for lease in leases:
	if lease.sets.get('shared-networkname', '') == pool_name or lease.sets.get('shared-networkname', '') == '':
	#if lease.sets.get('shared-networkname', '') == pool_name:
	data_lease = {}
	data_lease['ip'] = lease.ip
	data_lease['state'] = lease.binding_state
	#data_lease['pool'] = pool_name if lease.sets.get('shared-networkname', '') != '' else 'Fail-Over Server'
	data_lease['pool'] = lease.sets.get('shared-networkname', '')
	data_lease['end'] = lease.end.timestamp() if lease.end else None
	data_lease['origin'] = 'local' if data_lease['pool'] != '' else 'remote'

	if family == 'inet':
	data_lease['mac'] = lease.ethernet
	data_lease['start'] = lease.start.timestamp()
	data_lease['hostname'] = lease.hostname

	if family == 'inet6':
	data_lease['last_communication'] = lease.last_communication.timestamp()
	data_lease['duid'] = _format_hex_string(lease.duid)
	lease_types_long = {'na': 'non-temporary', 'ta': 'temporary', 'pd': 'prefix delegation'}
	data_lease['type'] = lease_types_long[lease.type]

	data_lease['remaining'] = '-'

	if lease.end:
	data_lease['remaining'] = lease.end - datetime.utcnow()

	if data_lease['remaining'].days >= 0:
	# substraction gives us a timedelta object which can't be formatted with strftime
	# so we use str(), split gets rid of the microseconds
	data_lease['remaining'] = str(data_lease["remaining"]).split('.')[0]

	# Do not add old leases
	if data_lease['remaining'] != '' and data_lease['state'] != 'free':
	if not state or data_lease['state'] in state or state == 'all':
	if not origin or data_lease['origin'] in origin:
	if not aux or (aux and data_lease['pool'] == pool_name):
	data.append(data_lease)

	# deduplicate
	checked = []
	for entry in data:
	addr = entry.get('ip')
	if addr not in checked:
	checked.append(addr)
	else:
	idx = _find_list_of_dict_index(data, key='ip', value=addr)
	data.pop(idx)

	if sorted:
	if sorted == 'ip':
	data.sort(key = lambda x:ip_address(x['ip']))
	else:
	data.sort(key = lambda x:x[sorted])
	return data


	def _get_formatted_server_leases(raw_data, family='inet'):
	data_entries = []
	if family == 'inet':
	for lease in raw_data:
	ipaddr = lease.get('ip')
	hw_addr = lease.get('mac')
	state = lease.get('state')
	start = lease.get('start')
	start = _utc_to_local(start).strftime('%Y/%m/%d %H:%M:%S')
	end = lease.get('end')
	end = _utc_to_local(end).strftime('%Y/%m/%d %H:%M:%S') if end else '-'
	remain = lease.get('remaining')
	pool = lease.get('pool')
	hostname = lease.get('hostname')
	origin = lease.get('origin')
	data_entries.append([ipaddr, hw_addr, state, start, end, remain, pool, hostname, origin])

	headers = ['IP Address', 'MAC address', 'State', 'Lease start', 'Lease expiration', 'Remaining', 'Pool',
	'Hostname', 'Origin']

	if family == 'inet6':
	for lease in raw_data:
	ipaddr = lease.get('ip')
	state = lease.get('state')
	start = lease.get('last_communication')
	start = _utc_to_local(start).strftime('%Y/%m/%d %H:%M:%S')
	end = lease.get('end')
	end = _utc_to_local(end).strftime('%Y/%m/%d %H:%M:%S')
	remain = lease.get('remaining')
	lease_type = lease.get('type')
	pool = lease.get('pool')
	host_identifier = lease.get('duid')
	data_entries.append([ipaddr, state, start, end, remain, lease_type, pool, host_identifier])

	headers = ['IPv6 address', 'State', 'Last communication', 'Lease expiration', 'Remaining', 'Type', 'Pool',
	'DUID']

	output = tabulate(data_entries, headers, numalign='left')
	return output


	def _get_dhcp_pools(family='inet') -> list:
	v = 'v6' if family == 'inet6' else ''
	pools = config.list_nodes(f'service dhcp{v}-server shared-network-name')
	return pools


	def _get_pool_size(pool, family='inet'):
	v = 'v6' if family == 'inet6' else ''
	base = f'service dhcp{v}-server shared-network-name {pool}'
	size = 0
	subnets = config.list_nodes(f'{base} subnet')
	for subnet in subnets:
	if family == 'inet6':
	ranges = config.list_nodes(f'{base} subnet {subnet} address-range start')
	else:
	ranges = config.list_nodes(f'{base} subnet {subnet} range')
	for range in ranges:
	if family == 'inet6':
	start = config.list_nodes(f'{base} subnet {subnet} address-range start')[0]
	stop = config.value(f'{base} subnet {subnet} address-range start {start} stop')
	else:
	start = config.value(f'{base} subnet {subnet} range {range} start')
	stop = config.value(f'{base} subnet {subnet} range {range} stop')
	# Add +1 because both range boundaries are inclusive
	size += int(ip_address(stop)) - int(ip_address(start)) + 1
	return size


	def _get_raw_pool_statistics(family='inet', pool=None):
	if pool is None:
	pool = _get_dhcp_pools(family=family)
	else:
	pool = [pool]

	v = 'v6' if family == 'inet6' else ''
	stats = []
	for p in pool:
	subnet = config.list_nodes(f'service dhcp{v}-server shared-network-name {p} subnet')
	size = _get_pool_size(family=family, pool=p)
	leases = len(_get_raw_server_leases(family=family, pool=p))
	use_percentage = round(leases / size * 100) if size != 0 else 0
	pool_stats = {'pool': p, 'size': size, 'leases': leases,
	'available': (size - leases), 'use_percentage': use_percentage, 'subnet': subnet}
	stats.append(pool_stats)
	return stats


	def _get_formatted_pool_statistics(pool_data, family='inet'):
	data_entries = []
	for entry in pool_data:
	pool = entry.get('pool')
	size = entry.get('size')
	leases = entry.get('leases')
	available = entry.get('available')
	use_percentage = entry.get('use_percentage')
	use_percentage = f'{use_percentage}%'
	data_entries.append([pool, size, leases, available, use_percentage])

	headers = ['Pool', 'Size','Leases', 'Available', 'Usage']
	output = tabulate(data_entries, headers, numalign='left')
	return output


	def _verify(func):
	"""Decorator checks if DHCP(v6) config exists"""
	from functools import wraps

	@wraps(func)
	def _wrapper(args, *kwargs):
	config = ConfigTreeQuery()
	family = kwargs.get('family')
	v = 'v6' if family == 'inet6' else ''
	unconf_message = f'DHCP{v} server is not configured'
	# Check if config does not exist
	if not config.exists(f'service dhcp{v}-server'):
	raise vyos.opmode.UnconfiguredSubsystem(unconf_message)
	return func(args, *kwargs)
	return _wrapper

	def _verify_client(func):
	"""Decorator checks if interface is configured as DHCP client"""
	from functools import wraps
	from vyos.ifconfig import Section

	@wraps(func)
	def _wrapper(args, *kwargs):
	config = ConfigTreeQuery()
	family = kwargs.get('family')
	v = 'v6' if family == 'inet6' else ''
	interface = kwargs.get('interface')
	interface_path = Section.get_config_path(interface)
	unconf_message = f'DHCP{v} client not configured on interface {interface}!'

	# Check if config does not exist
	if not config.exists(f'interfaces {interface_path} address dhcp{v}'):
	raise vyos.opmode.UnconfiguredSubsystem(unconf_message)
	return func(args, *kwargs)
	return _wrapper

	@_verify
	def show_pool_statistics(raw: bool, family: ArgFamily, pool: typing.Optional[str]):
	pool_data = _get_raw_pool_statistics(family=family, pool=pool)
	if raw:
	return pool_data
	else:
	return _get_formatted_pool_statistics(pool_data, family=family)


	@_verify
	def show_server_leases(raw: bool, family: ArgFamily, pool: typing.Optional[str],
	sorted: typing.Optional[str], state: typing.Optional[ArgState],
	origin: typing.Optional[ArgOrigin] ):
	# if dhcp server is down, inactive leases may still be shown as active, so warn the user.
	v = '6' if family == 'inet6' else ''
	service_name = 'DHCPv6' if family == 'inet6' else 'DHCP'
	if not is_systemd_service_running(f'isc-dhcp-server{v}.service'):
	Warning(f'{service_name} server is configured but not started. Data may be stale.')

	v = 'v6' if family == 'inet6' else ''
	if pool and pool not in _get_dhcp_pools(family=family):
	raise vyos.opmode.IncorrectValue(f'DHCP{v} pool "{pool}" does not exist!')

	if state and state not in lease_valid_states:
	raise vyos.opmode.IncorrectValue(f'DHCP{v} state "{state}" is invalid!')

	sort_valid = sort_valid_inet6 if family == 'inet6' else sort_valid_inet
	if sorted and sorted not in sort_valid:
	raise vyos.opmode.IncorrectValue(f'DHCP{v} sort "{sorted}" is invalid!')

	lease_data = _get_raw_server_leases(family=family, pool=pool, sorted=sorted, state=state, origin=origin)
	if raw:
	return lease_data
	else:
	return _get_formatted_server_leases(lease_data, family=family)


	def _get_raw_client_leases(family='inet', interface=None):
	from time import mktime
	from datetime import datetime
	from vyos.defaults import directories
	from vyos.utils.network import get_interface_vrf

	lease_dir = directories['isc_dhclient_dir']
	lease_files = []
	lease_data = []

	if interface:
	tmp = f'{lease_dir}/dhclient_{interface}.lease'
	if os.path.exists(tmp):
	lease_files.append(tmp)
	else:
	# All DHCP leases
	lease_files = glob(f'{lease_dir}/dhclient_*.lease')

	for lease in lease_files:
	tmp = {}
	with open(lease, 'r') as f:
	for line in f.readlines():
	line = line.rstrip()
	if 'last_update' not in tmp:
	# ISC dhcp client contains least_update timestamp in human readable
	# format this makes less sense for an API and also the expiry
	# timestamp is provided in UNIX time. Convert string (e.g. Sun Jul
	# 30 18:13:44 CEST 2023) to UNIX time (1690733624)
	tmp.update({'last_update' : int(mktime(datetime.strptime(line, time_string).timetuple()))})
	continue

	k, v = line.split('=')
	tmp.update({k : v.replace("'", "")})

	if 'interface' in tmp:
	vrf = get_interface_vrf(tmp['interface'])
	if vrf: tmp.update({'vrf' : vrf})

	lease_data.append(tmp)

	return lease_data

	def _get_formatted_client_leases(lease_data, family):
	from time import localtime
	from time import strftime

	from vyos.utils.network import is_intf_addr_assigned

	data_entries = []
	for lease in lease_data:
	if not lease.get('new_ip_address'):
	continue
	data_entries.append(["Interface", lease['interface']])
	if 'new_ip_address' in lease:
	tmp = '[Active]' if is_intf_addr_assigned(lease['interface'], lease['new_ip_address']) else '[Inactive]'
	data_entries.append(["IP address", lease['new_ip_address'], tmp])
	if 'new_subnet_mask' in lease:
	data_entries.append(["Subnet Mask", lease['new_subnet_mask']])
	if 'new_domain_name' in lease:
	data_entries.append(["Domain Name", lease['new_domain_name']])
	if 'new_routers' in lease:
	data_entries.append(["Router", lease['new_routers']])
	if 'new_domain_name_servers' in lease:
	data_entries.append(["Name Server", lease['new_domain_name_servers']])
	if 'new_dhcp_server_identifier' in lease:
	data_entries.append(["DHCP Server", lease['new_dhcp_server_identifier']])
	if 'new_dhcp_lease_time' in lease:
	data_entries.append(["DHCP Server", lease['new_dhcp_lease_time']])
	if 'vrf' in lease:
	data_entries.append(["VRF", lease['vrf']])
	if 'last_update' in lease:
	tmp = strftime(time_string, localtime(int(lease['last_update'])))
	data_entries.append(["Last Update", tmp])
	if 'new_expiry' in lease:
	tmp = strftime(time_string, localtime(int(lease['new_expiry'])))
	data_entries.append(["Expiry", tmp])

	# Add empty marker
	data_entries.append([''])

	output = tabulate(data_entries, tablefmt='plain')

	return output

	def show_client_leases(raw: bool, family: ArgFamily, interface: typing.Optional[str]):
	lease_data = _get_raw_client_leases(family=family, interface=interface)
	if raw:
	return lease_data
	else:
	return _get_formatted_client_leases(lease_data, family=family)

	@_verify_client
	def renew_client_lease(raw: bool, family: ArgFamily, interface: str):
	if not raw:
	v = 'v6' if family == 'inet6' else ''
	print(f'Restarting DHCP{v} client on interface {interface}...')
	if family == 'inet6':
	call(f'systemctl restart dhcp6c@{interface}.service')
	else:
	call(f'systemctl restart dhclient@{interface}.service')

	+@_verify_client
	+def release_client_lease(raw: bool, family: ArgFamily, interface: str):
	+ if not raw:
	+ v = 'v6' if family == 'inet6' else ''
	+ print(f'Release DHCP{v} client on interface {interface}...')
	+ if family == 'inet6':
	+ call(f'systemctl stop dhcp6c@{interface}.service')
	+ else:
	+ call(f'systemctl stop dhclient@{interface}.service')
	+
	if __name__ == '__main__':
	try:
	res = vyos.opmode.run(sys.modules[__name__])
	if res:
	print(res)
	except (ValueError, vyos.opmode.Error) as e:
	print(e)
	sys.exit(1)

File Metadata

Mime Type: text/x-diff
Expires: Fri, Nov 6, 9:39 AM (10 h, 24 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 4653993
Default Alt Text: (29 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions