Merge branch 'current' into T5014-dnat
657a566df584
Actions

Description

Merge branch 'current' into T5014-dnat

Details

Provenance

Nicolás Fort	Authored on Jul 31 2023, 6:22 PM
GitHub	Committed on Jul 31 2023, 6:22 PM

Parents

rVYOSONEX7ae9d8953ddc: T5014: fix conflicts. Add code for redirection, which is causing conflicts.
rVYOSONEXdf33f450b4e8: Merge pull request #2123 from nicolas-fort/T5406

Branches

Tags

Event Timeline

GitHub <noreply@github.com> committed rVYOSONEX657a566df584: Merge branch 'current' into T5014-dnat (authored by Nicolás Fort <95703796+nicolas-fort@users.noreply.github.com>).Jul 31 2023, 6:22 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

df33f450b4e8 Merge pull request #2123 from nicolas-fort/T5406
Author
c-po
Browse Repository
No Builds
No Audits
befd4045b59f T5406: webproxy op-mode command: add vrf support for blacklist update command
Author
n.fort
Browse Repository
No Builds
No Audits
1ee3801de4fb smoketest: interfaces: T5387: test dhcpv6-pd no-release flag
Author
1vivy
Browse Repository
No Builds
No Audits
1d86092328ef dhcpv6-pd: T5387: add support for no-release flag
Author
1vivy
Browse Repository
No Builds
No Audits
230c3f5b9fed login: T4790: sync number of max RADIUS servers with equuleus branch (8)
Author
c-po
Browse Repository
No Builds
No Audits
6335bbfc79af Merge pull request #2121 from nicolas-fort/T5416
Author
c-po
Browse Repository
No Builds
No Audits
96a89fee625b T5416: fix ipsec matcher
Author
n.fort
Browse Repository
No Builds
No Audits
1a44d8607f71 T3355: always work with UNIX timestamps for dhcp client lease display
Author
c-po
Browse Repository
No Builds
No Audits
78bb41eacb79 T3355: migrate webproxy log to proper "monitor log" tree
Author
c-po
Browse Repository
No Builds
No Audits
a92e7761b2f9 Merge pull request #2120 from c-po/t3355-show-dhcp-client
Author
c-po
Browse Repository
No Builds
No Audits
019f90fb65cb T5411: remove old background monitor implementation for webproxy
Author
c-po
Browse Repository
No Builds
No Audits
7568912d4831 T5411: remove old background monitor implementation
Author
c-po
Browse Repository
No Builds
No Audits
7826a0e35e25 T3355: migrate "show dhcp client lease" to new op-mode style
Author
c-po
Browse Repository
No Builds
No Audits
3fb9cda51a40 xml: T5403: remove incorrect arg check
Author
jestabro
Browse Repository
No Builds
No Audits
e3f0a514d8da xml: T5403: set explicit package name
Author
jestabro
Browse Repository
No Builds
No Audits
d59c9c35c037 xml: T5403: fix installation of xml cache
Author
jestabro
Browse Repository
No Builds
No Audits
399edb32eb68 vpp: T1797: change dependency to amd64 builds only
Author
c-po
Browse Repository
No Builds
No Audits
ad27d4d9cd23 Merge pull request #2116 from jestabro/user-def
Author
jestabro
Browse Repository
No Builds
No Audits
e310cb6e194b configtree: T5316: use single-pass to drop trim function
Author
jestabro
Browse Repository
No Builds
No Audits
2015717bdc87 T5411: add additional monitor log targets
Author
c-po
Browse Repository
No Builds
No Audits
b76f103317b5 Merge pull request #2105 from sever-sever/T5368
Author
dmbaturin
Browse Repository
No Builds
No Audits
ef6cc1f32566 Merge pull request #2114 from srividya0208/T5252
Author
c-po
Browse Repository
No Builds
No Audits
223a6c5cd63f xml: T5403: add support for supplemental xml cache
Author
jestabro
Browse Repository
No Builds
No Audits
f0a630cce26a T5127: vpnv4/vpnv6 : warning for router-id
Author
SrividyaA
Browse Repository
No Builds
No Audits
3de59f1365e5 wwan: T3795: remove superfluous call to set_level()
Author
c-po
Browse Repository
No Builds
No Audits
32b9ac3653fa openvpn: T4974: move CLI node "enable-dco" -> "offload dco" to match other…
Author
c-po
Browse Repository
No Builds
No Audits
341a84240e6d openvpn: T4974: restructure get_config()
Author
c-po
Browse Repository
No Builds
No Audits
fa07179ae7f1 openvpn: T4974: dynamically load/unload kernel module
Author
c-po
Browse Repository
No Builds
No Audits
9e0a9b7df3d7 openvpn: T4974: do not automatically load the DCO module
Author
c-po
Browse Repository
No Builds
No Audits
fc35434bfb0d Merge pull request #2078 from nicolas-fort/T5154
Author
Viacheslav
Browse Repository
No Builds
No Audits
6a1a687f8b8f Merge pull request #2112 from Apachez-/T5399
Author
c-po
Browse Repository
No Builds
No Audits
b3eaa3c11a37 T5399: VRF-support for show ntp
Author
Apachez
Browse Repository
No Builds
No Audits
688755a988e2 Merge pull request #2110 from jvoss/frr_static_interface_mangle
Author
c-po
Browse Repository
No Builds
No Audits
20ac831df73a static: T5398: do not mangle interface names in FRR
Author
jvoss
Browse Repository
No Builds
No Audits
c473f6475f90 container: T5365: ensure container mogration systemd steps are run with sudo
Author
c-po
Browse Repository
No Builds
No Audits
8966841cdfe7 Merge pull request #2109 from zdc/T4412-sagitta
Author
c-po
Browse Repository
No Builds
No Audits
494729145397 remote: T4412: Improved error handling for uploads/downloads
Author
zsdc
Browse Repository
No Builds
No Audits
5f2e9cb81d89 T5154: NTP: allow maximum of one ipv4 and one ipv6 address on parameter <listen…
Author
n.fort
Browse Repository
No Builds
No Audits
20b7155f4140 Merge pull request #1511 from jack9603301/T4659
Author
c-po
Browse Repository
No Builds
No Audits
e4f3bcc7083c smoketest: T4947: check for OpenVPN DCO Kernel module
Author
c-po
Browse Repository
No Builds
No Audits
c67db6bc118b Revert "Debian: T4974: add openvpn-dco dependency"
Author
c-po
Browse Repository
No Builds
No Audits
0ca6a8c2fdcd Merge pull request #2100 from nicolas-fort/T4889
Author
c-po
Browse Repository
No Builds
No Audits
c59765163885 Merge pull request #2107 from fett0/T4974
Author
c-po
Browse Repository
No Builds
No Audits
7321fa364a8c Merge pull request #2104 from c-po/t5377-ospf-gr
Author
c-po
Browse Repository
No Builds
No Audits
b805b9950b63 T4974:add/fixed enable ovpn-dco by default
Author
fett0
Browse Repository
No Builds
No Audits
e9153730c76f login: T5363: keep home when user is deleted
Author
c-po
Browse Repository
No Builds
No Audits
9e5d0384a0b2 ospf: T5377: add "capability opaque" support
Author
c-po
Browse Repository
No Builds
No Audits
52830ddfad97 ospf: T5377: add op-mode commands to display GR status
Author
c-po
Browse Repository
No Builds
No Audits
bd4bb4f869d6 T5368: service ids ddos-protection add support sflow mode
Author
Viacheslav
Browse Repository
No Builds
No Audits
a684ab26c5eb T4659: op-mode: Display bridge interface detail
Author
jack9603301
Browse Repository
No Builds
No Audits

