From 97fef9bfd29aeb5bc7a0dbb7c30e21625ea14252 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Tue, 22 Mar 2022 18:31:03 +0000 Subject: [PATCH] Assert get_by_name() with non-existent name returns a tuple of None,None --- validator/test_bondethernet.py | 3 +++ validator/test_bridgedomain.py | 4 ++++ validator/test_interface.py | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/validator/test_bondethernet.py b/validator/test_bondethernet.py index 55e669d..92ce93f 100644 --- a/validator/test_bondethernet.py +++ b/validator/test_bondethernet.py @@ -14,6 +14,9 @@ class TestBondEthernetMethods(unittest.TestCase): self.assertIn("GigabitEthernet1/0/0", iface['interfaces']) self.assertNotIn("GigabitEthernet2/0/0", iface['interfaces']) + ifname, iface = bondethernet.get_by_name(self.cfg, "BondEthernet-notexist") + self.assertIsNone(iface) + self.assertIsNone(ifname) def test_members(self): self.assertTrue(bondethernet.is_bond_member(self.cfg, "GigabitEthernet1/0/0")) diff --git a/validator/test_bridgedomain.py b/validator/test_bridgedomain.py index 48a417c..ac27f19 100644 --- a/validator/test_bridgedomain.py +++ b/validator/test_bridgedomain.py @@ -14,6 +14,10 @@ class TestBridgeDomainMethods(unittest.TestCase): self.assertEqual(iface['mtu'], 3000) self.assertIn("BondEthernet0", iface['interfaces']) + ifname, iface = bridgedomain.get_by_name(self.cfg, "bd-notexist") + self.assertIsNone(iface) + self.assertIsNone(ifname) + def test_members(self): self.assertTrue(bridgedomain.is_bridge_interface(self.cfg, "GigabitEthernet1/0/0")) self.assertTrue(bridgedomain.is_bridge_interface(self.cfg, "GigabitEthernet2/0/0.100")) diff --git a/validator/test_interface.py b/validator/test_interface.py index edfbb66..93824f3 100644 --- a/validator/test_interface.py +++ b/validator/test_interface.py @@ -143,6 +143,10 @@ class TestInterfaceMethods(unittest.TestCase): encap = interface.get_encapsulation(self.cfg, ifname) self.assertEqual(encap, {'dot1q': 1000, 'dot1ad': 0, 'inner-dot1q': 1234, 'exact-match': False}) + ifname, iface = interface.get_by_name(self.cfg, "GigabitEthernet1/0/1.1") + self.assertIsNone(ifname) + self.assertIsNone(iface) + def test_get_parent_by_name(self): ifname, iface = interface.get_parent_by_name(self.cfg, "GigabitEthernet1/0/1.201") self.assertEqual(ifname, "GigabitEthernet1/0/1")