Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

yang/zebra: migrate route map to northbound #5183

Merged
merged 7 commits into from
Mar 31, 2020
Merged

yang/zebra: migrate route map to northbound #5183

merged 7 commits into from
Mar 31, 2020

Conversation

rzalamena
Copy link
Member

Summary

Migrate zebra's route-map specific commands to yang/northbound. zebra/yang specific commits start with yang: add all route types enumeration.

This PR requires #5104 merged first (or just merge this one with everything).

@rzalamena rzalamena added blocked We are waiting on a feature implementation from another subsystem that we do not control zebra yang labels Oct 17, 2019
@LabN-CI
Copy link
Collaborator

LabN-CI commented Oct 17, 2019 •
edited
Loading

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/5183 120afb0
Date 10/17/2019
Start 16:42:15
Finish 17:03:55
Run-Time 21:40
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2019-10-17-16:42:15.txt
Log autoscript-2019-10-17-16:43:03.log.bz2
Memory 433 425 360

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Oct 17, 2019 •
edited
Loading

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-9295/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings 
Report for routemap.c | 12 issues
===============================================
< WARNING: quoted string split across lines
< #324: FILE: /tmp/f1-21405/routemap.c:324:
< WARNING: quoted string split across lines
< #376: FILE: /tmp/f1-21405/routemap.c:376:
< WARNING: line over 80 characters
< #401: FILE: /tmp/f1-21405/routemap.c:401:
< WARNING: quoted string split across lines
< #412: FILE: /tmp/f1-21405/routemap.c:412:
< WARNING: line over 80 characters
< #430: FILE: /tmp/f1-21405/routemap.c:430:
< WARNING: quoted string split across lines
< #441: FILE: /tmp/f1-21405/routemap.c:441:
Report for routemap_cli.c | 20 issues
===============================================
ERROR: Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects
#135: FILE: /tmp/f1-21405/routemap_cli.c:135:
+#define SKIP_RULE(name) if (strcmp((name), rmr->cmd->str) == 0) continue

ERROR: do not use assignment in if condition
#616: FILE: /tmp/f1-21405/routemap_cli.c:616:
+		if ((ln = yang_dnode_get(dnode, "./list-name")) != NULL)