Changes (70)

Path

Size

.gitignore

Makefile

data/

templates/

chrony/

chrony.conf.j2

dhcp-client/

dhcp6c_daemon-options.j2

frr/

ospf6d.frr.j2

ospfd.frr.j2

ids/

fastnetmon.j2

fastnetmon_networks_list.j2

openvpn/

debian/

interface-definitions/

include/

interface/

dhcpv6-options.xml.i

ospf/

graceful-restart.xml.i

protocol-common-config.xml.i

ospfv3/

protocol-common-config.xml.i

version/

ntp-version.xml.i

interfaces-openvpn.xml.in

nat.xml.in

ntp.xml.in

service-ids-ddos-protection.xml.in

op-mode-definitions/

dhcp.xml.in

include/

monitor-background.xml.i

ospf

graceful-restart.xml.i

ospf-common.xml.i

	ospf/

	common.xml.i
	ospf-common.xml.i

monitor-bridge.xml.in

monitor-log.xml.in

monitor-ndp.xml.in

monitor-protocol.xml.in

show-bridge.xml.in

show-ip-ospf.xml.in

show-ipv6-ospfv3.xml.in

show-log.xml.in

webproxy.xml.in

python/

vyos/

ifconfig/

utils/

xml_ref/

smoketest/

scripts/

