From 5fc3b4c42b2e0b3c44e558eff0701a6041eb240f Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sun, 10 Apr 2022 15:48:34 +0000 Subject: [PATCH] Correct the returnvalue of get_parent_by_name() if ifname==None, add tests for that --- config/interface.py | 2 -- config/test_interface.py | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/interface.py b/config/interface.py index 2d6ade4..4d92249 100644 --- a/config/interface.py +++ b/config/interface.py @@ -52,8 +52,6 @@ def get_qinx_parent_by_name(yaml, ifname): def get_parent_by_name(yaml, ifname): """ Returns the sub-interface's parent, or None,None if the sub-int doesn't exist. """ - if not '.' in ifname: - return None, None try: parent_ifname, subid = ifname.split('.') subid = int(subid) diff --git a/config/test_interface.py b/config/test_interface.py index 83b0700..2371b74 100644 --- a/config/test_interface.py +++ b/config/test_interface.py @@ -172,6 +172,10 @@ class TestInterfaceMethods(unittest.TestCase): self.assertIsNone(ifname) self.assertIsNone(iface) + ifname, iface = interface.get_parent_by_name(self.cfg, None) + self.assertIsNone(ifname) + self.assertIsNone(iface) + def test_get_qinx_parent_by_name(self): self.assertIsNotNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.202")) self.assertIsNotNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.203"))