From 964ae8cc391520440cf5aa13e2b9cc34850ea6c2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:01:41 +0100 Subject: New upstream version 1.14.6 --- src/devices/tests/test-lldp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/devices/tests/test-lldp.c') diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index c2ac8e19..7227d082 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -219,11 +219,10 @@ TEST_RECV_FRAME_DEFINE (_test_recv_data1_frame0, 0x01, 0xe8, 0xfe, 0x07, 0x00, 0x80, 0xc2, 0x02, /* IEEE 802.1 - Port and Protocol VLAN ID */ 0x01, 0x00, 0x00, - 0xfe, 0x17, 0x00, 0x80, 0xc2, 0x03, /* IEEE 802.1 - VLAN Name */ - 0x01, 0xe8, 0x10, 0x76, 0x32, 0x2d, + 0xfe, 0x16, 0x00, 0x80, 0xc2, 0x03, /* IEEE 802.1 - VLAN Name */ + 0x01, 0xe8, 0x0f, 0x76, 0x32, 0x2d, 0x30, 0x34, 0x38, 0x38, 0x2d, 0x30, 0x33, 0x2d, 0x30, 0x35, 0x30, 0x35, - 0x00, 0xfe, 0x05, 0x00, 0x80, 0xc2, 0x04, /* IEEE 802.1 - Protocol Identity */ 0x00, 0x00, 0x00 /* End of LLDPDU */ -- cgit 1.3.0-6-gf8a5 From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- src/devices/tests/test-lldp.c | 76 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) (limited to 'src/devices/tests/test-lldp.c') diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index 7227d082..7b135f58 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -231,8 +231,10 @@ TEST_RECV_FRAME_DEFINE (_test_recv_data1_frame0, static void _test_recv_data1_check (GMainLoop *loop, NMLldpListener *listener) { - GVariant *neighbors, *attr; + GVariant *neighbors, *attr, *child; gs_unref_variant GVariant *neighbor = NULL; + guint v_uint = 0; + const char *v_str = NULL; neighbors = nm_lldp_listener_get_neighbors (listener); nmtst_assert_variant_is_of_type (neighbors, G_VARIANT_TYPE ("aa{sv}")); @@ -242,7 +244,7 @@ _test_recv_data1_check (GMainLoop *loop, NMLldpListener *listener) SD_LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:30:F9:AD:A0", SD_LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/1"); g_assert (neighbor); - g_assert_cmpint (g_variant_n_children (neighbor), ==, 4 + 10); + g_assert_cmpint (g_variant_n_children (neighbor), ==, 4 + 16); attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_DESTINATION, G_VARIANT_TYPE_STRING); nmtst_assert_variant_string (attr, NM_LLDP_DEST_NEAREST_BRIDGE); @@ -270,11 +272,49 @@ _test_recv_data1_check (GMainLoop *loop, NMLldpListener *listener) nmtst_assert_variant_uint32 (attr, 20); nm_clear_g_variant (&attr); - /* unsupported: Management Address */ - /* unsupported: IEEE 802.3 - Power Via MDI */ - /* unsupported: IEEE 802.3 - MAC/PHY Configuration/Status */ + /* Management Address */ + attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_MANAGEMENT_ADDRESSES, G_VARIANT_TYPE ("aa{sv}")); + g_assert (attr); + g_assert_cmpuint (g_variant_n_children (attr), ==, 1); + child = g_variant_get_child_value (attr, 0); + g_assert (child); + g_variant_lookup (child, "interface-number", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 1001); + g_variant_lookup (child, "interface-number-subtype", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 2); + g_variant_lookup (child, "address-subtype", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 6); + nm_clear_g_variant (&child); + nm_clear_g_variant (&attr); + + /* IEEE 802.3 - Power Via MDI */ + attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_IEEE_802_3_POWER_VIA_MDI, G_VARIANT_TYPE_VARDICT); + g_assert (attr); + g_variant_lookup (attr, "mdi-power-support", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 7); + g_variant_lookup (attr, "pse-power-pair", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 1); + g_variant_lookup (attr, "power-class", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 0); + nm_clear_g_variant (&attr); + + /* IEEE 802.3 - MAC/PHY Configuration/Status */ + attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_IEEE_802_3_MAC_PHY_CONF, G_VARIANT_TYPE_VARDICT); + g_assert (attr); + g_variant_lookup (attr, "autoneg", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 3); + g_variant_lookup (attr, "pmd-autoneg-cap", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 0x6c00); + g_variant_lookup (attr, "operational-mau-type", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 16); + nm_clear_g_variant (&attr); + /* unsupported: IEEE 802.3 - Link Aggregation */ - /* unsupported: IEEE 802.3 - Maximum Frame Size*/ + + /* Maximum Frame Size */ + attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_IEEE_802_3_MAX_FRAME_SIZE, G_VARIANT_TYPE_UINT32); + nmtst_assert_variant_uint32 (attr, 1522); + nm_clear_g_variant (&attr); /* IEEE 802.1 - Port VLAN ID */ attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_PVID, G_VARIANT_TYPE_UINT32); @@ -289,6 +329,18 @@ _test_recv_data1_check (GMainLoop *loop, NMLldpListener *listener) nmtst_assert_variant_uint32 (attr, 1); nm_clear_g_variant (&attr); + /* new PPVID attributes */ + attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_PPVIDS, G_VARIANT_TYPE ("aa{sv}")); + g_assert_cmpuint (g_variant_n_children (attr), ==, 1); + child = g_variant_get_child_value (attr, 0); + g_assert (child); + g_variant_lookup (child, "ppvid", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 0); + g_variant_lookup (child, "flags", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 1); + nm_clear_g_variant (&child); + nm_clear_g_variant (&attr); + /* IEEE 802.1 - VLAN Name */ attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_VLAN_NAME, G_VARIANT_TYPE_STRING); nmtst_assert_variant_string (attr, "v2-0488-03-0505"); @@ -297,6 +349,18 @@ _test_recv_data1_check (GMainLoop *loop, NMLldpListener *listener) nmtst_assert_variant_uint32 (attr, 488); nm_clear_g_variant (&attr); + /* new VLAN attributes */ + attr = g_variant_lookup_value (neighbor, NM_LLDP_ATTR_IEEE_802_1_VLANS, G_VARIANT_TYPE ("aa{sv}")); + g_assert_cmpuint (g_variant_n_children (attr), ==, 1); + child = g_variant_get_child_value (attr, 0); + g_assert (child); + g_variant_lookup (child, "vid", "u", &v_uint); + g_assert_cmpint (v_uint, ==, 488); + g_variant_lookup (child, "name", "&s", &v_str); + g_assert_cmpstr (v_str, ==, "v2-0488-03-0505"); + nm_clear_g_variant (&child); + nm_clear_g_variant (&attr); + /* unsupported: IEEE 802.1 - Protocol Identity */ } -- cgit 1.3.0-6-gf8a5