fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/tests: fix nmtstp_link_{gre,ip6gre,ip6tnl,ipip}_add() to support missing parent

Browse source 
(cherry picked from commit 4966f9d784)
This commit is contained in:
Thomas Haller 2023-01-25 15:39:06 +01:00
parent 208218e141
commit 19a192dbdb
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/core/platform/tests/test-common.c
View file

@ -2061,11 +2061,11 @@ nmtstp_link_gre_add(NMPlatform *platform,
obj = lnk->is_tap ? "link" : "tunnel";
type = lnk->is_tap ? "type gretap" : "mode gre";
success = !nmtstp_run_command("ip %s add %s %s %s local %s remote %s ttl %u tos %02x %s",
success = !nmtstp_run_command("ip %s add %s %s%s%s local %s remote %s ttl %u tos %02x %s",
obj,
name,
type,
dev ?: "",
NM_PRINT_FMT_QUOTED2(dev, " ", dev, ""),
nm_inet4_ntop(lnk->local, b1),
nm_inet4_ntop(lnk->remote, b2),
lnk->ttl,
@ -2127,11 +2127,11 @@ nmtstp_link_ip6tnl_add(NMPlatform *platform,
tclass_inherit = NM_FLAGS_HAS(lnk->flags, IP6_TNL_F_USE_ORIG_TCLASS);
success = !nmtstp_run_command(
"ip -6 tunnel add %s mode %s %s local %s remote %s ttl %u tclass %s encaplimit %s "
"ip -6 tunnel add %s mode %s%s%s local %s remote %s ttl %u tclass %s encaplimit %s "
"flowlabel %x",
name,
mode,
dev,
NM_PRINT_FMT_QUOTED2(dev, " ", dev, ""),
nm_inet6_ntop(&lnk->local, b1),
nm_inet6_ntop(&lnk->remote, b2),
lnk->ttl,
@ -2178,10 +2178,10 @@ nmtstp_link_ip6gre_add(NMPlatform *platform,
tclass_inherit = NM_FLAGS_HAS(lnk->flags, IP6_TNL_F_USE_ORIG_TCLASS);
success = !nmtstp_run_command(
"ip link add %s type %s %s local %s remote %s ttl %u tclass %s flowlabel %x",
"ip link add %s type %s%s%s local %s remote %s ttl %u tclass %s flowlabel %x",
name,
lnk->is_tap ? "ip6gretap" : "ip6gre",
dev,
NM_PRINT_FMT_QUOTED2(dev, " ", dev, ""),
nm_inet6_ntop(&lnk->local, b1),
nm_inet6_ntop(&lnk->remote, b2),
lnk->ttl,
@ -2232,9 +2232,9 @@ nmtstp_link_ipip_add(NMPlatform *platform,
g_strdup_printf("dev %s", nm_platform_link_get_name(platform, lnk->parent_ifindex));
success = !nmtstp_run_command(
"ip tunnel add %s mode ipip %s local %s remote %s ttl %u tos %02x %s",
"ip tunnel add %s mode ipip%s%s local %s remote %s ttl %u tos %02x %s",
name,
dev,
NM_PRINT_FMT_QUOTED2(dev, " ", dev, ""),
nm_inet4_ntop(lnk->local, b1),
nm_inet4_ntop(lnk->remote, b2),
lnk->ttl,