proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 11:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17862 from LabNConsulting/chopps/ldp-snmp-fix

Browse Source 
ldp snmp/grpc test fix
This commit is contained in:
Donatas Abraitis 2025-01-16 09:11:25 +02:00 committed by GitHub
commit 4e363bd48d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/topotests/grpc_basic/test_basic_grpc.py
View File

@ -108,7 +108,7 @@ def test_capabilities(tgen):
logging.debug("grpc output: %s", output) logging.debug("grpc output: %s", output)
modules = sorted(re.findall('name: "([^"]+)"', output)) modules = sorted(re.findall('name: "([^"]+)"', output))
expected = ["frr-interface", "frr-routing", "frr-staticd", "frr-vrf"] expected = ["frr-backend", "frr-interface", "frr-routing", "frr-staticd", "frr-vrf"]
assert modules == expected assert modules == expected
encodings = sorted(re.findall("supported_encodings: (.*)", output)) encodings = sorted(re.findall("supported_encodings: (.*)", output))
@ -145,15 +145,10 @@ def test_get_config(tgen):
"ip": "192.168.1.1", "ip": "192.168.1.1",
"prefix-length": 24 "prefix-length": 24
} }
], ]
"evpn-mh": {},
"ipv6-router-advertisements": {}
} }
} }
] ]
},
"frr-zebra:zebra": {
"import-kernel-table": {}
} }
} """ } """
) )

5
tests/topotests/ldp_snmp/test_ldp_snmp_topo1.py
View File

@ -107,6 +107,11 @@ def build_topo(tgen):
def setup_module(mod): def setup_module(mod):
"Sets up the pytest environment" "Sets up the pytest environment"
if not os.path.isfile("/usr/sbin/snmpd"):
error_msg = "SNMP not installed - skipping"
pytest.skip(error_msg)
tgen = Topogen(build_topo, mod.__name__) tgen = Topogen(build_topo, mod.__name__)
tgen.start_topology() tgen.start_topology()