cli/

base_interfaces_test.py

test_nat.py

test_protocols_ospf.py

test_protocols_ospfv3.py

test_service_ntp.py

system/

test_module_load.py

src/

conf_mode/

interfaces-openvpn.py

service_ids_fastnetmon.py

system-login.py

etc/

modprobe.d/

openvpn.conf

migration-scripts/

container/

ntp/

op_mode/

webproxy_update_blacklist.sh

systemd/

dhcp6c@.service

rVYOSONEX657a566df584

View Options

.gitignore

View Options

Makefile

View Options

data/templates/chrony/chrony.conf.j2

View Options

data/templates/dhcp-client/dhcp6c_daemon-options.j2

View Options

data/templates/frr/ospf6d.frr.j2

View Options

data/templates/frr/ospfd.frr.j2

View Options

data/templates/ids/fastnetmon.j2

View Options

data/templates/ids/fastnetmon_networks_list.j2

View Options

data/templates/openvpn/server.conf.j2

View Options

debian/control

View Options

debian/rules

View Options

debian/vyos-1x.postinst

View Options

interface-definitions/include/interface/dhcpv6-options.xml.i

View Options

interface-definitions/include/ospf/graceful-restart.xml.i

View Options

interface-definitions/include/ospf/protocol-common-config.xml.i

View Options

interface-definitions/include/ospfv3/protocol-common-config.xml.i

View Options

interface-definitions/include/version/ntp-version.xml.i

View Options

interface-definitions/interfaces-openvpn.xml.in

View Options

interface-definitions/nat.xml.in

View Options

interface-definitions/ntp.xml.in

View Options

interface-definitions/service-ids-ddos-protection.xml.in

View Options

op-mode-definitions/dhcp.xml.in

View Options

op-mode-definitions/include/monitor-background.xml.i

View Options

op-mode-definitions/include/ospf-common.xml.i

View Options

op-mode-definitions/include/ospf/common.xml.i

View Options

op-mode-definitions/include/ospf/graceful-restart.xml.i

View Options

op-mode-definitions/monitor-bridge.xml.in

View Options

op-mode-definitions/monitor-log.xml.in

View Options

op-mode-definitions/monitor-ndp.xml.in

View Options

op-mode-definitions/monitor-protocol.xml.in

View Options

op-mode-definitions/show-bridge.xml.in

View Options

op-mode-definitions/show-ip-ospf.xml.in

View Options

op-mode-definitions/show-ipv6-ospfv3.xml.in

View Options

op-mode-definitions/show-log.xml.in

View Options

op-mode-definitions/webproxy.xml.in

View Options

python/vyos/configtree.py

View Options

python/vyos/firewall.py

View Options

python/vyos/ifconfig/interface.py

View Options

python/vyos/nat.py

View Options

python/vyos/remote.py

View Options

python/vyos/utils/kernel.py

View Options

python/vyos/xml_ref/generate_cache.py

View Options

python/vyos/xml_ref/pkg_cache/init.py

View Options

python/vyos/xml_ref/update_cache.py

View Options

smoketest/scripts/cli/base_interfaces_test.py

View Options

smoketest/scripts/cli/test_nat.py

View Options

smoketest/scripts/cli/test_protocols_ospf.py

View Options

smoketest/scripts/cli/test_protocols_ospfv3.py

View Options

smoketest/scripts/cli/test_service_ntp.py

View Options

smoketest/scripts/system/test_module_load.py

View Options

src/conf_mode/interfaces-openvpn.py

View Options

src/conf_mode/interfaces-wwan.py

View Options

src/conf_mode/nat.py

View Options

src/conf_mode/ntp.py

View Options

