diff options
| author | Daniil Baturin <daniil@vyos.io> | 2026-03-12 16:33:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-12 16:33:54 +0000 |
| commit | c9cb691a2881a6bbd958d6ab35f9f24b08386e74 (patch) | |
| tree | bcb5611e465cebc1f420de67d4898466e711a18d /python | |
| parent | dbe48341d7eb804bdbe4955e7e0728bfea560b88 (diff) | |
| parent | 0ce7065ff6ccaeaaa6ff8b7f69fdadf4f918892c (diff) | |
| download | vyos-1x-c9cb691a2881a6bbd958d6ab35f9f24b08386e74.tar.gz vyos-1x-c9cb691a2881a6bbd958d6ab35f9f24b08386e74.zip | |
Merge pull request #5045 from sever-sever/T8351
T8351: VPP add GRE tunnel key configuration
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/ifconfig/vpp/gre.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/python/vyos/ifconfig/vpp/gre.py b/python/vyos/ifconfig/vpp/gre.py index 7ab600998..0cec5e3c9 100644 --- a/python/vyos/ifconfig/vpp/gre.py +++ b/python/vyos/ifconfig/vpp/gre.py @@ -52,12 +52,13 @@ class VPPGREInterface(Interface, VPPInterface): self.dst_address = config.get('remote') self.tunnel_type = self.TUNNEL_TYPE_MAP.get(config.get('tunnel_type'), 0) self.mode = self.MODE_MAP['point-to-point'] + self.key = int(config.get('key', 0)) def _create(self): pass def get_gre(self): - tunnels = self.vpp.api.gre_tunnel_dump(sw_if_index=self.index) + tunnels = self.vpp.api.gre_tunnel_dump_v2(sw_if_index=self.index) return tunnels if tunnels else None def add_gre(self): @@ -68,7 +69,7 @@ class VPPGREInterface(Interface, VPPInterface): a = VPPGREInterface(ifname='vppgre0', config) a.add_gre() """ - self.vpp.api.gre_tunnel_add_del( + self.vpp.api.gre_tunnel_add_del_v2( is_add=True, tunnel={ 'src': self.src_address, @@ -76,6 +77,7 @@ class VPPGREInterface(Interface, VPPInterface): 'instance': self.instance, 'mode': self.mode, 'type': self.tunnel_type, + 'key': self.key, }, ) # Add LCP pair (kernel) interface @@ -94,9 +96,13 @@ class VPPGREInterface(Interface, VPPInterface): """ gre = self.get_gre() if gre: - return self.vpp.api.gre_tunnel_add_del( + return self.vpp.api.gre_tunnel_add_del_v2( is_add=False, - tunnel={'src': gre.tunnel.src, 'dst': gre.tunnel.dst}, + tunnel={ + 'src': gre.tunnel.src, + 'dst': gre.tunnel.dst, + 'key': gre.tunnel.key, + }, ) def kernel_add(self): |