From d88003ff0288e4bd86ad79467676253952473326 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Sat, 19 Oct 2019 22:02:47 +0200
Subject: [PATCH] test: add tests for 802.3BT additions

---
 src/lib/atoms/dot3.c               |   6 ++---
 tests/integration/data/8023bt.pcap | Bin 0 -> 448 bytes
 tests/integration/test_pcap.py     |  42 +++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 tests/integration/data/8023bt.pcap

diff --git a/src/lib/atoms/dot3.c b/src/lib/atoms/dot3.c
index 97a959dd..a9e456df 100644
--- a/src/lib/atoms/dot3.c
+++ b/src/lib/atoms/dot3.c
@@ -183,9 +183,9 @@ static struct atom_map port_dot3_power_type_ext_map = {
 static struct atom_map port_dot3_power_pd_load_map = {
 	.key = lldpctl_k_dot3_power_pd_load,
 	.map = {
-		{ 0, "PD is single- or dual-signature and power on the modes is not "
-		  "electrically isolated." },
-		{ 1, "PD is dual-signature and power on the modes is electrically "
+		{ 0, "PD is single- or dual-signature and power is not "
+		  "electrically isolated" },
+		{ 1, "PD is dual-signature and power is electrically "
 		  "isolated" },
 	},
 };
diff --git a/tests/integration/data/8023bt.pcap b/tests/integration/data/8023bt.pcap
new file mode 100644
index 0000000000000000000000000000000000000000..932b593f0266a78881beffc5e633d072a990847f
GIT binary patch
literal 448
zc-lpg%Syvg5QgW(#7hw?>Q<R$3r*70YrCr@7B5gRMFkN_k4JMLZ9;NN?5?=cM-bfT
zPPaaRD7X?=K7tS6UWlI7g#$Cp4BroP`FMG}Q$U4(Q-R3%b$NSaR5ZAj#lT7b8DQ$^
z<n!U?;_6KqQ-^6^9oOpIGK*$uRDttMmhzYedQ0eW!UgpvziWdAZZ;frf>V*W5yQhe
zZ$+*z+~}x)HCMQPFBZ77h|W;+59VssW_kNqiVy630ryxG^Pq#)ieZ%utAM-qj$L(Z
zbQ&AY{pzlbxl_87&omkJI-I&bI^8e~B2ht4h_GUsNs<`D2@M*wO(D7XkI2-5uov+&
zPhgJb(JHU4=%u1n##RsiHgM#OtQ{9{vqKGuw?po;6Kr-FE*ABzuCGhlDp#!4fu>Ev
zh>g$H`I+0|!WJHjI!p}jG^N5EsMC`gdAcWLM4oyX(oyI?6CmjX%w)+(A7CM!m#LB^
b+N|<QQbGxZANYB1NNDh+R0Fb3CIEf`lLUc%

literal 0
Hc-jL100001

diff --git a/tests/integration/test_pcap.py b/tests/integration/test_pcap.py
index 8e2a3cb6..4befc485 100644
--- a/tests/integration/test_pcap.py
+++ b/tests/integration/test_pcap.py
@@ -1,3 +1,4 @@
+import pytest
 import scapy.all
 
 
@@ -52,3 +53,44 @@ def test_cisco_sg200(request, lldpd1, lldpcli, namespaces):
                 "lldp.eth0.lldp-med.inventory.asset": "1"
             })
         assert out == expected
+
+
+@pytest.mark.skipif("'Dot3' not in config.lldpd.features",
+                    readon="Dot3 not supported")
+def test_8023bt(lldpd1, lldpcli, namespaces):
+    with namespaces(2):
+        send_pcap('data/8023bt.pcap', 'eth1')
+    with namespaces(1):
+        out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")
+        for k in list(out.keys()):
+            if not k.startswith("lldp.eth0.port.power."):
+                del out[k]
+        assert out == {
+            'lldp.eth0.port.power.supported': 'yes',
+            'lldp.eth0.port.power.enabled': 'yes',
+            'lldp.eth0.port.power.paircontrol': 'yes',
+            'lldp.eth0.port.power.device-type': 'PSE',
+            'lldp.eth0.port.power.pairs': 'signal',
+            'lldp.eth0.port.power.class': 'class 4',
+            'lldp.eth0.port.power.power-type': '2',
+            'lldp.eth0.port.power.source': 'PSE',
+            'lldp.eth0.port.power.priority': 'low',
+            'lldp.eth0.port.power.requested': '71000',
+            'lldp.eth0.port.power.allocated': '51000',
+            'lldp.eth0.port.power.requested-a': '35500',
+            'lldp.eth0.port.power.requested-b': '35500',
+            'lldp.eth0.port.power.allocated-a': '25500',
+            'lldp.eth0.port.power.allocated-b': '25500',
+            'lldp.eth0.port.power.pse-powering-status':
+            '4-pair powering single-signature PD',
+            'lldp.eth0.port.power.pd-powering-status': 'Unknown',
+            'lldp.eth0.port.power.power-pairs-ext': 'Both alternatives',
+            'lldp.eth0.port.power.power-class-ext-a': 'Class 4',
+            'lldp.eth0.port.power.power-class-ext-b': 'Class 4',
+            'lldp.eth0.port.power.power-class-ext': 'Dual-signature PD',
+            'lldp.eth0.port.power.power-type-ext': 'Type 3 PSE',
+            'lldp.eth0.port.power.pd-load':
+            ('PD is single- or dual-signature and power '
+             'is not electrically isolated'),
+            'lldp.eth0.port.power.max-power': '51000'
+        }
-- 
2.39.2