mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Merge branch 'master-next' into python3

Browse Source 
* master-next:
  Add XFRM to IFLA_INFO_KIND and reverse change to iproute2 class.
  This patch fixes the XFRM addon for ifupdown2 version 2. The nlpacket for XFRM had a bug, I also changed iproute2 to add the XFRM interface to the local cache after creation. Since XFRM has no IFLA_LINKINFO I made the argument optional. Otherwise no further operation will be done like adding an IP.
This commit is contained in:
Julien Fortin
2020-02-03 17:18:57 +01:00
parent f60f58374d 68ec847b07
commit 07325f6b5e
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ifupdown2/lib/iproute2.py
View File

@@ -333,9 +333,9 @@ class IPRoute2(Cache, Requirements):
###
@staticmethod
def link_add_xfrm(ifname, xfrm_name, xfrm_id):
def link_add_xfrm(self, ifname, xfrm_name, xfrm_id):
utils.exec_commandl(['ip', 'link', 'add', xfrm_name, 'type', 'xfrm', 'dev', ifname, 'if_id', xfrm_id])
self.__update_cache_after_link_creation(xfrm_name, "xfrm")
############################################################################
# TUNNEL