mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-15 06:43:16 +00:00
Merge pull request #17862 from LabNConsulting/chopps/ldp-snmp-fix
ldp snmp/grpc test fix
This commit is contained in:
commit
4e363bd48d
@ -108,7 +108,7 @@ def test_capabilities(tgen):
|
||||
logging.debug("grpc output: %s", 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
|
||||
|
||||
encodings = sorted(re.findall("supported_encodings: (.*)", output))
|
||||
@ -145,15 +145,10 @@ def test_get_config(tgen):
|
||||
"ip": "192.168.1.1",
|
||||
"prefix-length": 24
|
||||
}
|
||||
],
|
||||
"evpn-mh": {},
|
||||
"ipv6-router-advertisements": {}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"frr-zebra:zebra": {
|
||||
"import-kernel-table": {}
|
||||
}
|
||||
} """
|
||||
)
|
||||
|
@ -107,6 +107,11 @@ def build_topo(tgen):
|
||||
|
||||
def setup_module(mod):
|
||||
"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.start_topology()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user