src/conf_mode/protocols_bgp.py

View Options

src/conf_mode/protocols_ospf.py

View Options

src/conf_mode/protocols_ospfv3.py

View Options

src/conf_mode/protocols_static.py

View Options

src/conf_mode/service_ids_fastnetmon.py

View Options

src/conf_mode/system-login.py

View Options

src/etc/modprobe.d/openvpn.conf

View Options

src/migration-scripts/container/0-to-1

View Options

src/migration-scripts/ntp/2-to-3

View Options

src/op_mode/bridge.py

View Options

src/op_mode/dhcp.py

View Options

src/op_mode/show_ntp.sh

View Options

src/op_mode/webproxy_update_blacklist.sh

View Options

src/systemd/dhcp6c@.service

Merge branch 'current' into T5014-dnat657a566df584Actions

Description

Details

Event Timeline

Merged Changes

Changes (70)

rVYOSONEX657a566df584

.gitignore

Makefile

data/templates/chrony/chrony.conf.j2

data/templates/dhcp-client/dhcp6c_daemon-options.j2

data/templates/frr/ospf6d.frr.j2

data/templates/frr/ospfd.frr.j2

data/templates/ids/fastnetmon.j2

data/templates/ids/fastnetmon_networks_list.j2

data/templates/openvpn/server.conf.j2

debian/control

debian/rules

debian/vyos-1x.postinst

interface-definitions/include/interface/dhcpv6-options.xml.i

interface-definitions/include/ospf/graceful-restart.xml.i

interface-definitions/include/ospf/protocol-common-config.xml.i

interface-definitions/include/ospfv3/protocol-common-config.xml.i

interface-definitions/include/version/ntp-version.xml.i

interface-definitions/interfaces-openvpn.xml.in

interface-definitions/nat.xml.in

interface-definitions/ntp.xml.in

interface-definitions/service-ids-ddos-protection.xml.in

op-mode-definitions/dhcp.xml.in

op-mode-definitions/include/monitor-background.xml.i

op-mode-definitions/include/ospf-common.xml.i

op-mode-definitions/include/ospf/common.xml.i

op-mode-definitions/include/ospf/graceful-restart.xml.i

op-mode-definitions/monitor-bridge.xml.in

op-mode-definitions/monitor-log.xml.in

op-mode-definitions/monitor-ndp.xml.in

op-mode-definitions/monitor-protocol.xml.in

op-mode-definitions/show-bridge.xml.in

op-mode-definitions/show-ip-ospf.xml.in

op-mode-definitions/show-ipv6-ospfv3.xml.in

op-mode-definitions/show-log.xml.in

op-mode-definitions/webproxy.xml.in

python/vyos/configtree.py

python/vyos/firewall.py

python/vyos/ifconfig/interface.py

python/vyos/nat.py

python/vyos/remote.py

python/vyos/utils/kernel.py

python/vyos/xml_ref/generate_cache.py

python/vyos/xml_ref/pkg_cache/__init__.py

python/vyos/xml_ref/update_cache.py

smoketest/scripts/cli/base_interfaces_test.py

smoketest/scripts/cli/test_nat.py

smoketest/scripts/cli/test_protocols_ospf.py

smoketest/scripts/cli/test_protocols_ospfv3.py

smoketest/scripts/cli/test_service_ntp.py

smoketest/scripts/system/test_module_load.py

src/conf_mode/interfaces-openvpn.py

src/conf_mode/interfaces-wwan.py

src/conf_mode/nat.py

src/conf_mode/ntp.py

src/conf_mode/protocols_bgp.py

src/conf_mode/protocols_ospf.py

src/conf_mode/protocols_ospfv3.py

src/conf_mode/protocols_static.py

src/conf_mode/service_ids_fastnetmon.py

src/conf_mode/system-login.py

src/etc/modprobe.d/openvpn.conf

src/migration-scripts/container/0-to-1

src/migration-scripts/ntp/2-to-3

src/op_mode/bridge.py

src/op_mode/dhcp.py

src/op_mode/show_ntp.sh

src/op_mode/webproxy_update_blacklist.sh

src/systemd/dhcp6c@.service

Merge branch 'current' into T5014-dnat
657a566df584
Actions

python/vyos/xml_ref/pkg_cache/init.py