sd-rtnl: fix broken test cases and add support for tunnel

[elogind.git] / src / test / test-rtnl-manual.c

diff --git a/src/test/test-rtnl-manual.c b/src/test/test-rtnl-manual.c
index e76fb81a6672e8b35a679a9494ae3fa03f80ff55..c8133dbad7d69a35f140b6e3b3bc7ba98150041a 100644 (file)
--- a/src/test/test-rtnl-manual.c
+++ b/src/test/test-rtnl-manual.c
@@ -84,13 +84,12 @@ static int test_tunnel_configure(sd_rtnl *rtnl) {
         assert_se(sd_rtnl_message_new_link(rtnl, &m, RTM_NEWLINK, 0) >= 0);
         assert_se(m);
 
-        assert_se(sd_rtnl_message_append_string(m, IFLA_IFNAME, "eth0") >= 0);
+        assert_se(sd_rtnl_message_append_string(m, IFLA_IFNAME, "ipip-tunnel") >= 0);
         assert_se(sd_rtnl_message_append_u32(m, IFLA_MTU, 1234)>= 0);
 
         assert_se(sd_rtnl_message_open_container(m, IFLA_LINKINFO) >= 0);
-        assert_se(sd_rtnl_message_append_string(m, IFLA_INFO_KIND, "ipip") >= 0);
 
-        assert_se(sd_rtnl_message_open_container(m, IFLA_INFO_DATA) >= 0);
+        assert_se(sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, "ipip") >= 0);
 
         inet_pton(AF_INET, "192.168.21.1", &local.s_addr);
         assert_se(sd_rtnl_message_append_u32(m, IFLA_IPTUN_LOCAL, local.s_addr) >= 0);
@@ -113,13 +112,12 @@ static int test_tunnel_configure(sd_rtnl *rtnl) {
         assert_se(sd_rtnl_message_new_link(rtnl, &n, RTM_NEWLINK, 0) >= 0);
         assert_se(n);
 
-        assert_se(sd_rtnl_message_append_string(n, IFLA_IFNAME, "eth1") >= 0);
+        assert_se(sd_rtnl_message_append_string(n, IFLA_IFNAME, "sit-tunnel") >= 0);
         assert_se(sd_rtnl_message_append_u32(n, IFLA_MTU, 1234)>= 0);
 
         assert_se(sd_rtnl_message_open_container(n, IFLA_LINKINFO) >= 0);
-        assert_se(sd_rtnl_message_append_string(n, IFLA_INFO_KIND, "sit") >= 0);
 
-        assert_se(sd_rtnl_message_open_container(n, IFLA_INFO_DATA) >= 0);
+        assert_se(sd_rtnl_message_open_container_union(n, IFLA_INFO_DATA, "sit") >= 0);
 
         assert_se(sd_rtnl_message_append_u8(n, IFLA_IPTUN_PROTO, IPPROTO_IPIP) >= 0);