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

Merge pull request #11785 from opensourcerouting/fix/remove_ospf6Enabled_from_JSON

Browse Source 
ospf6d: Remove ospf6Enabled from JSON output
This commit is contained in:
Donald Sharp 2022-08-12 20:29:47 -04:00 committed by GitHub
commit 0b368b50dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ospf6d/ospf6_interface.c
View File

@ -966,10 +966,6 @@ static const char *ospf6_iftype_str(uint8_t iftype)
return "UNKNOWN";
}
#if CONFDATE > 20220709
CPP_NOTICE("Time to remove ospf6Enabled from JSON output")
#endif
/* show specified interface structure */
static int ospf6_interface_show(struct vty *vty, struct interface *ifp,
json_object *json_obj, bool use_json)
@ -996,11 +992,8 @@ static int ospf6_interface_show(struct vty *vty, struct interface *ifp,
ospf6_iftype_str(default_iftype));
json_object_int_add(json_obj, "interfaceId", ifp->ifindex);
if (ifp->info == NULL) {
json_object_boolean_false_add(json_obj, "ospf6Enabled");
if (ifp->info == NULL)
return 0;
}
json_object_boolean_true_add(json_obj, "ospf6Enabled");
oi = (struct ospf6_interface *)ifp->info;

7
tests/topotests/ospfv3_basic_functionality/test_ospfv3_single_area.py
View File

@ -183,7 +183,7 @@ def test_ospfv3_p2p_tc3_p0(request):
step("Verify that interface is enabled in ospf.")
step("Verify that config is successful.")
dut = "r0"
input_dict = {"r0": {"links": {"r3": {"ospf6": {"ospf6Enabled": True}}}}}
input_dict = {"r0": {"links": {"r3": {"ospf6": {}}}}}
result = verify_ospf6_interface(tgen, topo, dut=dut, input_dict=input_dict)
assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result)
@ -339,7 +339,7 @@ def test_ospfv3_p2p_tc3_p0(request):
assert result is True, "Testcase {} :Failed \n Error: {}".format(tc_name, result)
step("Verify that interface is enabled in ospf.")
dut = "r0"
input_dict = {"r0": {"links": {"r3": {"ospf6": {"ospf6Enabled": True}}}}}
input_dict = {"r0": {"links": {"r3": {"ospf6": {}}}}}
result = verify_ospf6_interface(tgen, topo, dut=dut, input_dict=input_dict)
assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result)
@ -374,7 +374,7 @@ def test_ospfv3_p2p_tc3_p0(request):
step("Verify that interface is enabled in ospf.")
dut = "r0"
input_dict = {"r0": {"links": {"r3": {"ospf6": {"ospf6Enabled": True}}}}}
input_dict = {"r0": {"links": {"r3": {"ospf6": {}}}}}
result = verify_ospf6_interface(tgen, topo, dut=dut, input_dict=input_dict)
assert result is True, "Testcase {} : Failed \n Error: {}".format(tc_name, result)
@ -1172,7 +1172,6 @@ def test_ospfv3_show_p1(request):
"ospf6": {
"status": "up",
"type": "BROADCAST",
"ospf6Enabled": True,
"attachedToArea": True,
"instanceId": 0,
"interfaceMtu": 1500,