ERROR: do not use assignment in if condition
#618: FILE: /tmp/f1-21405/routemap_cli.c:618:
+		else if ((ln = yang_dnode_get(dnode, "./access-list-num"))

ERROR: do not use assignment in if condition
#621: FILE: /tmp/f1-21405/routemap_cli.c:621:
+		else if ((ln = yang_dnode_get(dnode,

WARNING: line over 80 characters
#856: FILE: /tmp/f1-21405/routemap_cli.c:856:
+		} else if (yang_dnode_get(dnode, "./subtract-round-trip-time")) {
Report for routemap.h | 8 issues
===============================================
< WARNING: function definition argument 'const char *' should also have an identifier name
< #639: FILE: /tmp/f1-21405/routemap.h:639:
< WARNING: function definition argument 'const char *' should also have an identifier name
< #640: FILE: /tmp/f1-21405/routemap.h:640:
< WARNING: function definition argument 'const char *' should also have an identifier name
< #641: FILE: /tmp/f1-21405/routemap.h:641:
< WARNING: Missing a blank line after declarations
< #669: FILE: /tmp/f1-21405/routemap.h:669:
Report for routemap_northbound.c | 252 issues
===============================================
WARNING: line over 80 characters
#1247: FILE: /tmp/f1-21405/routemap_northbound.c:1247:
+			.xpath = "/frr-route-map:lib/route-map/entry/description",

WARNING: line over 80 characters
#1249: FILE: /tmp/f1-21405/routemap_northbound.c:1249:
+				.modify = lib_route_map_entry_description_modify,

WARNING: line over 80 characters
#1250: FILE: /tmp/f1-21405/routemap_northbound.c:1250:
+				.destroy = lib_route_map_entry_description_destroy,

WARNING: line over 80 characters
#1269: FILE: /tmp/f1-21405/routemap_northbound.c:1269:
+			.xpath = "/frr-route-map:lib/route-map/entry/exit-policy",

WARNING: line over 80 characters
#1271: FILE: /tmp/f1-21405/routemap_northbound.c:1271:
+				.modify = lib_route_map_entry_exit_policy_modify,

WARNING: line over 80 characters
#1276: FILE: /tmp/f1-21405/routemap_northbound.c:1276:
+			.xpath = "/frr-route-map:lib/route-map/entry/goto-value",

WARNING: line over 80 characters
#1279: FILE: /tmp/f1-21405/routemap_northbound.c:1279:
+				.destroy = lib_route_map_entry_goto_value_destroy,

WARNING: line over 80 characters
#1283: FILE: /tmp/f1-21405/routemap_northbound.c:1283:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition",

WARNING: line over 80 characters
#1285: FILE: /tmp/f1-21405/routemap_northbound.c:1285:
+				.create = lib_route_map_entry_match_condition_create,

WARNING: line over 80 characters
#1286: FILE: /tmp/f1-21405/routemap_northbound.c:1286:
+				.destroy = lib_route_map_entry_match_condition_destroy,

WARNING: line over 80 characters
#1291: FILE: /tmp/f1-21405/routemap_northbound.c:1291:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/interface",

WARNING: line over 80 characters
#1293: FILE: /tmp/f1-21405/routemap_northbound.c:1293:
+				.modify = lib_route_map_entry_match_condition_interface_modify,

WARNING: line over 80 characters
#1294: FILE: /tmp/f1-21405/routemap_northbound.c:1294:
+				.destroy = lib_route_map_entry_match_condition_interface_destroy,

WARNING: line over 80 characters
#1298: FILE: /tmp/f1-21405/routemap_northbound.c:1298:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/access-list-num",

WARNING: line over 80 characters
#1300: FILE: /tmp/f1-21405/routemap_northbound.c:1300:
+				.modify = lib_route_map_entry_match_condition_access_list_num_modify,

WARNING: line over 80 characters
#1301: FILE: /tmp/f1-21405/routemap_northbound.c:1301:
+				.destroy = lib_route_map_entry_match_condition_access_list_num_destroy,

WARNING: line over 80 characters
#1305: FILE: /tmp/f1-21405/routemap_northbound.c:1305:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/access-list-num-extended",

WARNING: line over 80 characters
#1307: FILE: /tmp/f1-21405/routemap_northbound.c:1307:
+				.modify = lib_route_map_entry_match_condition_access_list_num_extended_modify,

WARNING: line over 80 characters
#1308: FILE: /tmp/f1-21405/routemap_northbound.c:1308:
+				.destroy = lib_route_map_entry_match_condition_access_list_num_extended_destroy,

WARNING: line over 80 characters
#1312: FILE: /tmp/f1-21405/routemap_northbound.c:1312:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/list-name",

WARNING: line over 80 characters
#1314: FILE: /tmp/f1-21405/routemap_northbound.c:1314:
+				.modify = lib_route_map_entry_match_condition_list_name_modify,

WARNING: line over 80 characters
#1315: FILE: /tmp/f1-21405/routemap_northbound.c:1315:
+				.destroy = lib_route_map_entry_match_condition_list_name_destroy,

WARNING: line over 80 characters
#1319: FILE: /tmp/f1-21405/routemap_northbound.c:1319:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/ipv4-next-hop-type",

WARNING: line over 80 characters
#1321: FILE: /tmp/f1-21405/routemap_northbound.c:1321:
+				.modify = lib_route_map_entry_match_condition_ipv4_next_hop_type_modify,

WARNING: line over 80 characters
#1322: FILE: /tmp/f1-21405/routemap_northbound.c:1322:
+				.destroy = lib_route_map_entry_match_condition_ipv4_next_hop_type_destroy,

WARNING: line over 80 characters
#1326: FILE: /tmp/f1-21405/routemap_northbound.c:1326:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/ipv6-next-hop-type",

WARNING: line over 80 characters
#1328: FILE: /tmp/f1-21405/routemap_northbound.c:1328:
+				.modify = lib_route_map_entry_match_condition_ipv6_next_hop_type_modify,

WARNING: line over 80 characters
#1329: FILE: /tmp/f1-21405/routemap_northbound.c:1329:
+				.destroy = lib_route_map_entry_match_condition_ipv6_next_hop_type_destroy,

WARNING: line over 80 characters
#1333: FILE: /tmp/f1-21405/routemap_northbound.c:1333:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/metric",

WARNING: line over 80 characters
#1335: FILE: /tmp/f1-21405/routemap_northbound.c:1335:
+				.modify = lib_route_map_entry_match_condition_metric_modify,

WARNING: line over 80 characters
#1336: FILE: /tmp/f1-21405/routemap_northbound.c:1336:
+				.destroy = lib_route_map_entry_match_condition_metric_destroy,

WARNING: line over 80 characters
#1340: FILE: /tmp/f1-21405/routemap_northbound.c:1340:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/tag",

WARNING: line over 80 characters
#1342: FILE: /tmp/f1-21405/routemap_northbound.c:1342:
+				.modify = lib_route_map_entry_match_condition_tag_modify,

WARNING: line over 80 characters
#1343: FILE: /tmp/f1-21405/routemap_northbound.c:1343:
+				.destroy = lib_route_map_entry_match_condition_tag_destroy,

WARNING: line over 80 characters
#1347: FILE: /tmp/f1-21405/routemap_northbound.c:1347:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action",

WARNING: line over 80 characters
#1350: FILE: /tmp/f1-21405/routemap_northbound.c:1350:
+				.destroy = lib_route_map_entry_set_action_destroy,

WARNING: line over 80 characters
#1355: FILE: /tmp/f1-21405/routemap_northbound.c:1355:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/ipv4-address",

WARNING: line over 80 characters
#1357: FILE: /tmp/f1-21405/routemap_northbound.c:1357:
+				.modify = lib_route_map_entry_set_action_ipv4_address_modify,

WARNING: line over 80 characters
#1358: FILE: /tmp/f1-21405/routemap_northbound.c:1358:
+				.destroy = lib_route_map_entry_set_action_ipv4_address_destroy,

WARNING: line over 80 characters
#1362: FILE: /tmp/f1-21405/routemap_northbound.c:1362:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/ipv6-address",

WARNING: line over 80 characters
#1364: FILE: /tmp/f1-21405/routemap_northbound.c:1364:
+				.modify = lib_route_map_entry_set_action_ipv6_address_modify,

WARNING: line over 80 characters
#1365: FILE: /tmp/f1-21405/routemap_northbound.c:1365:
+				.destroy = lib_route_map_entry_set_action_ipv6_address_destroy,

WARNING: line over 80 characters
#1369: FILE: /tmp/f1-21405/routemap_northbound.c:1369:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/value",

WARNING: line over 80 characters
#1371: FILE: /tmp/f1-21405/routemap_northbound.c:1371:
+				.modify = lib_route_map_entry_set_action_value_modify,

WARNING: line over 80 characters
#1372: FILE: /tmp/f1-21405/routemap_northbound.c:1372:
+				.destroy = lib_route_map_entry_set_action_value_destroy,

WARNING: line over 80 characters
#1376: FILE: /tmp/f1-21405/routemap_northbound.c:1376:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/add-metric",

WARNING: line over 80 characters
#1378: FILE: /tmp/f1-21405/routemap_northbound.c:1378:
+				.modify = lib_route_map_entry_set_action_add_metric_modify,

WARNING: line over 80 characters
#1379: FILE: /tmp/f1-21405/routemap_northbound.c:1379:
+				.destroy = lib_route_map_entry_set_action_add_metric_destroy,

WARNING: line over 80 characters
#1383: FILE: /tmp/f1-21405/routemap_northbound.c:1383:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/subtract-metric",

WARNING: line over 80 characters
#1385: FILE: /tmp/f1-21405/routemap_northbound.c:1385:
+				.modify = lib_route_map_entry_set_action_subtract_metric_modify,

WARNING: line over 80 characters
#1386: FILE: /tmp/f1-21405/routemap_northbound.c:1386:
+				.destroy = lib_route_map_entry_set_action_subtract_metric_destroy,

WARNING: line over 80 characters
#1390: FILE: /tmp/f1-21405/routemap_northbound.c:1390:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/use-round-trip-time",

WARNING: line over 80 characters
#1392: FILE: /tmp/f1-21405/routemap_northbound.c:1392:
+				.modify = lib_route_map_entry_set_action_use_round_trip_time_modify,

WARNING: line over 80 characters
#1393: FILE: /tmp/f1-21405/routemap_northbound.c:1393:
+				.destroy = lib_route_map_entry_set_action_use_round_trip_time_destroy,

WARNING: line over 80 characters
#1397: FILE: /tmp/f1-21405/routemap_northbound.c:1397:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/add-round-trip-time",

WARNING: line over 80 characters
#1399: FILE: /tmp/f1-21405/routemap_northbound.c:1399:
+				.modify = lib_route_map_entry_set_action_add_round_trip_time_modify,

WARNING: line over 80 characters
#1400: FILE: /tmp/f1-21405/routemap_northbound.c:1400:
+				.destroy = lib_route_map_entry_set_action_add_round_trip_time_destroy,

WARNING: line over 80 characters
#1404: FILE: /tmp/f1-21405/routemap_northbound.c:1404:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/subtract-round-trip-time",

WARNING: line over 80 characters
#1406: FILE: /tmp/f1-21405/routemap_northbound.c:1406:
+				.modify = lib_route_map_entry_set_action_subtract_round_trip_time_modify,

WARNING: line over 80 characters
#1407: FILE: /tmp/f1-21405/routemap_northbound.c:1407:
+				.destroy = lib_route_map_entry_set_action_subtract_round_trip_time_destroy,

WARNING: line over 80 characters
#1411: FILE: /tmp/f1-21405/routemap_northbound.c:1411:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/tag",

WARNING: line over 80 characters
#1413: FILE: /tmp/f1-21405/routemap_northbound.c:1413:
+				.modify = lib_route_map_entry_set_action_tag_modify,

WARNING: line over 80 characters
#1414: FILE: /tmp/f1-21405/routemap_northbound.c:1414:
+				.destroy = lib_route_map_entry_set_action_tag_destroy,
Report for zebra_northbound.c | 8 issues
===============================================
WARNING: line over 80 characters
#1485: FILE: /tmp/f1-21405/zebra_northbound.c:1485:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length

WARNING: line over 80 characters
#1534: FILE: /tmp/f1-21405/zebra_northbound.c:1534:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length

WARNING: line over 80 characters
#1840: FILE: /tmp/f1-21405/zebra_northbound.c:1840:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/table-id",

WARNING: line over 80 characters
#1842: FILE: /tmp/f1-21405/zebra_northbound.c:1842:
+				.modify = zebra_import_kernel_table_table_id_modify,

WARNING: line over 80 characters
#1843: FILE: /tmp/f1-21405/zebra_northbound.c:1843:
+				.destroy = zebra_import_kernel_table_table_id_destroy,

WARNING: line over 80 characters
#1847: FILE: /tmp/f1-21405/zebra_northbound.c:1847:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/distance",

WARNING: line over 80 characters
#1849: FILE: /tmp/f1-21405/zebra_northbound.c:1849:
+				.modify = zebra_import_kernel_table_distance_modify,

WARNING: line over 80 characters
#1853: FILE: /tmp/f1-21405/zebra_northbound.c:1853:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/route-map",

WARNING: line over 80 characters
#1855: FILE: /tmp/f1-21405/zebra_northbound.c:1855:
+				.modify = zebra_import_kernel_table_route_map_modify,

WARNING: line over 80 characters
#1856: FILE: /tmp/f1-21405/zebra_northbound.c:1856:
+				.destroy = zebra_import_kernel_table_route_map_destroy,

WARNING: line over 80 characters
#1862: FILE: /tmp/f1-21405/zebra_northbound.c:1862:
+				.create = zebra_allow_external_route_update_create,

WARNING: line over 80 characters
#1863: FILE: /tmp/f1-21405/zebra_northbound.c:1863:
+				.destroy = zebra_allow_external_route_update_destroy,

WARNING: line over 80 characters
#1889: FILE: /tmp/f1-21405/zebra_northbound.c:1889:
+				.create = zebra_vrf_vni_mapping_prefix_only_create,

WARNING: line over 80 characters
#1890: FILE: /tmp/f1-21405/zebra_northbound.c:1890:
+				.destroy = zebra_vrf_vni_mapping_prefix_only_destroy,

WARNING: line over 80 characters
#1918: FILE: /tmp/f1-21405/zebra_northbound.c:1918:
+				.destroy = zebra_debugs_debug_zapi_detail_destroy,

WARNING: line over 80 characters
#1929: FILE: /tmp/f1-21405/zebra_northbound.c:1929:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-send",

WARNING: line over 80 characters
#1931: FILE: /tmp/f1-21405/zebra_northbound.c:1931:
+				.modify = zebra_debugs_debug_kernel_msg_send_modify,

WARNING: line over 80 characters
#1932: FILE: /tmp/f1-21405/zebra_northbound.c:1932:
+				.destroy = zebra_debugs_debug_kernel_msg_send_destroy,

WARNING: line over 80 characters
#1936: FILE: /tmp/f1-21405/zebra_northbound.c:1936:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-recv",

WARNING: line over 80 characters
#1938: FILE: /tmp/f1-21405/zebra_northbound.c:1938:
+				.modify = zebra_debugs_debug_kernel_msg_recv_modify,

WARNING: line over 80 characters
#1939: FILE: /tmp/f1-21405/zebra_northbound.c:1939:
+				.destroy = zebra_debugs_debug_kernel_msg_recv_destroy,

WARNING: line over 80 characters
#1953: FILE: /tmp/f1-21405/zebra_northbound.c:1953:
+				.destroy = zebra_debugs_debug_rib_detail_destroy,

WARNING: line over 80 characters
#1974: FILE: /tmp/f1-21405/zebra_northbound.c:1974:
+				.destroy = zebra_debugs_debug_nht_detail_destroy,

WARNING: line over 80 characters
#2008: FILE: /tmp/f1-21405/zebra_northbound.c:2008:
+				.modify = zebra_debugs_debug_dplane_detail_modify,

WARNING: line over 80 characters
#2009: FILE: /tmp/f1-21405/zebra_northbound.c:2009:
+				.destroy = zebra_debugs_debug_dplane_detail_destroy,

WARNING: line over 80 characters
#2104: FILE: /tmp/f1-21405/zebra_northbound.c:2104:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list",

WARNING: line over 80 characters
#2106: FILE: /tmp/f1-21405/zebra_northbound.c:2106:
+				.create = lib_interface_zebra_ip4_addr_list_create,

WARNING: line over 80 characters
#2107: FILE: /tmp/f1-21405/zebra_northbound.c:2107:
+				.destroy = lib_interface_zebra_ip4_addr_list_destroy,

WARNING: line over 80 characters
#2111: FILE: /tmp/f1-21405/zebra_northbound.c:2111:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/ip4-peer",

WARNING: line over 80 characters
#2113: FILE: /tmp/f1-21405/zebra_northbound.c:2113:
+				.modify = lib_interface_zebra_ip4_addr_list_ip4_peer_modify,

WARNING: line over 80 characters
#2114: FILE: /tmp/f1-21405/zebra_northbound.c:2114:
+				.destroy = lib_interface_zebra_ip4_addr_list_ip4_peer_destroy,

WARNING: line over 80 characters
#2118: FILE: /tmp/f1-21405/zebra_northbound.c:2118:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/label",

WARNING: line over 80 characters
#2120: FILE: /tmp/f1-21405/zebra_northbound.c:2120:
+				.modify = lib_interface_zebra_ip4_addr_list_label_modify,

WARNING: line over 80 characters
#2121: FILE: /tmp/f1-21405/zebra_northbound.c:2121:
+				.destroy = lib_interface_zebra_ip4_addr_list_label_destroy,

WARNING: line over 80 characters
#2125: FILE: /tmp/f1-21405/zebra_northbound.c:2125:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list",

WARNING: line over 80 characters
#2127: FILE: /tmp/f1-21405/zebra_northbound.c:2127:
+				.create = lib_interface_zebra_ip6_addr_list_create,

WARNING: line over 80 characters
#2128: FILE: /tmp/f1-21405/zebra_northbound.c:2128:
+				.destroy = lib_interface_zebra_ip6_addr_list_destroy,

WARNING: line over 80 characters
#2132: FILE: /tmp/f1-21405/zebra_northbound.c:2132:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list/label",

WARNING: line over 80 characters
#2134: FILE: /tmp/f1-21405/zebra_northbound.c:2134:
+				.modify = lib_interface_zebra_ip6_addr_list_label_modify,

WARNING: line over 80 characters
#2135: FILE: /tmp/f1-21405/zebra_northbound.c:2135:
+				.destroy = lib_interface_zebra_ip6_addr_list_label_destroy,

WARNING: line over 80 characters
#2139: FILE: /tmp/f1-21405/zebra_northbound.c:2139:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/multicast",

WARNING: line over 80 characters
#2142: FILE: /tmp/f1-21405/zebra_northbound.c:2142:
+				.destroy = lib_interface_zebra_multicast_destroy,

WARNING: line over 80 characters
#2146: FILE: /tmp/f1-21405/zebra_northbound.c:2146:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/link-detect",

WARNING: line over 80 characters
#2148: FILE: /tmp/f1-21405/zebra_northbound.c:2148:
+				.modify = lib_interface_zebra_link_detect_modify,

WARNING: line over 80 characters
#2149: FILE: /tmp/f1-21405/zebra_northbound.c:2149:
+				.destroy = lib_interface_zebra_link_detect_destroy,

WARNING: line over 80 characters
#2153: FILE: /tmp/f1-21405/zebra_northbound.c:2153:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/shutdown",

WARNING: line over 80 characters
#2160: FILE: /tmp/f1-21405/zebra_northbound.c:2160:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/bandwidth",

WARNING: line over 80 characters
#2163: FILE: /tmp/f1-21405/zebra_northbound.c:2163:
+				.destroy = lib_interface_zebra_bandwidth_destroy,

WARNING: line over 80 characters
#2167: FILE: /tmp/f1-21405/zebra_northbound.c:2167:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length",

WARNING: line over 80 characters
#2169: FILE: /tmp/f1-21405/zebra_northbound.c:2169:
+				.modify = lib_route_map_entry_match_condition_ipv4_prefix_length_modify,

WARNING: line over 80 characters
#2170: FILE: /tmp/f1-21405/zebra_northbound.c:2170:
+				.destroy = lib_route_map_entry_match_condition_ipv4_prefix_length_destroy,

WARNING: line over 80 characters
#2174: FILE: /tmp/f1-21405/zebra_northbound.c:2174:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length",

WARNING: line over 80 characters
#2176: FILE: /tmp/f1-21405/zebra_northbound.c:2176:
+				.modify = lib_route_map_entry_match_condition_ipv6_prefix_length_modify,

WARNING: line over 80 characters
#2177: FILE: /tmp/f1-21405/zebra_northbound.c:2177:
+				.destroy = lib_route_map_entry_match_condition_ipv6_prefix_length_destroy,

WARNING: line over 80 characters
#2181: FILE: /tmp/f1-21405/zebra_northbound.c:2181:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-protocol",

WARNING: line over 80 characters
#2183: FILE: /tmp/f1-21405/zebra_northbound.c:2183:
+				.modify = lib_route_map_entry_match_condition_source_protocol_modify,

WARNING: line over 80 characters
#2184: FILE: /tmp/f1-21405/zebra_northbound.c:2184:
+				.destroy = lib_route_map_entry_match_condition_source_protocol_destroy,

WARNING: line over 80 characters
#2188: FILE: /tmp/f1-21405/zebra_northbound.c:2188:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-instance",

WARNING: line over 80 characters
#2190: FILE: /tmp/f1-21405/zebra_northbound.c:2190:
+				.modify = lib_route_map_entry_match_condition_source_instance_modify,

WARNING: line over 80 characters
#2191: FILE: /tmp/f1-21405/zebra_northbound.c:2191:
+				.destroy = lib_route_map_entry_match_condition_source_instance_destroy,

WARNING: line over 80 characters
#2195: FILE: /tmp/f1-21405/zebra_northbound.c:2195:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v4",

WARNING: line over 80 characters
#2197: FILE: /tmp/f1-21405/zebra_northbound.c:2197:
+				.modify = lib_route_map_entry_set_action_source_v4_modify,

WARNING: line over 80 characters
#2198: FILE: /tmp/f1-21405/zebra_northbound.c:2198:
+				.destroy = lib_route_map_entry_set_action_source_v4_destroy,

WARNING: line over 80 characters
#2202: FILE: /tmp/f1-21405/zebra_northbound.c:2202:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v6",

WARNING: line over 80 characters
#2204: FILE: /tmp/f1-21405/zebra_northbound.c:2204:
+				.modify = lib_route_map_entry_set_action_source_v6_modify,

WARNING: line over 80 characters
#2205: FILE: /tmp/f1-21405/zebra_northbound.c:2205:
+				.destroy = lib_route_map_entry_set_action_source_v6_destroy,

CLANG Static Analyzer Summary

  • Github Pull Request 5183, comparing to Git base SHA 0997ca9

Fixed warnings:

  • Dead store: Dead assignment in bgpd/bgp_evpn.c, function install_evpn_route_entry, line 2612
  • Logic error: Dereference of null pointer in nhrpd/nhrpd.h, function notifier_call, line 79

New warnings:

Static Analysis warning summary compared to base:

  • Fixed warnings: 2
  • New warnings: 1

1 Static Analyzer issues remaining.

See details at
https://ci1.netdef.org/browse/FRR-FRRPULLREQ-9295/artifact/shared/static_analysis/index.html

@donaldsharp donaldsharp requested a review from qlyoung November 12, 2019 16:40
@rzalamena rzalamena mentioned this pull request Nov 14, 2019
Merged
@rzalamena rzalamena mentioned this pull request Nov 25, 2019
Open
@Spantik Spantik self-requested a review January 28, 2020 16:53
polychaeta
polychaeta reviewed Feb 5, 2020
View reviewed changes
Copy link

@polychaeta polychaeta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution to FRR!

Click for style suggestions

To apply these suggestions:

curl -s https://gist.githubusercontent.com/polychaeta/609648c977242dcab9342caf6d09e3c6/raw/64ce04cb674a30932202680f38d1e9110fbcb8f3/cr_5183_1580923348.diff | git apply


diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 49eeb60f2..ba25e525b 100644
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -351,14 +351,12 @@ static int ip_nht_rm_del(struct zebra_vrf *zvrf, const char *rmap, int rtype,
 	return CMD_SUCCESS;
 }
 
-DEFPY(
-	match_ip_address_prefix_len, match_ip_address_prefix_len_cmd,
-	"match ip address prefix-len (0-32)$length",
-	MATCH_STR
-	IP_STR
-	"Match prefix length of IP address\n"
-	"Match prefix length of IP address\n"
-	"Prefix length\n")
+DEFPY(match_ip_address_prefix_len, match_ip_address_prefix_len_cmd,
+      "match ip address prefix-len (0-32)$length",
+      MATCH_STR IP_STR
+      "Match prefix length of IP address\n"
+      "Match prefix length of IP address\n"
+      "Prefix length\n")
 {
 	const char *xpath = "./match-condition[condition='ipv4-prefix-length']";
 	char xpath_value[XPATH_MAXLEN];
@@ -371,15 +369,12 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	no_match_ip_address_prefix_len, no_match_ip_address_prefix_len_cmd,
-	"no match ip address prefix-len [(0-32)]",
-	NO_STR
-	MATCH_STR
-	IP_STR
-	"Match prefix length of IP address\n"
-	"Match prefix length of IP address\n"
-	"Prefix length\n")
+DEFPY(no_match_ip_address_prefix_len, no_match_ip_address_prefix_len_cmd,
+      "no match ip address prefix-len [(0-32)]",
+      NO_STR MATCH_STR IP_STR
+      "Match prefix length of IP address\n"
+      "Match prefix length of IP address\n"
+      "Prefix length\n")
 {
 	const char *xpath = "./match-condition[condition='ipv4-prefix-length']";
 
@@ -388,14 +383,12 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	match_ipv6_address_prefix_len, match_ipv6_address_prefix_len_cmd,
-	"match ipv6 address prefix-len (0-128)$length",
-	MATCH_STR
-	IPV6_STR
-	"Match prefix length of IPv6 address\n"
-	"Match prefix length of IPv6 address\n"
-	"Prefix length\n")
+DEFPY(match_ipv6_address_prefix_len, match_ipv6_address_prefix_len_cmd,
+      "match ipv6 address prefix-len (0-128)$length",
+      MATCH_STR IPV6_STR
+      "Match prefix length of IPv6 address\n"
+      "Match prefix length of IPv6 address\n"
+      "Prefix length\n")
 {
 	const char *xpath = "./match-condition[condition='ipv6-prefix-length']";
 	char xpath_value[XPATH_MAXLEN];
@@ -408,15 +401,12 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	no_match_ipv6_address_prefix_len, no_match_ipv6_address_prefix_len_cmd,
-	"no match ipv6 address prefix-len [(0-128)]",
-	NO_STR
-	MATCH_STR
-	IPV6_STR
-	"Match prefix length of IPv6 address\n"
-	"Match prefix length of IPv6 address\n"
-	"Prefix length\n")
+DEFPY(no_match_ipv6_address_prefix_len, no_match_ipv6_address_prefix_len_cmd,
+      "no match ipv6 address prefix-len [(0-128)]",
+      NO_STR MATCH_STR IPV6_STR
+      "Match prefix length of IPv6 address\n"
+      "Match prefix length of IPv6 address\n"
+      "Prefix length\n")
 {
 	const char *xpath = "./match-condition[condition='ipv6-prefix-length']";
 
@@ -425,14 +415,12 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	match_ip_nexthop_prefix_len, match_ip_nexthop_prefix_len_cmd,
-	"match ip next-hop prefix-len (0-32)$length",
-	MATCH_STR
-	IP_STR
-	"Match prefixlen of nexthop IP address\n"
-	"Match prefixlen of given nexthop\n"
-	"Prefix length\n")
+DEFPY(match_ip_nexthop_prefix_len, match_ip_nexthop_prefix_len_cmd,
+      "match ip next-hop prefix-len (0-32)$length",
+      MATCH_STR IP_STR
+      "Match prefixlen of nexthop IP address\n"
+      "Match prefixlen of given nexthop\n"
+      "Prefix length\n")
 {
 	const char *xpath =
 		"./match-condition[condition='ipv4-next-hop-prefix-length']";
@@ -446,15 +434,12 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	no_match_ip_nexthop_prefix_len, no_match_ip_nexthop_prefix_len_cmd,
-	"no match ip next-hop prefix-len [(0-32)]",
-	NO_STR
-	MATCH_STR
-	IP_STR
-	"Match prefixlen of nexthop IP address\n"
-	"Match prefix length of nexthop\n"
-	"Prefix length\n")
+DEFPY(no_match_ip_nexthop_prefix_len, no_match_ip_nexthop_prefix_len_cmd,
+      "no match ip next-hop prefix-len [(0-32)]",
+      NO_STR MATCH_STR IP_STR
+      "Match prefixlen of nexthop IP address\n"
+      "Match prefix length of nexthop\n"
+      "Prefix length\n")
 {
 	const char *xpath =
 		"./match-condition[condition='ipv4-next-hop-prefix-length']";
@@ -464,12 +449,10 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	match_source_protocol, match_source_protocol_cmd,
-	"match source-protocol " FRR_REDIST_STR_ZEBRA "$proto",
-	MATCH_STR
-	"Match protocol via which the route was learnt\n"
-	FRR_REDIST_HELP_STR_ZEBRA)
+DEFPY(match_source_protocol, match_source_protocol_cmd,
+      "match source-protocol " FRR_REDIST_STR_ZEBRA "$proto",
+      MATCH_STR
+      "Match protocol via which the route was learnt\n" FRR_REDIST_HELP_STR_ZEBRA)
 {
 	const char *xpath = "./match-condition[condition='source-protocol']";
 	char xpath_value[XPATH_MAXLEN];
@@ -482,13 +465,10 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	no_match_source_protocol, no_match_source_protocol_cmd,
-	"no match source-protocol [" FRR_REDIST_STR_ZEBRA "]",
-	NO_STR
-	MATCH_STR
-	"Match protocol via which the route was learnt\n"
-	FRR_REDIST_HELP_STR_ZEBRA)
+DEFPY(no_match_source_protocol, no_match_source_protocol_cmd,
+      "no match source-protocol [" FRR_REDIST_STR_ZEBRA "]",
+      NO_STR MATCH_STR
+      "Match protocol via which the route was learnt\n" FRR_REDIST_HELP_STR_ZEBRA)
 {
 	const char *xpath = "./match-condition[condition='source-protocol']";
 
@@ -497,12 +477,11 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	match_source_instance, match_source_instance_cmd,
-	"match source-instance (0-255)$instance",
-	MATCH_STR
-	"Match the protocol's instance number\n"
-	"The instance number\n")
+DEFPY(match_source_instance, match_source_instance_cmd,
+      "match source-instance (0-255)$instance",
+      MATCH_STR
+      "Match the protocol's instance number\n"
+      "The instance number\n")
 {
 	const char *xpath = "./match-condition[condition='source-instance']";
 	char xpath_value[XPATH_MAXLEN];
@@ -515,12 +494,11 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	no_match_source_instance, no_match_source_instance_cmd,
-	"no match source-instance [(0-255)]",
-	NO_STR MATCH_STR
-	"Match the protocol's instance number\n"
-	"The instance number\n")
+DEFPY(no_match_source_instance, no_match_source_instance_cmd,
+      "no match source-instance [(0-255)]",
+      NO_STR MATCH_STR
+      "Match the protocol's instance number\n"
+      "The instance number\n")
 {
 	const char *xpath = "./match-condition[condition='source-instance']";
 
@@ -531,13 +509,11 @@ DEFPY(
 
 /* set functions */
 
-DEFPY(
-	set_src, set_src_cmd,
-	"set src <A.B.C.D$addrv4|X:X::X:X$addrv6>",
-	SET_STR
-	"src address for route\n"
-	"IPv4 src address\n"
-	"IPv6 src address\n")
+DEFPY(set_src, set_src_cmd, "set src <A.B.C.D$addrv4|X:X::X:X$addrv6>",
+      SET_STR
+      "src address for route\n"
+      "IPv4 src address\n"
+      "IPv6 src address\n")
 {
 	const char *xpath = "./set-action[action='source']";
 	char xpath_value[XPATH_MAXLEN];
@@ -558,14 +534,11 @@ DEFPY(
 	return nb_cli_apply_changes(vty, NULL);
 }
 
-DEFPY(
-	no_set_src, no_set_src_cmd,
-	"no set src [<A.B.C.D|X:X::X:X>]",
-	NO_STR
-	SET_STR
-	"Source address for route\n"
-	"IPv4 address\n"
-	"IPv6 address\n")
+DEFPY(no_set_src, no_set_src_cmd, "no set src [<A.B.C.D|X:X::X:X>]",
+      NO_STR SET_STR
+      "Source address for route\n"
+      "IPv4 address\n"
+      "IPv6 address\n")
 {
 	const char *xpath = "./set-action[action='source']";

If you are a new contributor to FRR, please see our contributing guidelines.

@LabN-CI
Copy link
Collaborator

LabN-CI commented Feb 5, 2020 •
edited
Loading

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/5183 9eb6b53
Date 02/05/2020
Start 12:25:22
Finish 12:51:08
Run-Time 25:46
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2020-02-05-12:25:22.txt
Log autoscript-2020-02-05-12:26:17.log.bz2
Memory 485 480 418

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Feb 5, 2020 •
edited
Loading

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10636/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings 
Report for zebra_northbound.c | 8 issues
===============================================
WARNING: line over 80 characters
#1485: FILE: /tmp/f1-9886/zebra_northbound.c:1485:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length

WARNING: line over 80 characters
#1534: FILE: /tmp/f1-9886/zebra_northbound.c:1534:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length

WARNING: line over 80 characters
#1840: FILE: /tmp/f1-9886/zebra_northbound.c:1840:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/table-id",

WARNING: line over 80 characters
#1842: FILE: /tmp/f1-9886/zebra_northbound.c:1842:
+				.modify = zebra_import_kernel_table_table_id_modify,

WARNING: line over 80 characters
#1843: FILE: /tmp/f1-9886/zebra_northbound.c:1843:
+				.destroy = zebra_import_kernel_table_table_id_destroy,

WARNING: line over 80 characters
#1847: FILE: /tmp/f1-9886/zebra_northbound.c:1847:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/distance",

WARNING: line over 80 characters
#1849: FILE: /tmp/f1-9886/zebra_northbound.c:1849:
+				.modify = zebra_import_kernel_table_distance_modify,

WARNING: line over 80 characters
#1853: FILE: /tmp/f1-9886/zebra_northbound.c:1853:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/route-map",

WARNING: line over 80 characters
#1855: FILE: /tmp/f1-9886/zebra_northbound.c:1855:
+				.modify = zebra_import_kernel_table_route_map_modify,

WARNING: line over 80 characters
#1856: FILE: /tmp/f1-9886/zebra_northbound.c:1856:
+				.destroy = zebra_import_kernel_table_route_map_destroy,

WARNING: line over 80 characters
#1862: FILE: /tmp/f1-9886/zebra_northbound.c:1862:
+				.create = zebra_allow_external_route_update_create,

WARNING: line over 80 characters
#1863: FILE: /tmp/f1-9886/zebra_northbound.c:1863:
+				.destroy = zebra_allow_external_route_update_destroy,

WARNING: line over 80 characters
#1889: FILE: /tmp/f1-9886/zebra_northbound.c:1889:
+				.create = zebra_vrf_vni_mapping_prefix_only_create,

WARNING: line over 80 characters
#1890: FILE: /tmp/f1-9886/zebra_northbound.c:1890:
+				.destroy = zebra_vrf_vni_mapping_prefix_only_destroy,

WARNING: line over 80 characters
#1918: FILE: /tmp/f1-9886/zebra_northbound.c:1918:
+				.destroy = zebra_debugs_debug_zapi_detail_destroy,

WARNING: line over 80 characters
#1929: FILE: /tmp/f1-9886/zebra_northbound.c:1929:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-send",

WARNING: line over 80 characters
#1931: FILE: /tmp/f1-9886/zebra_northbound.c:1931:
+				.modify = zebra_debugs_debug_kernel_msg_send_modify,

WARNING: line over 80 characters
#1932: FILE: /tmp/f1-9886/zebra_northbound.c:1932:
+				.destroy = zebra_debugs_debug_kernel_msg_send_destroy,

WARNING: line over 80 characters
#1936: FILE: /tmp/f1-9886/zebra_northbound.c:1936:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-recv",

WARNING: line over 80 characters
#1938: FILE: /tmp/f1-9886/zebra_northbound.c:1938:
+				.modify = zebra_debugs_debug_kernel_msg_recv_modify,

WARNING: line over 80 characters
#1939: FILE: /tmp/f1-9886/zebra_northbound.c:1939:
+				.destroy = zebra_debugs_debug_kernel_msg_recv_destroy,

WARNING: line over 80 characters
#1953: FILE: /tmp/f1-9886/zebra_northbound.c:1953:
+				.destroy = zebra_debugs_debug_rib_detail_destroy,

WARNING: line over 80 characters
#1974: FILE: /tmp/f1-9886/zebra_northbound.c:1974:
+				.destroy = zebra_debugs_debug_nht_detail_destroy,

WARNING: line over 80 characters
#2008: FILE: /tmp/f1-9886/zebra_northbound.c:2008:
+				.modify = zebra_debugs_debug_dplane_detail_modify,

WARNING: line over 80 characters
#2009: FILE: /tmp/f1-9886/zebra_northbound.c:2009:
+				.destroy = zebra_debugs_debug_dplane_detail_destroy,

WARNING: line over 80 characters
#2104: FILE: /tmp/f1-9886/zebra_northbound.c:2104:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list",

WARNING: line over 80 characters
#2106: FILE: /tmp/f1-9886/zebra_northbound.c:2106:
+				.create = lib_interface_zebra_ip4_addr_list_create,

WARNING: line over 80 characters
#2107: FILE: /tmp/f1-9886/zebra_northbound.c:2107:
+				.destroy = lib_interface_zebra_ip4_addr_list_destroy,

WARNING: line over 80 characters
#2111: FILE: /tmp/f1-9886/zebra_northbound.c:2111:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/ip4-peer",

WARNING: line over 80 characters
#2113: FILE: /tmp/f1-9886/zebra_northbound.c:2113:
+				.modify = lib_interface_zebra_ip4_addr_list_ip4_peer_modify,

WARNING: line over 80 characters
#2114: FILE: /tmp/f1-9886/zebra_northbound.c:2114:
+				.destroy = lib_interface_zebra_ip4_addr_list_ip4_peer_destroy,

WARNING: line over 80 characters
#2118: FILE: /tmp/f1-9886/zebra_northbound.c:2118:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/label",

WARNING: line over 80 characters
#2120: FILE: /tmp/f1-9886/zebra_northbound.c:2120:
+				.modify = lib_interface_zebra_ip4_addr_list_label_modify,

WARNING: line over 80 characters
#2121: FILE: /tmp/f1-9886/zebra_northbound.c:2121:
+				.destroy = lib_interface_zebra_ip4_addr_list_label_destroy,

WARNING: line over 80 characters
#2125: FILE: /tmp/f1-9886/zebra_northbound.c:2125:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list",

WARNING: line over 80 characters
#2127: FILE: /tmp/f1-9886/zebra_northbound.c:2127:
+				.create = lib_interface_zebra_ip6_addr_list_create,

WARNING: line over 80 characters
#2128: FILE: /tmp/f1-9886/zebra_northbound.c:2128:
+				.destroy = lib_interface_zebra_ip6_addr_list_destroy,

WARNING: line over 80 characters
#2132: FILE: /tmp/f1-9886/zebra_northbound.c:2132:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list/label",

WARNING: line over 80 characters
#2134: FILE: /tmp/f1-9886/zebra_northbound.c:2134:
+				.modify = lib_interface_zebra_ip6_addr_list_label_modify,

WARNING: line over 80 characters
#2135: FILE: /tmp/f1-9886/zebra_northbound.c:2135:
+				.destroy = lib_interface_zebra_ip6_addr_list_label_destroy,

WARNING: line over 80 characters
#2139: FILE: /tmp/f1-9886/zebra_northbound.c:2139:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/multicast",

WARNING: line over 80 characters
#2142: FILE: /tmp/f1-9886/zebra_northbound.c:2142:
+				.destroy = lib_interface_zebra_multicast_destroy,

WARNING: line over 80 characters
#2146: FILE: /tmp/f1-9886/zebra_northbound.c:2146:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/link-detect",

WARNING: line over 80 characters
#2148: FILE: /tmp/f1-9886/zebra_northbound.c:2148:
+				.modify = lib_interface_zebra_link_detect_modify,

WARNING: line over 80 characters
#2149: FILE: /tmp/f1-9886/zebra_northbound.c:2149:
+				.destroy = lib_interface_zebra_link_detect_destroy,

WARNING: line over 80 characters
#2153: FILE: /tmp/f1-9886/zebra_northbound.c:2153:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/shutdown",

WARNING: line over 80 characters
#2160: FILE: /tmp/f1-9886/zebra_northbound.c:2160:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/bandwidth",

WARNING: line over 80 characters
#2163: FILE: /tmp/f1-9886/zebra_northbound.c:2163:
+				.destroy = lib_interface_zebra_bandwidth_destroy,

WARNING: line over 80 characters
#2167: FILE: /tmp/f1-9886/zebra_northbound.c:2167:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length",

WARNING: line over 80 characters
#2169: FILE: /tmp/f1-9886/zebra_northbound.c:2169:
+				.modify = lib_route_map_entry_match_condition_ipv4_prefix_length_modify,

WARNING: line over 80 characters
#2170: FILE: /tmp/f1-9886/zebra_northbound.c:2170:
+				.destroy = lib_route_map_entry_match_condition_ipv4_prefix_length_destroy,

WARNING: line over 80 characters
#2174: FILE: /tmp/f1-9886/zebra_northbound.c:2174:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length",

WARNING: line over 80 characters
#2176: FILE: /tmp/f1-9886/zebra_northbound.c:2176:
+				.modify = lib_route_map_entry_match_condition_ipv6_prefix_length_modify,

WARNING: line over 80 characters
#2177: FILE: /tmp/f1-9886/zebra_northbound.c:2177:
+				.destroy = lib_route_map_entry_match_condition_ipv6_prefix_length_destroy,

WARNING: line over 80 characters
#2181: FILE: /tmp/f1-9886/zebra_northbound.c:2181:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-protocol",

WARNING: line over 80 characters
#2183: FILE: /tmp/f1-9886/zebra_northbound.c:2183:
+				.modify = lib_route_map_entry_match_condition_source_protocol_modify,

WARNING: line over 80 characters
#2184: FILE: /tmp/f1-9886/zebra_northbound.c:2184:
+				.destroy = lib_route_map_entry_match_condition_source_protocol_destroy,

WARNING: line over 80 characters
#2188: FILE: /tmp/f1-9886/zebra_northbound.c:2188:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-instance",

WARNING: line over 80 characters
#2190: FILE: /tmp/f1-9886/zebra_northbound.c:2190:
+				.modify = lib_route_map_entry_match_condition_source_instance_modify,

WARNING: line over 80 characters
#2191: FILE: /tmp/f1-9886/zebra_northbound.c:2191:
+				.destroy = lib_route_map_entry_match_condition_source_instance_destroy,

WARNING: line over 80 characters
#2195: FILE: /tmp/f1-9886/zebra_northbound.c:2195:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v4",

WARNING: line over 80 characters
#2197: FILE: /tmp/f1-9886/zebra_northbound.c:2197:
+				.modify = lib_route_map_entry_set_action_source_v4_modify,

WARNING: line over 80 characters
#2198: FILE: /tmp/f1-9886/zebra_northbound.c:2198:
+				.destroy = lib_route_map_entry_set_action_source_v4_destroy,

WARNING: line over 80 characters
#2202: FILE: /tmp/f1-9886/zebra_northbound.c:2202:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v6",

WARNING: line over 80 characters
#2204: FILE: /tmp/f1-9886/zebra_northbound.c:2204:
+				.modify = lib_route_map_entry_set_action_source_v6_modify,

WARNING: line over 80 characters
#2205: FILE: /tmp/f1-9886/zebra_northbound.c:2205:
+				.destroy = lib_route_map_entry_set_action_source_v6_destroy,

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-10636/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: pkg-js-tools-test-is-missing
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200205-08-g9eb6b533c-0 (missing) -> 7.4-dev-20200205-08-g9eb6b533c-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200205-08-g9eb6b533c-0 (missing) -> 7.4-dev-20200205-08-g9eb6b533c-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200205-08-g9eb6b533c-0 (missing) -> 7.4-dev-20200205-08-g9eb6b533c-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200205-08-g9eb6b533c-0 (missing) -> 7.4-dev-20200205-08-g9eb6b533c-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200205-08-g9eb6b533c-0 (missing) -> 7.4-dev-20200205-08-g9eb6b533c-0~deb10u1
<TITLE>clang_check</TITLE>

clang_check

@rzalamena rzalamena marked this pull request as ready for review February 6, 2020 18:49
@rzalamena
Copy link
Member Author

Rebased and tested lightly again.

Spantik
Spantik reviewed Feb 10, 2020
View reviewed changes
yang/frr-zebra.yang
type inet:ipv6-address;
}
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are below protocol interaction commands not required to be taken care?

ip protocol bgp route-map
ROUTE-MAP Route map name

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I missed this one, I was more interested in getting the route-map library part working as an example for other daemons.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so you would be update the same PR or you want to have separate PR for this?

@rzalamena rzalamena removed the blocked We are waiting on a feature implementation from another subsystem that we do not control label Mar 23, 2020
@rzalamena
yang: add all route types enumeration
fe362bf 
This new type will be used by zebra route map match command which is IP
version agnostic.

Signed-off-by: Rafael Zalamena <[email protected]>
@rzalamena
yang: add zebra specific route map options
bc77245 
*   Extend the route map yang model to have zebra enumerations;
*   Add zebra route map specific match/set values;

Signed-off-by: Rafael Zalamena <[email protected]>
@rzalamena
zebra: implement zebra route map northbound
b87fa24 
Add skeleton code for zebra northbound, but implement route map
commands.

Signed-off-by: Rafael Zalamena <[email protected]>
@rzalamena
zebra: migrate route map commands to northbound
07d030e 
Lets use the newly implemented zebra northbound to configure route maps.

Signed-off-by: Rafael Zalamena <[email protected]>
@rzalamena
yang: zebra route map fixes based on feedback
f8978cc 
Fix copy & paste on YANG description and add new route types that
appeared.

Signed-off-by: Rafael Zalamena <[email protected]>
@rzalamena rzalamena force-pushed the zebra-route-map-nb branch from 9eb6b53 to f8978cc Compare March 23, 2020 13:53
@LabN-CI
Copy link
Collaborator

LabN-CI commented Mar 23, 2020 •
edited
Loading

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/5183 f8978cc
Date 03/23/2020
Start 09:55:30
Finish 10:21:20
Run-Time 25:50
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2020-03-23-09:55:30.txt
Log autoscript-2020-03-23-09:56:27.log.bz2
Memory 478 493 418

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Mar 23, 2020 •
edited
Loading

Continuous Integration Result: FAILED

Continuous Integration Result: FAILED

Test incomplete. See below for issues.
CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11385/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Get source / Pull Request: Successful

Building Stage: Successful

Basic Tests: Incomplete

Addresssanitizer topotest: Incomplete (check logs for details)
Successful on other platforms/tests
  • Static analyzer (clang)
  • IPv6 protocols on Ubuntu 14.04
  • Topology tests on Ubuntu 18.04 amd64
  • Fedora 29 rpm pkg check
  • Ubuntu 16.04 deb pkg check
  • Ubuntu 12.04 deb pkg check
  • IPv4 ldp protocol on Ubuntu 16.04
  • Ubuntu 14.04 deb pkg check
  • Debian 8 deb pkg check
  • Topology tests on Ubuntu 16.04 amd64
  • Topotest tests on Ubuntu 16.04 i386
  • IPv4 protocols on Ubuntu 14.04
  • Debian 9 deb pkg check
  • Debian 10 deb pkg check
  • CentOS 7 rpm pkg check

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Mar 23, 2020 •
edited
Loading

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11385/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings 
Report for zebra_northbound.c | 8 issues
===============================================
WARNING: line over 80 characters
#1485: FILE: /tmp/f1-24350/zebra_northbound.c:1485:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length

WARNING: line over 80 characters
#1534: FILE: /tmp/f1-24350/zebra_northbound.c:1534:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length

WARNING: line over 80 characters
#1840: FILE: /tmp/f1-24350/zebra_northbound.c:1840:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/table-id",

WARNING: line over 80 characters
#1842: FILE: /tmp/f1-24350/zebra_northbound.c:1842:
+				.modify = zebra_import_kernel_table_table_id_modify,

WARNING: line over 80 characters
#1843: FILE: /tmp/f1-24350/zebra_northbound.c:1843:
+				.destroy = zebra_import_kernel_table_table_id_destroy,

WARNING: line over 80 characters
#1847: FILE: /tmp/f1-24350/zebra_northbound.c:1847:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/distance",

WARNING: line over 80 characters
#1849: FILE: /tmp/f1-24350/zebra_northbound.c:1849:
+				.modify = zebra_import_kernel_table_distance_modify,

WARNING: line over 80 characters
#1853: FILE: /tmp/f1-24350/zebra_northbound.c:1853:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/route-map",

WARNING: line over 80 characters
#1855: FILE: /tmp/f1-24350/zebra_northbound.c:1855:
+				.modify = zebra_import_kernel_table_route_map_modify,

WARNING: line over 80 characters
#1856: FILE: /tmp/f1-24350/zebra_northbound.c:1856:
+				.destroy = zebra_import_kernel_table_route_map_destroy,

WARNING: line over 80 characters
#1862: FILE: /tmp/f1-24350/zebra_northbound.c:1862:
+				.create = zebra_allow_external_route_update_create,

WARNING: line over 80 characters
#1863: FILE: /tmp/f1-24350/zebra_northbound.c:1863:
+				.destroy = zebra_allow_external_route_update_destroy,

WARNING: line over 80 characters
#1889: FILE: /tmp/f1-24350/zebra_northbound.c:1889:
+				.create = zebra_vrf_vni_mapping_prefix_only_create,

WARNING: line over 80 characters
#1890: FILE: /tmp/f1-24350/zebra_northbound.c:1890:
+				.destroy = zebra_vrf_vni_mapping_prefix_only_destroy,

WARNING: line over 80 characters
#1918: FILE: /tmp/f1-24350/zebra_northbound.c:1918:
+				.destroy = zebra_debugs_debug_zapi_detail_destroy,

WARNING: line over 80 characters
#1929: FILE: /tmp/f1-24350/zebra_northbound.c:1929:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-send",

WARNING: line over 80 characters
#1931: FILE: /tmp/f1-24350/zebra_northbound.c:1931:
+				.modify = zebra_debugs_debug_kernel_msg_send_modify,

WARNING: line over 80 characters
#1932: FILE: /tmp/f1-24350/zebra_northbound.c:1932:
+				.destroy = zebra_debugs_debug_kernel_msg_send_destroy,

WARNING: line over 80 characters
#1936: FILE: /tmp/f1-24350/zebra_northbound.c:1936:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-recv",

WARNING: line over 80 characters
#1938: FILE: /tmp/f1-24350/zebra_northbound.c:1938:
+				.modify = zebra_debugs_debug_kernel_msg_recv_modify,

WARNING: line over 80 characters
#1939: FILE: /tmp/f1-24350/zebra_northbound.c:1939:
+				.destroy = zebra_debugs_debug_kernel_msg_recv_destroy,

WARNING: line over 80 characters
#1953: FILE: /tmp/f1-24350/zebra_northbound.c:1953:
+				.destroy = zebra_debugs_debug_rib_detail_destroy,

WARNING: line over 80 characters
#1974: FILE: /tmp/f1-24350/zebra_northbound.c:1974:
+				.destroy = zebra_debugs_debug_nht_detail_destroy,

WARNING: line over 80 characters
#2008: FILE: /tmp/f1-24350/zebra_northbound.c:2008:
+				.modify = zebra_debugs_debug_dplane_detail_modify,

WARNING: line over 80 characters
#2009: FILE: /tmp/f1-24350/zebra_northbound.c:2009:
+				.destroy = zebra_debugs_debug_dplane_detail_destroy,

WARNING: line over 80 characters
#2104: FILE: /tmp/f1-24350/zebra_northbound.c:2104:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list",

WARNING: line over 80 characters
#2106: FILE: /tmp/f1-24350/zebra_northbound.c:2106:
+				.create = lib_interface_zebra_ip4_addr_list_create,

WARNING: line over 80 characters
#2107: FILE: /tmp/f1-24350/zebra_northbound.c:2107:
+				.destroy = lib_interface_zebra_ip4_addr_list_destroy,

WARNING: line over 80 characters
#2111: FILE: /tmp/f1-24350/zebra_northbound.c:2111:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/ip4-peer",

WARNING: line over 80 characters
#2113: FILE: /tmp/f1-24350/zebra_northbound.c:2113:
+				.modify = lib_interface_zebra_ip4_addr_list_ip4_peer_modify,

WARNING: line over 80 characters
#2114: FILE: /tmp/f1-24350/zebra_northbound.c:2114:
+				.destroy = lib_interface_zebra_ip4_addr_list_ip4_peer_destroy,

WARNING: line over 80 characters
#2118: FILE: /tmp/f1-24350/zebra_northbound.c:2118:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/label",

WARNING: line over 80 characters
#2120: FILE: /tmp/f1-24350/zebra_northbound.c:2120:
+				.modify = lib_interface_zebra_ip4_addr_list_label_modify,

WARNING: line over 80 characters
#2121: FILE: /tmp/f1-24350/zebra_northbound.c:2121:
+				.destroy = lib_interface_zebra_ip4_addr_list_label_destroy,

WARNING: line over 80 characters
#2125: FILE: /tmp/f1-24350/zebra_northbound.c:2125:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list",

WARNING: line over 80 characters
#2127: FILE: /tmp/f1-24350/zebra_northbound.c:2127:
+				.create = lib_interface_zebra_ip6_addr_list_create,

WARNING: line over 80 characters
#2128: FILE: /tmp/f1-24350/zebra_northbound.c:2128:
+				.destroy = lib_interface_zebra_ip6_addr_list_destroy,

WARNING: line over 80 characters
#2132: FILE: /tmp/f1-24350/zebra_northbound.c:2132:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list/label",

WARNING: line over 80 characters
#2134: FILE: /tmp/f1-24350/zebra_northbound.c:2134:
+				.modify = lib_interface_zebra_ip6_addr_list_label_modify,

WARNING: line over 80 characters
#2135: FILE: /tmp/f1-24350/zebra_northbound.c:2135:
+				.destroy = lib_interface_zebra_ip6_addr_list_label_destroy,

WARNING: line over 80 characters
#2139: FILE: /tmp/f1-24350/zebra_northbound.c:2139:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/multicast",

WARNING: line over 80 characters
#2142: FILE: /tmp/f1-24350/zebra_northbound.c:2142:
+				.destroy = lib_interface_zebra_multicast_destroy,

WARNING: line over 80 characters
#2146: FILE: /tmp/f1-24350/zebra_northbound.c:2146:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/link-detect",

WARNING: line over 80 characters
#2148: FILE: /tmp/f1-24350/zebra_northbound.c:2148:
+				.modify = lib_interface_zebra_link_detect_modify,

WARNING: line over 80 characters
#2149: FILE: /tmp/f1-24350/zebra_northbound.c:2149:
+				.destroy = lib_interface_zebra_link_detect_destroy,

WARNING: line over 80 characters
#2153: FILE: /tmp/f1-24350/zebra_northbound.c:2153:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/shutdown",

WARNING: line over 80 characters
#2160: FILE: /tmp/f1-24350/zebra_northbound.c:2160:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/bandwidth",

WARNING: line over 80 characters
#2163: FILE: /tmp/f1-24350/zebra_northbound.c:2163:
+				.destroy = lib_interface_zebra_bandwidth_destroy,

WARNING: line over 80 characters
#2167: FILE: /tmp/f1-24350/zebra_northbound.c:2167:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length",

WARNING: line over 80 characters
#2169: FILE: /tmp/f1-24350/zebra_northbound.c:2169:
+				.modify = lib_route_map_entry_match_condition_ipv4_prefix_length_modify,

WARNING: line over 80 characters
#2170: FILE: /tmp/f1-24350/zebra_northbound.c:2170:
+				.destroy = lib_route_map_entry_match_condition_ipv4_prefix_length_destroy,

WARNING: line over 80 characters
#2174: FILE: /tmp/f1-24350/zebra_northbound.c:2174:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length",

WARNING: line over 80 characters
#2176: FILE: /tmp/f1-24350/zebra_northbound.c:2176:
+				.modify = lib_route_map_entry_match_condition_ipv6_prefix_length_modify,

WARNING: line over 80 characters
#2177: FILE: /tmp/f1-24350/zebra_northbound.c:2177:
+				.destroy = lib_route_map_entry_match_condition_ipv6_prefix_length_destroy,

WARNING: line over 80 characters
#2181: FILE: /tmp/f1-24350/zebra_northbound.c:2181:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-protocol",

WARNING: line over 80 characters
#2183: FILE: /tmp/f1-24350/zebra_northbound.c:2183:
+				.modify = lib_route_map_entry_match_condition_source_protocol_modify,

WARNING: line over 80 characters
#2184: FILE: /tmp/f1-24350/zebra_northbound.c:2184:
+				.destroy = lib_route_map_entry_match_condition_source_protocol_destroy,

WARNING: line over 80 characters
#2188: FILE: /tmp/f1-24350/zebra_northbound.c:2188:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-instance",

WARNING: line over 80 characters
#2190: FILE: /tmp/f1-24350/zebra_northbound.c:2190:
+				.modify = lib_route_map_entry_match_condition_source_instance_modify,

WARNING: line over 80 characters
#2191: FILE: /tmp/f1-24350/zebra_northbound.c:2191:
+				.destroy = lib_route_map_entry_match_condition_source_instance_destroy,

WARNING: line over 80 characters
#2195: FILE: /tmp/f1-24350/zebra_northbound.c:2195:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v4",

WARNING: line over 80 characters
#2197: FILE: /tmp/f1-24350/zebra_northbound.c:2197:
+				.modify = lib_route_map_entry_set_action_source_v4_modify,

WARNING: line over 80 characters
#2198: FILE: /tmp/f1-24350/zebra_northbound.c:2198:
+				.destroy = lib_route_map_entry_set_action_source_v4_destroy,

WARNING: line over 80 characters
#2202: FILE: /tmp/f1-24350/zebra_northbound.c:2202:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v6",

WARNING: line over 80 characters
#2204: FILE: /tmp/f1-24350/zebra_northbound.c:2204:
+				.modify = lib_route_map_entry_set_action_source_v6_modify,

WARNING: line over 80 characters
#2205: FILE: /tmp/f1-24350/zebra_northbound.c:2205:
+				.destroy = lib_route_map_entry_set_action_source_v6_destroy,

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11385/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: pkg-js-tools-test-is-missing
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200323-07-gf8978cc87-0 (missing) -> 7.4-dev-20200323-07-gf8978cc87-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200323-07-gf8978cc87-0 (missing) -> 7.4-dev-20200323-07-gf8978cc87-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200323-07-gf8978cc87-0 (missing) -> 7.4-dev-20200323-07-gf8978cc87-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200323-07-gf8978cc87-0 (missing) -> 7.4-dev-20200323-07-gf8978cc87-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200323-07-gf8978cc87-0 (missing) -> 7.4-dev-20200323-07-gf8978cc87-0~deb10u1

rwestphal
rwestphal reviewed Mar 24, 2020
View reviewed changes
Copy link
Member

@rwestphal rwestphal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, only issue I found is that the cli_show() callbacks are missing.

Also, it would be better if we could split the zebra northbound callbacks into multiple files like we are doing in the other daemons (please see #5186). This is a non-blocking comment though.

@rwestphal
Copy link
Member

Also, it would be better if we could split the zebra northbound callbacks into multiple files like we are doing in the other daemons (please see #5186). This is a non-blocking comment though.

FWIW, #5533 is doing that in the nb_conversions branch,

@rzalamena
lib: show zebra route map configuration in tcli
f42cc96 
Adapt the zebra route map code to use the transaction CLI output (e.g.
the CLI show callbacks) instead of the fallback compatibility.

Signed-off-by: Rafael Zalamena <[email protected]>
@rzalamena rzalamena force-pushed the zebra-route-map-nb branch from 5fa8d33 to f42cc96 Compare March 24, 2020 13:16
@rzalamena
Copy link
Member Author

@rwestphal

Looks good to me, only issue I found is that the cli_show() callbacks are missing.

Yes, sorry I missed this one because the fallback was making it work anyways. Now the code is in place and show configuration candidate should work as expected.

@LabN-CI
Copy link
Collaborator

LabN-CI commented Mar 24, 2020 •
edited
Loading

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/5183 f42cc96
Date 03/24/2020
Start 09:25:25
Finish 09:51:13
Run-Time 25:48
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2020-03-24-09:25:25.txt
Log autoscript-2020-03-24-09:26:24.log.bz2
Memory 457 465 418

For details, please contact louberger

Spantik
Spantik reviewed Mar 24, 2020
View reviewed changes
zebra/zebra_northbound.c
case NB_EV_VALIDATE:
memset(&p, 0, sizeof(p));
yang_dnode_get_ipv4p(&p, dnode, NULL);
if (zebra_check_addr(&p) == 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this check? In yang we are using ipv4-address for this leaf so check should already happen.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That check does more than that and I want to keep the previous behavior.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think these checks can be added in Yang itself with range as well.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

int zebra_check_addr(const struct prefix *p)
{
        if (p->family == AF_INET) {
                uint32_t addr;

                addr = p->u.prefix4.s_addr;
                addr = ntohl(addr);

                if (IPV4_NET127(addr) || IN_CLASSD(addr)
                    || IPV4_LINKLOCAL(addr))
                        return 0;
        }
        if (p->family == AF_INET6) {
                if (IN6_IS_ADDR_LOOPBACK(&p->u.prefix6))
                        return 0;
                if (IN6_IS_ADDR_LINKLOCAL(&p->u.prefix6))
                        return 0;
        }
        return 1;
}

This is quite a lot to check using YANG, I personally think code-level validation is fine in this case. If you think otherwise, maybe propose something different on a separate PR later? I'd like to unlock this one since it's opened for several months already.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure. Having this check does not harm but we can revisit this with separate PR.

zebra/zebra_northbound.c
case NB_EV_VALIDATE:
memset(&p, 0, sizeof(p));
yang_dnode_get_ipv6p(&p, dnode, NULL);
if (zebra_check_addr(&p) == 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above. Check not required.

zebra/zebra_northbound.c

/* Set destroy information. */
switch (condition) {
case 100: /* ipv4-prefix-length */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use macros here?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, is there any automatic generation? Otherwise I'd keep that for another PR (lib/routemap itself would also need this to keep consistency).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing I know of. We can write one later if not already present.

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Mar 24, 2020 •
edited
Loading

Continuous Integration Result: SUCCESSFUL

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11403/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings 
Report for routemap_cli.c | 16 issues
===============================================
< ERROR: space required after that ',' (ctx:VxV)
< #679: FILE: /tmp/f1-1163/routemap_cli.c:679:
< WARNING: line over 80 characters
< #683: FILE: /tmp/f1-1163/routemap_cli.c:683:
< WARNING: line over 80 characters
< #687: FILE: /tmp/f1-1163/routemap_cli.c:687:
< WARNING: line over 80 characters
< #691: FILE: /tmp/f1-1163/routemap_cli.c:691:
< WARNING: line over 80 characters
< #695: FILE: /tmp/f1-1163/routemap_cli.c:695:
< WARNING: line over 80 characters
< #881: FILE: /tmp/f1-1163/routemap_cli.c:881:
< WARNING: line over 80 characters
< #899: FILE: /tmp/f1-1163/routemap_cli.c:899:
< WARNING: line over 80 characters
< #902: FILE: /tmp/f1-1163/routemap_cli.c:902:
Report for zebra_northbound.c | 8 issues
===============================================
WARNING: line over 80 characters
#1485: FILE: /tmp/f1-1163/zebra_northbound.c:1485:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length

WARNING: line over 80 characters
#1534: FILE: /tmp/f1-1163/zebra_northbound.c:1534:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length

WARNING: line over 80 characters
#1840: FILE: /tmp/f1-1163/zebra_northbound.c:1840:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/table-id",

WARNING: line over 80 characters
#1842: FILE: /tmp/f1-1163/zebra_northbound.c:1842:
+				.modify = zebra_import_kernel_table_table_id_modify,

WARNING: line over 80 characters
#1843: FILE: /tmp/f1-1163/zebra_northbound.c:1843:
+				.destroy = zebra_import_kernel_table_table_id_destroy,

WARNING: line over 80 characters
#1847: FILE: /tmp/f1-1163/zebra_northbound.c:1847:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/distance",

WARNING: line over 80 characters
#1849: FILE: /tmp/f1-1163/zebra_northbound.c:1849:
+				.modify = zebra_import_kernel_table_distance_modify,

WARNING: line over 80 characters
#1853: FILE: /tmp/f1-1163/zebra_northbound.c:1853:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/route-map",

WARNING: line over 80 characters
#1855: FILE: /tmp/f1-1163/zebra_northbound.c:1855:
+				.modify = zebra_import_kernel_table_route_map_modify,

WARNING: line over 80 characters
#1856: FILE: /tmp/f1-1163/zebra_northbound.c:1856:
+				.destroy = zebra_import_kernel_table_route_map_destroy,

WARNING: line over 80 characters
#1862: FILE: /tmp/f1-1163/zebra_northbound.c:1862:
+				.create = zebra_allow_external_route_update_create,

WARNING: line over 80 characters
#1863: FILE: /tmp/f1-1163/zebra_northbound.c:1863:
+				.destroy = zebra_allow_external_route_update_destroy,

WARNING: line over 80 characters
#1889: FILE: /tmp/f1-1163/zebra_northbound.c:1889:
+				.create = zebra_vrf_vni_mapping_prefix_only_create,

WARNING: line over 80 characters
#1890: FILE: /tmp/f1-1163/zebra_northbound.c:1890:
+				.destroy = zebra_vrf_vni_mapping_prefix_only_destroy,

WARNING: line over 80 characters
#1918: FILE: /tmp/f1-1163/zebra_northbound.c:1918:
+				.destroy = zebra_debugs_debug_zapi_detail_destroy,

WARNING: line over 80 characters
#1929: FILE: /tmp/f1-1163/zebra_northbound.c:1929:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-send",

WARNING: line over 80 characters
#1931: FILE: /tmp/f1-1163/zebra_northbound.c:1931:
+				.modify = zebra_debugs_debug_kernel_msg_send_modify,

WARNING: line over 80 characters
#1932: FILE: /tmp/f1-1163/zebra_northbound.c:1932:
+				.destroy = zebra_debugs_debug_kernel_msg_send_destroy,

WARNING: line over 80 characters
#1936: FILE: /tmp/f1-1163/zebra_northbound.c:1936:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-recv",

WARNING: line over 80 characters
#1938: FILE: /tmp/f1-1163/zebra_northbound.c:1938:
+				.modify = zebra_debugs_debug_kernel_msg_recv_modify,

WARNING: line over 80 characters
#1939: FILE: /tmp/f1-1163/zebra_northbound.c:1939:
+				.destroy = zebra_debugs_debug_kernel_msg_recv_destroy,

WARNING: line over 80 characters
#1953: FILE: /tmp/f1-1163/zebra_northbound.c:1953:
+				.destroy = zebra_debugs_debug_rib_detail_destroy,

WARNING: line over 80 characters
#1974: FILE: /tmp/f1-1163/zebra_northbound.c:1974:
+				.destroy = zebra_debugs_debug_nht_detail_destroy,

WARNING: line over 80 characters
#2008: FILE: /tmp/f1-1163/zebra_northbound.c:2008:
+				.modify = zebra_debugs_debug_dplane_detail_modify,

WARNING: line over 80 characters
#2009: FILE: /tmp/f1-1163/zebra_northbound.c:2009:
+				.destroy = zebra_debugs_debug_dplane_detail_destroy,

WARNING: line over 80 characters
#2104: FILE: /tmp/f1-1163/zebra_northbound.c:2104:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list",

WARNING: line over 80 characters
#2106: FILE: /tmp/f1-1163/zebra_northbound.c:2106:
+				.create = lib_interface_zebra_ip4_addr_list_create,

WARNING: line over 80 characters
#2107: FILE: /tmp/f1-1163/zebra_northbound.c:2107:
+				.destroy = lib_interface_zebra_ip4_addr_list_destroy,

WARNING: line over 80 characters
#2111: FILE: /tmp/f1-1163/zebra_northbound.c:2111:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/ip4-peer",

WARNING: line over 80 characters
#2113: FILE: /tmp/f1-1163/zebra_northbound.c:2113:
+				.modify = lib_interface_zebra_ip4_addr_list_ip4_peer_modify,

WARNING: line over 80 characters
#2114: FILE: /tmp/f1-1163/zebra_northbound.c:2114:
+				.destroy = lib_interface_zebra_ip4_addr_list_ip4_peer_destroy,

WARNING: line over 80 characters
#2118: FILE: /tmp/f1-1163/zebra_northbound.c:2118:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/label",

WARNING: line over 80 characters
#2120: FILE: /tmp/f1-1163/zebra_northbound.c:2120:
+				.modify = lib_interface_zebra_ip4_addr_list_label_modify,

WARNING: line over 80 characters
#2121: FILE: /tmp/f1-1163/zebra_northbound.c:2121:
+				.destroy = lib_interface_zebra_ip4_addr_list_label_destroy,

WARNING: line over 80 characters
#2125: FILE: /tmp/f1-1163/zebra_northbound.c:2125:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list",

WARNING: line over 80 characters
#2127: FILE: /tmp/f1-1163/zebra_northbound.c:2127:
+				.create = lib_interface_zebra_ip6_addr_list_create,

WARNING: line over 80 characters
#2128: FILE: /tmp/f1-1163/zebra_northbound.c:2128:
+				.destroy = lib_interface_zebra_ip6_addr_list_destroy,

WARNING: line over 80 characters
#2132: FILE: /tmp/f1-1163/zebra_northbound.c:2132:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list/label",

WARNING: line over 80 characters
#2134: FILE: /tmp/f1-1163/zebra_northbound.c:2134:
+				.modify = lib_interface_zebra_ip6_addr_list_label_modify,

WARNING: line over 80 characters
#2135: FILE: /tmp/f1-1163/zebra_northbound.c:2135:
+				.destroy = lib_interface_zebra_ip6_addr_list_label_destroy,

WARNING: line over 80 characters
#2139: FILE: /tmp/f1-1163/zebra_northbound.c:2139:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/multicast",

WARNING: line over 80 characters
#2142: FILE: /tmp/f1-1163/zebra_northbound.c:2142:
+				.destroy = lib_interface_zebra_multicast_destroy,

WARNING: line over 80 characters
#2146: FILE: /tmp/f1-1163/zebra_northbound.c:2146:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/link-detect",

WARNING: line over 80 characters
#2148: FILE: /tmp/f1-1163/zebra_northbound.c:2148:
+				.modify = lib_interface_zebra_link_detect_modify,

WARNING: line over 80 characters
#2149: FILE: /tmp/f1-1163/zebra_northbound.c:2149:
+				.destroy = lib_interface_zebra_link_detect_destroy,

WARNING: line over 80 characters
#2153: FILE: /tmp/f1-1163/zebra_northbound.c:2153:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/shutdown",

WARNING: line over 80 characters
#2160: FILE: /tmp/f1-1163/zebra_northbound.c:2160:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/bandwidth",

WARNING: line over 80 characters
#2163: FILE: /tmp/f1-1163/zebra_northbound.c:2163:
+				.destroy = lib_interface_zebra_bandwidth_destroy,

WARNING: line over 80 characters
#2167: FILE: /tmp/f1-1163/zebra_northbound.c:2167:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length",

WARNING: line over 80 characters
#2169: FILE: /tmp/f1-1163/zebra_northbound.c:2169:
+				.modify = lib_route_map_entry_match_condition_ipv4_prefix_length_modify,

WARNING: line over 80 characters
#2170: FILE: /tmp/f1-1163/zebra_northbound.c:2170:
+				.destroy = lib_route_map_entry_match_condition_ipv4_prefix_length_destroy,

WARNING: line over 80 characters
#2174: FILE: /tmp/f1-1163/zebra_northbound.c:2174:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length",

WARNING: line over 80 characters
#2176: FILE: /tmp/f1-1163/zebra_northbound.c:2176:
+				.modify = lib_route_map_entry_match_condition_ipv6_prefix_length_modify,

WARNING: line over 80 characters
#2177: FILE: /tmp/f1-1163/zebra_northbound.c:2177:
+				.destroy = lib_route_map_entry_match_condition_ipv6_prefix_length_destroy,

WARNING: line over 80 characters
#2181: FILE: /tmp/f1-1163/zebra_northbound.c:2181:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-protocol",

WARNING: line over 80 characters
#2183: FILE: /tmp/f1-1163/zebra_northbound.c:2183:
+				.modify = lib_route_map_entry_match_condition_source_protocol_modify,

WARNING: line over 80 characters
#2184: FILE: /tmp/f1-1163/zebra_northbound.c:2184:
+				.destroy = lib_route_map_entry_match_condition_source_protocol_destroy,

WARNING: line over 80 characters
#2188: FILE: /tmp/f1-1163/zebra_northbound.c:2188:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-instance",

WARNING: line over 80 characters
#2190: FILE: /tmp/f1-1163/zebra_northbound.c:2190:
+				.modify = lib_route_map_entry_match_condition_source_instance_modify,

WARNING: line over 80 characters
#2191: FILE: /tmp/f1-1163/zebra_northbound.c:2191:
+				.destroy = lib_route_map_entry_match_condition_source_instance_destroy,

WARNING: line over 80 characters
#2195: FILE: /tmp/f1-1163/zebra_northbound.c:2195:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v4",

WARNING: line over 80 characters
#2197: FILE: /tmp/f1-1163/zebra_northbound.c:2197:
+				.modify = lib_route_map_entry_set_action_source_v4_modify,

WARNING: line over 80 characters
#2198: FILE: /tmp/f1-1163/zebra_northbound.c:2198:
+				.destroy = lib_route_map_entry_set_action_source_v4_destroy,

WARNING: line over 80 characters
#2202: FILE: /tmp/f1-1163/zebra_northbound.c:2202:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v6",

WARNING: line over 80 characters
#2204: FILE: /tmp/f1-1163/zebra_northbound.c:2204:
+				.modify = lib_route_map_entry_set_action_source_v6_modify,

WARNING: line over 80 characters
#2205: FILE: /tmp/f1-1163/zebra_northbound.c:2205:
+				.destroy = lib_route_map_entry_set_action_source_v6_destroy,

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11403/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: pkg-js-tools-test-is-missing
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200324-00-gf42cc9655-0 (missing) -> 7.4-dev-20200324-00-gf42cc9655-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200324-00-gf42cc9655-0 (missing) -> 7.4-dev-20200324-00-gf42cc9655-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200324-00-gf42cc9655-0 (missing) -> 7.4-dev-20200324-00-gf42cc9655-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200324-00-gf42cc9655-0 (missing) -> 7.4-dev-20200324-00-gf42cc9655-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200324-00-gf42cc9655-0 (missing) -> 7.4-dev-20200324-00-gf42cc9655-0~deb10u1

@rzalamena
yang: unionize IPv4/IPv6 route types
2c3e1f1 
Use a union to join the route types declaration instead of
copying/pasting them.

Signed-off-by: Rafael Zalamena <[email protected]>
rwestphal
rwestphal approved these changes Mar 25, 2020
View reviewed changes
Copy link
Member

@rwestphal rwestphal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@LabN-CI
Copy link
Collaborator

LabN-CI commented Mar 25, 2020

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/5183 2c3e1f1
Date 03/25/2020
Start 11:30:25
Finish 11:56:19
Run-Time 25:54
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2020-03-25-11:30:25.txt
Log autoscript-2020-03-25-11:31:23.log.bz2
Memory 471 438 418

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF / OpenSourceRouting.org CI System

CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11435/

This is a comment from an automated CI system.
For questions and feedback in regards to this CI system, please feel free to email
Martin Winter - mwinter (at) opensourcerouting.org.

Warnings Generated during build:

Checkout code: Successful with additional warnings 
Report for routemap_cli.c | 16 issues
===============================================
< ERROR: space required after that ',' (ctx:VxV)
< #679: FILE: /tmp/f1-9001/routemap_cli.c:679:
< WARNING: line over 80 characters
< #683: FILE: /tmp/f1-9001/routemap_cli.c:683:
< WARNING: line over 80 characters
< #687: FILE: /tmp/f1-9001/routemap_cli.c:687:
< WARNING: line over 80 characters
< #691: FILE: /tmp/f1-9001/routemap_cli.c:691:
< WARNING: line over 80 characters
< #695: FILE: /tmp/f1-9001/routemap_cli.c:695:
< WARNING: line over 80 characters
< #881: FILE: /tmp/f1-9001/routemap_cli.c:881:
< WARNING: line over 80 characters
< #899: FILE: /tmp/f1-9001/routemap_cli.c:899:
< WARNING: line over 80 characters
< #902: FILE: /tmp/f1-9001/routemap_cli.c:902:
Report for zebra_northbound.c | 8 issues
===============================================
WARNING: line over 80 characters
#1485: FILE: /tmp/f1-9001/zebra_northbound.c:1485:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length

WARNING: line over 80 characters
#1534: FILE: /tmp/f1-9001/zebra_northbound.c:1534:
+ * /frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length

WARNING: line over 80 characters
#1840: FILE: /tmp/f1-9001/zebra_northbound.c:1840:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/table-id",

WARNING: line over 80 characters
#1842: FILE: /tmp/f1-9001/zebra_northbound.c:1842:
+				.modify = zebra_import_kernel_table_table_id_modify,

WARNING: line over 80 characters
#1843: FILE: /tmp/f1-9001/zebra_northbound.c:1843:
+				.destroy = zebra_import_kernel_table_table_id_destroy,

WARNING: line over 80 characters
#1847: FILE: /tmp/f1-9001/zebra_northbound.c:1847:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/distance",

WARNING: line over 80 characters
#1849: FILE: /tmp/f1-9001/zebra_northbound.c:1849:
+				.modify = zebra_import_kernel_table_distance_modify,

WARNING: line over 80 characters
#1853: FILE: /tmp/f1-9001/zebra_northbound.c:1853:
+			.xpath = "/frr-zebra:zebra/import-kernel-table/route-map",

WARNING: line over 80 characters
#1855: FILE: /tmp/f1-9001/zebra_northbound.c:1855:
+				.modify = zebra_import_kernel_table_route_map_modify,

WARNING: line over 80 characters
#1856: FILE: /tmp/f1-9001/zebra_northbound.c:1856:
+				.destroy = zebra_import_kernel_table_route_map_destroy,

WARNING: line over 80 characters
#1862: FILE: /tmp/f1-9001/zebra_northbound.c:1862:
+				.create = zebra_allow_external_route_update_create,

WARNING: line over 80 characters
#1863: FILE: /tmp/f1-9001/zebra_northbound.c:1863:
+				.destroy = zebra_allow_external_route_update_destroy,

WARNING: line over 80 characters
#1889: FILE: /tmp/f1-9001/zebra_northbound.c:1889:
+				.create = zebra_vrf_vni_mapping_prefix_only_create,

WARNING: line over 80 characters
#1890: FILE: /tmp/f1-9001/zebra_northbound.c:1890:
+				.destroy = zebra_vrf_vni_mapping_prefix_only_destroy,

WARNING: line over 80 characters
#1918: FILE: /tmp/f1-9001/zebra_northbound.c:1918:
+				.destroy = zebra_debugs_debug_zapi_detail_destroy,

WARNING: line over 80 characters
#1929: FILE: /tmp/f1-9001/zebra_northbound.c:1929:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-send",

WARNING: line over 80 characters
#1931: FILE: /tmp/f1-9001/zebra_northbound.c:1931:
+				.modify = zebra_debugs_debug_kernel_msg_send_modify,

WARNING: line over 80 characters
#1932: FILE: /tmp/f1-9001/zebra_northbound.c:1932:
+				.destroy = zebra_debugs_debug_kernel_msg_send_destroy,

WARNING: line over 80 characters
#1936: FILE: /tmp/f1-9001/zebra_northbound.c:1936:
+			.xpath = "/frr-zebra:zebra/debugs/debug-kernel-msg-recv",

WARNING: line over 80 characters
#1938: FILE: /tmp/f1-9001/zebra_northbound.c:1938:
+				.modify = zebra_debugs_debug_kernel_msg_recv_modify,

WARNING: line over 80 characters
#1939: FILE: /tmp/f1-9001/zebra_northbound.c:1939:
+				.destroy = zebra_debugs_debug_kernel_msg_recv_destroy,

WARNING: line over 80 characters
#1953: FILE: /tmp/f1-9001/zebra_northbound.c:1953:
+				.destroy = zebra_debugs_debug_rib_detail_destroy,

WARNING: line over 80 characters
#1974: FILE: /tmp/f1-9001/zebra_northbound.c:1974:
+				.destroy = zebra_debugs_debug_nht_detail_destroy,

WARNING: line over 80 characters
#2008: FILE: /tmp/f1-9001/zebra_northbound.c:2008:
+				.modify = zebra_debugs_debug_dplane_detail_modify,

WARNING: line over 80 characters
#2009: FILE: /tmp/f1-9001/zebra_northbound.c:2009:
+				.destroy = zebra_debugs_debug_dplane_detail_destroy,

WARNING: line over 80 characters
#2104: FILE: /tmp/f1-9001/zebra_northbound.c:2104:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list",

WARNING: line over 80 characters
#2106: FILE: /tmp/f1-9001/zebra_northbound.c:2106:
+				.create = lib_interface_zebra_ip4_addr_list_create,

WARNING: line over 80 characters
#2107: FILE: /tmp/f1-9001/zebra_northbound.c:2107:
+				.destroy = lib_interface_zebra_ip4_addr_list_destroy,

WARNING: line over 80 characters
#2111: FILE: /tmp/f1-9001/zebra_northbound.c:2111:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/ip4-peer",

WARNING: line over 80 characters
#2113: FILE: /tmp/f1-9001/zebra_northbound.c:2113:
+				.modify = lib_interface_zebra_ip4_addr_list_ip4_peer_modify,

WARNING: line over 80 characters
#2114: FILE: /tmp/f1-9001/zebra_northbound.c:2114:
+				.destroy = lib_interface_zebra_ip4_addr_list_ip4_peer_destroy,

WARNING: line over 80 characters
#2118: FILE: /tmp/f1-9001/zebra_northbound.c:2118:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip4-addr-list/label",

WARNING: line over 80 characters
#2120: FILE: /tmp/f1-9001/zebra_northbound.c:2120:
+				.modify = lib_interface_zebra_ip4_addr_list_label_modify,

WARNING: line over 80 characters
#2121: FILE: /tmp/f1-9001/zebra_northbound.c:2121:
+				.destroy = lib_interface_zebra_ip4_addr_list_label_destroy,

WARNING: line over 80 characters
#2125: FILE: /tmp/f1-9001/zebra_northbound.c:2125:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list",

WARNING: line over 80 characters
#2127: FILE: /tmp/f1-9001/zebra_northbound.c:2127:
+				.create = lib_interface_zebra_ip6_addr_list_create,

WARNING: line over 80 characters
#2128: FILE: /tmp/f1-9001/zebra_northbound.c:2128:
+				.destroy = lib_interface_zebra_ip6_addr_list_destroy,

WARNING: line over 80 characters
#2132: FILE: /tmp/f1-9001/zebra_northbound.c:2132:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/ip6-addr-list/label",

WARNING: line over 80 characters
#2134: FILE: /tmp/f1-9001/zebra_northbound.c:2134:
+				.modify = lib_interface_zebra_ip6_addr_list_label_modify,

WARNING: line over 80 characters
#2135: FILE: /tmp/f1-9001/zebra_northbound.c:2135:
+				.destroy = lib_interface_zebra_ip6_addr_list_label_destroy,

WARNING: line over 80 characters
#2139: FILE: /tmp/f1-9001/zebra_northbound.c:2139:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/multicast",

WARNING: line over 80 characters
#2142: FILE: /tmp/f1-9001/zebra_northbound.c:2142:
+				.destroy = lib_interface_zebra_multicast_destroy,

WARNING: line over 80 characters
#2146: FILE: /tmp/f1-9001/zebra_northbound.c:2146:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/link-detect",

WARNING: line over 80 characters
#2148: FILE: /tmp/f1-9001/zebra_northbound.c:2148:
+				.modify = lib_interface_zebra_link_detect_modify,

WARNING: line over 80 characters
#2149: FILE: /tmp/f1-9001/zebra_northbound.c:2149:
+				.destroy = lib_interface_zebra_link_detect_destroy,

WARNING: line over 80 characters
#2153: FILE: /tmp/f1-9001/zebra_northbound.c:2153:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/shutdown",

WARNING: line over 80 characters
#2160: FILE: /tmp/f1-9001/zebra_northbound.c:2160:
+			.xpath = "/frr-interface:lib/interface/frr-zebra:zebra/bandwidth",

WARNING: line over 80 characters
#2163: FILE: /tmp/f1-9001/zebra_northbound.c:2163:
+				.destroy = lib_interface_zebra_bandwidth_destroy,

WARNING: line over 80 characters
#2167: FILE: /tmp/f1-9001/zebra_northbound.c:2167:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv4-prefix-length",

WARNING: line over 80 characters
#2169: FILE: /tmp/f1-9001/zebra_northbound.c:2169:
+				.modify = lib_route_map_entry_match_condition_ipv4_prefix_length_modify,

WARNING: line over 80 characters
#2170: FILE: /tmp/f1-9001/zebra_northbound.c:2170:
+				.destroy = lib_route_map_entry_match_condition_ipv4_prefix_length_destroy,

WARNING: line over 80 characters
#2174: FILE: /tmp/f1-9001/zebra_northbound.c:2174:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:ipv6-prefix-length",

WARNING: line over 80 characters
#2176: FILE: /tmp/f1-9001/zebra_northbound.c:2176:
+				.modify = lib_route_map_entry_match_condition_ipv6_prefix_length_modify,

WARNING: line over 80 characters
#2177: FILE: /tmp/f1-9001/zebra_northbound.c:2177:
+				.destroy = lib_route_map_entry_match_condition_ipv6_prefix_length_destroy,

WARNING: line over 80 characters
#2181: FILE: /tmp/f1-9001/zebra_northbound.c:2181:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-protocol",

WARNING: line over 80 characters
#2183: FILE: /tmp/f1-9001/zebra_northbound.c:2183:
+				.modify = lib_route_map_entry_match_condition_source_protocol_modify,

WARNING: line over 80 characters
#2184: FILE: /tmp/f1-9001/zebra_northbound.c:2184:
+				.destroy = lib_route_map_entry_match_condition_source_protocol_destroy,

WARNING: line over 80 characters
#2188: FILE: /tmp/f1-9001/zebra_northbound.c:2188:
+			.xpath = "/frr-route-map:lib/route-map/entry/match-condition/frr-zebra:source-instance",

WARNING: line over 80 characters
#2190: FILE: /tmp/f1-9001/zebra_northbound.c:2190:
+				.modify = lib_route_map_entry_match_condition_source_instance_modify,

WARNING: line over 80 characters
#2191: FILE: /tmp/f1-9001/zebra_northbound.c:2191:
+				.destroy = lib_route_map_entry_match_condition_source_instance_destroy,

WARNING: line over 80 characters
#2195: FILE: /tmp/f1-9001/zebra_northbound.c:2195:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v4",

WARNING: line over 80 characters
#2197: FILE: /tmp/f1-9001/zebra_northbound.c:2197:
+				.modify = lib_route_map_entry_set_action_source_v4_modify,

WARNING: line over 80 characters
#2198: FILE: /tmp/f1-9001/zebra_northbound.c:2198:
+				.destroy = lib_route_map_entry_set_action_source_v4_destroy,

WARNING: line over 80 characters
#2202: FILE: /tmp/f1-9001/zebra_northbound.c:2202:
+			.xpath = "/frr-route-map:lib/route-map/entry/set-action/frr-zebra:source-v6",

WARNING: line over 80 characters
#2204: FILE: /tmp/f1-9001/zebra_northbound.c:2204:
+				.modify = lib_route_map_entry_set_action_source_v6_modify,

WARNING: line over 80 characters
#2205: FILE: /tmp/f1-9001/zebra_northbound.c:2205:
+				.destroy = lib_route_map_entry_set_action_source_v6_destroy,

Warnings Generated during build:

Debian 10 amd64 build: Successful with additional warnings

Debian Package lintian failed for Debian 10 amd64 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-11435/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: pkg-js-tools-test-is-missing
W: frr source: pkg-js-tools-test-is-missing
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200325-00-g2c3e1f1f3-0 (missing) -> 7.4-dev-20200325-00-g2c3e1f1f3-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200325-00-g2c3e1f1f3-0 (missing) -> 7.4-dev-20200325-00-g2c3e1f1f3-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200325-00-g2c3e1f1f3-0 (missing) -> 7.4-dev-20200325-00-g2c3e1f1f3-0~deb10u1
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200325-00-g2c3e1f1f3-0 (missing) -> 7.4-dev-20200325-00-g2c3e1f1f3-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.4-dev-20200325-00-g2c3e1f1f3-0 (missing) -> 7.4-dev-20200325-00-g2c3e1f1f3-0~deb10u1

Spantik
Spantik approved these changes Mar 31, 2020
View reviewed changes
Copy link
Member

@Spantik Spantik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. We can revisit few changes for front-end validation later in different PR.

@qlyoung qlyoung merged commit e0bf205 into FRRouting:master Mar 31, 2020
@rzalamena rzalamena deleted the zebra-route-map-nb branch April 15, 2020 18:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rwestphal rwestphal rwestphal approved these changes

@polychaeta polychaeta polychaeta left review comments

@Spantik Spantik Spantik approved these changes

@qlyoung qlyoung Awaiting requested review from qlyoung

Assignees
No one assigned
Labels
libfrr yang zebra
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@rzalamena @LabN-CI @NetDEF-CI @rwestphal @polychaeta @Spantik @qlyoung