From ed8f75225a4a4d797affd02d355528dec8eb458b Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 25 Jan 2021 19:04:32 +0100 Subject: rpki: T3252: bugfix AttributeError Traceback (most recent call last): File "/opt/vyatta/sbin/vyos-update-rpki-cache.py", line 79, in create_cache(config, cache) File "/opt/vyatta/sbin/vyos-update-rpki-cache.py", line 21, in create_cache new_privkey = c.return__value(base_path + "cache {0} ssh private-key-file".format(cache)) AttributeError: 'Config' object has no attribute 'return__value' (cherry picked from commit 7c7ae83434bcfae6cef07eab162ecfe20abd8c8f) --- scripts/vyos-update-rpki-cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/vyos-update-rpki-cache.py b/scripts/vyos-update-rpki-cache.py index df6f01bc..f290d119 100644 --- a/scripts/vyos-update-rpki-cache.py +++ b/scripts/vyos-update-rpki-cache.py @@ -18,7 +18,7 @@ def create_cache(c, cache): ssh = True new_user = c.return_value(base_path + "cache {0} ssh username".format(cache)) new_pubkey = c.return_value(base_path + "cache {0} ssh public-key-file".format(cache)) - new_privkey = c.return__value(base_path + "cache {0} ssh private-key-file".format(cache)) + new_privkey = c.return_value(base_path + "cache {0} ssh private-key-file".format(cache)) new_known_hosts = c.return_value(base_path + "cache {0} ssh known-hosts-file".format(cache)) if (not new_user) or (not new_pubkey) or (not new_privkey) or (not new_known_hosts): -- cgit v1.2.3 From f0ae68502eabfb0004dfd7272925fae8738d828a Mon Sep 17 00:00:00 2001 From: sever-sever Date: Sun, 24 Jan 2021 15:31:02 +0000 Subject: bgp: T3126: Fix config for neighbor unsuppress-map (cherry picked from commit 85ed73e12637f82505c9dea7008c7f4fdd9763b7) --- scripts/bgp/vyatta-bgp.pl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 50a144ab..88734d19 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -495,6 +495,10 @@ my %qcom = ( set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 soft-reconfiguration inbound', del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 soft-reconfiguration inbound', }, + 'protocols bgp var neighbor var address-family ipv4-unicast unsuppress-map' => { + set => 'router bgp #3 ; address-family ipv4 unicast ; neighbor #5 unsuppress-map #9', + del => 'router bgp #3 ; address-family ipv4 unicast ; no neighbor #5 unsuppress-map #9', + }, 'protocols bgp var neighbor var remote-as' => { set => 'router bgp #3 ; neighbor #5 remote-as #7 ; neighbor #5 activate', del => 'router bgp #3 ; no neighbor #5 remote-as #7', -- cgit v1.2.3