From 58d0ebe71eeb13585d437eea1567c1c5831f289b Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Mon, 21 Mar 2022 08:53:40 +0000 Subject: [PATCH] Complete test_qinx now that get_*_by_name() returns tuples --- validator/test_lcp.py | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/validator/test_lcp.py b/validator/test_lcp.py index 8a0fae6..87682a7 100644 --- a/validator/test_lcp.py +++ b/validator/test_lcp.py @@ -16,11 +16,22 @@ class TestLCPMethods(unittest.TestCase): ## self.assertFalse(lcp.is_unique(self.cfg, "e1.1000")) def test_qinx(self): - qint_ifname, qinq_iface = interface.get_by_name(self.cfg, "GigabitEthernet1/0/1.201") + qinx_ifname, qinx_iface = interface.get_by_name(self.cfg, "GigabitEthernet1/0/1.201") mid_ifname, mid_iface = interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.201") parent_ifname, parent_iface = interface.get_parent_by_name(self.cfg, "GigabitEthernet1/0/1.201") - # TODO(pim) - complete once get_*_by_name() returns a dict - # print("qinq", qinq_iface) - # print("mid", mid_iface) - # print("parent", parent_iface) + self.assertEqual(qinx_ifname, "GigabitEthernet1/0/1.201") + self.assertEqual(mid_ifname, "GigabitEthernet1/0/1.200") + self.assertEqual(parent_ifname, "GigabitEthernet1/0/1") + + qinx_ifname, qinx_iface = interface.get_by_name(self.cfg, "GigabitEthernet1/0/1.201") + mid_ifname, mid_iface = interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.201") + parent_ifname, parent_iface = interface.get_parent_by_name(self.cfg, "GigabitEthernet1/0/1.201") + + self.assertEqual(qinx_ifname, "GigabitEthernet1/0/1.201") + self.assertEqual(mid_ifname, "GigabitEthernet1/0/1.200") + self.assertEqual(parent_ifname, "GigabitEthernet1/0/1") + + ifname, iface = interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.100") + self.assertIsNone(ifname) + self.assertIsNone(iface)