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

Add the beginning of a test_qinx() suite, will complete after a refactor in an upcoming commit

Browse Source
This commit is contained in:
Pim van Pelt
2022-03-20 23:32:59 +00:00
parent e44db47989
commit 5247e3a241
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
unittest/test_lcp.yaml
View File

@ -11,10 +11,11 @@ interfaces:
mtu: 9000 mtu: 9000
encapsulation: encapsulation:
dot1q: 1000 dot1q: 1000
exact-match: True
addresses: [ "10.0.1.1/30" ] addresses: [ "10.0.1.1/30" ]
201: 201:
encapsulation: encapsulation:
dot1ad: 1000 dot1q: 1000
inner-dot1q: 1000 inner-dot1q: 1000
exact-match: True exact-match: True
addresses: [ "10.0.2.1/30" ] addresses: [ "10.0.2.1/30" ]

4
validator/interface.py
View File

@ -42,9 +42,9 @@ def get_qinx_parent_by_name(yaml, ifname):
if not sub_encap: if not sub_encap:
continue continue
if qinx_encap['dot1q'] > 0 and sub_encap['dot1q'] == qinx_encap['dot1q']: if qinx_encap['dot1q'] > 0 and sub_encap['dot1q'] == qinx_encap['dot1q']:
return sub_ifname return sub_iface
if qinx_encap['dot1ad'] > 0 and sub_encap['dot1ad'] == qinx_encap['dot1ad']: if qinx_encap['dot1ad'] > 0 and sub_encap['dot1ad'] == qinx_encap['dot1ad']:
return sub_ifname return sub_iface
return None return None

4
validator/test_interface.py
View File

@ -116,8 +116,8 @@ class TestInterfaceMethods(unittest.TestCase):
self.assertFalse(interface.is_l3(self.cfg, "GigabitEthernet3/0/0")) self.assertFalse(interface.is_l3(self.cfg, "GigabitEthernet3/0/0"))
def test_qinx_parent(self): def test_qinx_parent(self):
self.assertEqual(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.202"), "GigabitEthernet1/0/1.200") self.assertIsNotNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.202"))
self.assertEqual(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.203"), "GigabitEthernet1/0/1.201") self.assertIsNotNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.203"))
self.assertIsNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1")) self.assertIsNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1"))
self.assertIsNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.100")) self.assertIsNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.100"))
self.assertIsNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.200")) self.assertIsNone(interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.200"))

11
validator/test_lcp.py
View File

@ -1,6 +1,7 @@
import unittest import unittest
import yaml import yaml
import validator.lcp as lcp import validator.lcp as lcp
import validator.interface as interface
class TestLCPMethods(unittest.TestCase): class TestLCPMethods(unittest.TestCase):
def setUp(self): def setUp(self):
@ -13,3 +14,13 @@ class TestLCPMethods(unittest.TestCase):
## TODO(pim) - ensure that is_unique also takes synthesized LCPs into account ## TODO(pim) - ensure that is_unique also takes synthesized LCPs into account
## self.assertFalse(lcp.is_unique(self.cfg, "e1.1000")) ## self.assertFalse(lcp.is_unique(self.cfg, "e1.1000"))
def test_qinx(self):
qinq_iface = interface.get_by_name(self.cfg, "GigabitEthernet1/0/1.201")
mid_iface = interface.get_qinx_parent_by_name(self.cfg, "GigabitEthernet1/0/1.201")
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)