ipng/vppcfg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct the returnvalue of get_parent_by_name() if ifname==None, add tests for that

Browse Source
This commit is contained in:
Pim van Pelt
2022-04-10 15:48:34 +00:00
parent 72668bdb18
commit 5fc3b4c42b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/interface.py
View File

@ -52,8 +52,6 @@ def get_qinx_parent_by_name(yaml, ifname):
def get_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. """ """ Returns the sub-interface's parent, or None,None if the sub-int doesn't exist. """
if not '.' in ifname:
return None, None
try: try:
parent_ifname, subid = ifname.split('.') parent_ifname, subid = ifname.split('.')
subid = int(subid) subid = int(subid)

4
config/test_interface.py
View File

@ -172,6 +172,10 @@ class TestInterfaceMethods(unittest.TestCase):
self.assertIsNone(ifname) self.assertIsNone(ifname)
self.assertIsNone(iface) 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): 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.202"))
self.assertIsNotNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.203")) self.assertIsNotNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.203"))