Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

T5559: Add static neighbor-proxy feature #2240

Merged
merged 1 commit into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions interface-definitions/protocols_static_neighbor-proxy.xml.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="protocols">
<children>
<node name="static">
<children>
<node name="neighbor-proxy" owner="${vyos_conf_scripts_dir}/protocols_static_neighbor-proxy.py">
<properties>
<help>Neighbor proxy parameters</help>
</properties>
<children>
<tagNode name="arp">
<properties>
<help>IP address for selective ARP proxy</help>
<valueHelp>
<format>ipv4</format>
<description>IPv4 destination address allowed for proxy-arp</description>
</valueHelp>
<constraint>
<validator name="ipv4-address"/>
</constraint>
</properties>
<children>
#include <include/generic-interface-multi.xml.i>
</children>
</tagNode>
<tagNode name="nd">
<properties>
<help>IPv6 address for selective NDP proxy</help>
<valueHelp>
<format>ipv6</format>
<description>IPv6 destination address</description>
</valueHelp>
<constraint>
<validator name="ipv6-address"/>
</constraint>
</properties>
<children>
#include <include/generic-interface-multi.xml.i>
</children>
</tagNode>
</children>
</node>
</children>
</node>
</children>
</node>
</interfaceDefinition>
95 changes: 95 additions & 0 deletions src/conf_mode/protocols_static_neighbor-proxy.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
#!/usr/bin/env python3
#
# Copyright (C) 2023 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

from sys import exit

from vyos.config import Config
from vyos.configdict import node_changed
from vyos.utils.process import call
from vyos import ConfigError
from vyos import airbag

airbag.enable()


def get_config(config=None):
if config:
conf = config
else:
conf = Config()

base = ['protocols', 'static', 'neighbor-proxy']
config = conf.get_config_dict(base, get_first_key=True)

return config


def verify(config):

if 'arp' in config:
for neighbor, neighbor_conf in config['arp'].items():
if 'interface' not in neighbor_conf:
raise ConfigError(
f"ARP neighbor-proxy for '{neighbor}' requires an interface to be set!"
)

if 'nd' in config:
for neighbor, neighbor_conf in config['nd'].items():
if 'interface' not in neighbor_conf:
raise ConfigError(
f"ARP neighbor-proxy for '{neighbor}' requires an interface to be set!"
)


def generate(config):
pass


def apply(config):
if not config:
# Cleanup proxy
call('ip neighbor flush proxy')
call('ip -6 neighbor flush proxy')
return None

# Add proxy ARP
if 'arp' in config:
# Cleanup entries before config
call('ip neighbor flush proxy')
for neighbor, neighbor_conf in config['arp'].items():
for interface in neighbor_conf.get('interface'):
call(f'ip neighbor add proxy {neighbor} dev {interface}')

# Add proxy NDP
if 'nd' in config:
# Cleanup entries before config
call('ip -6 neighbor flush proxy')
for neighbor, neighbor_conf in config['nd'].items():
for interface in neighbor_conf['interface']:
call(f'ip -6 neighbor add proxy {neighbor} dev {interface}')


if __name__ == '__main__':
try:
c = get_config()
verify(c)
generate(c)
apply(c)
except ConfigError as e:
print(e)
exit(1)