diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configdict.py | 37 | ||||
| -rw-r--r-- | python/vyos/frrender.py | 45 | ||||
| -rwxr-xr-x | python/vyos/template.py | 16 | ||||
| -rw-r--r-- | python/vyos/vpp/control_vpp.py | 9 | ||||
| -rw-r--r-- | python/vyos/vpp/nat/nat44.py | 4 |
5 files changed, 55 insertions, 56 deletions
diff --git a/python/vyos/configdict.py b/python/vyos/configdict.py index d91d88d88..ea244247c 100644 --- a/python/vyos/configdict.py +++ b/python/vyos/configdict.py @@ -355,47 +355,48 @@ def is_source_interface(conf, interface, intftype=None): def get_dhcp_interfaces(conf, vrf=None): """ Common helper functions to retrieve all interfaces from current CLI - sessions that have DHCP configured. """ + sessions that have DHCP configured. Only DHCP interfaces in the defined VRF + will be returned. If vrf is None - the default VRF interfaces will be + returned """ + dhcp_interfaces = {} - dict = conf.get_config_dict(['interfaces'], get_first_key=True) - if not dict: + interface_dict = conf.get_config_dict(['interfaces'], get_first_key=True) + if not interface_dict: return dhcp_interfaces - def check_dhcp(config): - ifname = config['ifname'] + def check_dhcp(if_config: dict, vrf=None) -> dict: + ifname = if_config['ifname'] tmp = {} - if 'address' in config and 'dhcp' in config['address']: + if 'address' in if_config and 'dhcp' in if_config['address']: options = {} - if dict_search('dhcp_options.default_route_distance', config) != None: - options.update({'dhcp_options' : config['dhcp_options']}) - if 'vrf' in config: - if vrf == config['vrf']: tmp.update({ifname : options}) + if dict_search('dhcp_options.default_route_distance', if_config) != None: + options.update({'dhcp_options' : if_config['dhcp_options']}) + if 'vrf' in if_config: + if vrf == if_config['vrf']: tmp.update({ifname : options}) else: if vrf is None: tmp.update({ifname : options}) return tmp - for section, interface in dict.items(): + for section, interface in interface_dict.items(): for ifname in interface: - # always reset config level, as get_interface_dict() will alter it - conf.set_level([]) # we already have a dict representation of the config from get_config_dict(), # but with the extended information from get_interface_dict() we also # get the DHCP client default-route-distance default option if not specified. _, ifconfig = get_interface_dict(conf, ['interfaces', section], ifname) - tmp = check_dhcp(ifconfig) + tmp = check_dhcp(ifconfig, vrf=vrf) dhcp_interfaces.update(tmp) # check per VLAN interfaces for vif, vif_config in ifconfig.get('vif', {}).items(): - tmp = check_dhcp(vif_config) + tmp = check_dhcp(vif_config, vrf=vrf) dhcp_interfaces.update(tmp) # check QinQ VLAN interfaces for vif_s, vif_s_config in ifconfig.get('vif_s', {}).items(): - tmp = check_dhcp(vif_s_config) + tmp = check_dhcp(vif_s_config, vrf=vrf) dhcp_interfaces.update(tmp) for vif_c, vif_c_config in vif_s_config.get('vif_c', {}).items(): - tmp = check_dhcp(vif_c_config) + tmp = check_dhcp(vif_c_config, vrf=vrf) dhcp_interfaces.update(tmp) return dhcp_interfaces @@ -404,7 +405,7 @@ def get_pppoe_interfaces(conf, vrf=None): """ Common helper functions to retrieve all interfaces from current CLI sessions that have DHCP configured. """ pppoe_interfaces = {} - conf.set_level([]) + conf.set_level([]) # required for list_nodes() for ifname in conf.list_nodes(['interfaces', 'pppoe']): # always reset config level, as get_interface_dict() will alter it conf.set_level([]) diff --git a/python/vyos/frrender.py b/python/vyos/frrender.py index 75824fcf9..decec8aa2 100644 --- a/python/vyos/frrender.py +++ b/python/vyos/frrender.py @@ -14,15 +14,25 @@ # along with this library. If not, see <http://www.gnu.org/licenses/>. """ -Library used to interface with FRRs mgmtd introduced in version 10.0 +Helper class attached to vyos-configd to interfact between our CLI configuration +and FRR. Class will render one full FRR configuration and apply this via +frr-reload.py, if the configuration has no errors. + +Will fail early if the rendered configuration has any errors. """ import os +from copy import deepcopy from time import sleep +from vyos.config import Config +from vyos.config import config_dict_merge +from vyos.configdict import get_dhcp_interfaces +from vyos.configdict import get_pppoe_interfaces from vyos.defaults import frr_debug_enable from vyos.utils.dict import dict_search +from vyos.utils.dict import dict_set_nested from vyos.utils.file import write_file from vyos.utils.process import cmd from vyos.utils.process import rc_cmd @@ -58,12 +68,7 @@ ripng_daemon = 'ripngd' zebra_daemon = 'zebra' nhrp_daemon = 'nhrpd' -def get_frrender_dict(conf, argv=None) -> dict: - from copy import deepcopy - from vyos.config import config_dict_merge - from vyos.configdict import get_dhcp_interfaces - from vyos.configdict import get_pppoe_interfaces - +def get_frrender_dict(conf: Config, argv=None) -> dict: # We need to re-set the CLI path to the root level, as this function uses # conf.exists() with an absolute path form the CLI root conf.set_level([]) @@ -435,17 +440,10 @@ def get_frrender_dict(conf, argv=None) -> dict: # T3680 - get a list of all interfaces currently configured to use DHCP tmp = get_dhcp_interfaces(conf) - if tmp: - if 'static' in dict: - dict['static'].update({'dhcp' : tmp}) - else: - dict.update({'static' : {'dhcp' : tmp}}) + if tmp: dict_set_nested('static.dhcp', tmp, dict) + tmp = get_pppoe_interfaces(conf) - if tmp: - if 'static' in dict: - dict['static'].update({'pppoe' : tmp}) - else: - dict.update({'static' : {'pppoe' : tmp}}) + if tmp: dict_set_nested('static.pppoe', tmp, dict) # keep a re-usable list of dependent VRFs dependent_vrfs_default = {} @@ -573,16 +571,17 @@ def get_frrender_dict(conf, argv=None) -> dict: static = conf.get_config_dict(static_vrf_path, key_mangling=('-', '_'), get_first_key=True, no_tag_node_value_mangle=True) - # T3680 - get a list of all interfaces currently configured to use DHCP - tmp = get_dhcp_interfaces(conf, vrf_name) - if tmp: static.update({'dhcp' : tmp}) - tmp = get_pppoe_interfaces(conf, vrf_name) - if tmp: static.update({'pppoe' : tmp}) - vrf['name'][vrf_name]['protocols'].update({'static': static}) elif conf.exists_effective(static_vrf_path): vrf['name'][vrf_name]['protocols'].update({'static': {'deleted' : ''}}) + # T3680 - get a list of all interfaces currently configured to use DHCP + tmp = get_dhcp_interfaces(conf, vrf_name) + if tmp: dict_set_nested(f'name.{vrf_name}.protocols.static.dhcp', tmp, vrf) + + tmp = get_pppoe_interfaces(conf, vrf_name) + if tmp: dict_set_nested(f'name.{vrf_name}.protocols.static.pppoe', tmp, vrf) + vrf_vni_path = ['vrf', 'name', vrf_name, 'vni'] if conf.exists(vrf_vni_path): vrf_config.update({'vni': conf.return_value(vrf_vni_path)}) diff --git a/python/vyos/template.py b/python/vyos/template.py index 824d42136..f384f752d 100755 --- a/python/vyos/template.py +++ b/python/vyos/template.py @@ -422,21 +422,25 @@ def is_file(filename): @register_filter('get_dhcp_router') def get_dhcp_router(interface): - """ Static routes can point to a router received by a DHCP reply. This + """Static routes can point to a router received by a DHCP reply. This helper is used to get the current default router from the DHCP reply. - Returns False of no router is found, returns the IP address as string if + Returns None if no router is found, returns the IP address as string if a router is found. """ - lease_file = directories['isc_dhclient_dir'] + f'/dhclient_{interface}.leases' + lease_file = directories['isc_dhclient_dir'] + f'/dhclient_{interface}.lease' if not os.path.exists(lease_file): return None from vyos.utils.file import read_file for line in read_file(lease_file).splitlines(): - if 'option routers' in line: - (_, _, address) = line.split() - return address.rstrip(';') + if 'new_routers' in line: + (_, address, _) = line.split("'") + if not address: + return None + # Take first one if there are several + address = address.split()[0] + return address @register_filter('natural_sort') def natural_sort(iterable): diff --git a/python/vyos/vpp/control_vpp.py b/python/vyos/vpp/control_vpp.py index 41b4573a5..cb8da50a6 100644 --- a/python/vyos/vpp/control_vpp.py +++ b/python/vyos/vpp/control_vpp.py @@ -440,15 +440,6 @@ class VPPControl: return None @_Decorators.api_call - def enable_disable_nat44_forwarding(self, enable: bool) -> None: - """Enable/disable NAT44 forwarding - - Args: - enable (bool): True if enable, False if disable - """ - self.__vpp_api_client.api.nat44_forwarding_enable_disable(enable=enable) - - @_Decorators.api_call def set_nat44_session_limit(self, session_limit: int) -> None: """Set NAT44 session limit diff --git a/python/vyos/vpp/nat/nat44.py b/python/vyos/vpp/nat/nat44.py index b7e2d7744..d90193088 100644 --- a/python/vyos/vpp/nat/nat44.py +++ b/python/vyos/vpp/nat/nat44.py @@ -224,6 +224,10 @@ class Nat44: tcp_transitory=tcp_transitory, ) + def enable_disable_nat44_forwarding(self, enable): + """Enable/disable NAT44 forwarding""" + self.vpp.api.nat44_forwarding_enable_disable(enable=enable) + def enable_ipfix(self): """Enable NAT44 IPFIX logging""" self.vpp.api.nat44_ei_ipfix_enable_disable(enable=True) |