]> git.puffer.fish Git - mirror/frr.git/commitdiff
staticd: fix warning when creating routes without SR-TE colors 6955/head
authorRenato Westphal <renato@opensourcerouting.org>
Wed, 19 Aug 2020 22:48:21 +0000 (19:48 -0300)
committerRenato Westphal <renato@opensourcerouting.org>
Wed, 19 Aug 2020 23:07:01 +0000 (20:07 -0300)
The SR-TE color YANG leaf is optional so it shouldn't be created
unconditionally (it doesn't have a default value).

Fixes warnings like this when routes are created without specifying
a SR-TE color:
STATIC: libyang: Invalid value "" in "srte-color" element.
(/frr-routing:routing/control-plane-protocols/control-plane-protocol[type='frr-s
taticd:staticd'][name='staticd'][vrf='default']/frr-staticd:staticd/route-list[p
refix='99.0.0.1/32'][afi-safi='frr-routing:ipv4-unicast']/path-list[distance='1'
]/frr-nexthops/nexthop[nh-type='ip4'][vrf='default'][gateway='192.168.1.2'][inte
rface='(null)']/srte-color)

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
staticd/static_vty.c

index ba1a8f9a257965de6468dac096a3bfcad702c885..476340693442f669ad7251e00f13c12c25191ec4 100644 (file)
@@ -257,8 +257,9 @@ static int static_route_leak(struct vty *vty, const char *svrf,
                        strlcpy(ab_xpath, xpath_nexthop, sizeof(ab_xpath));
                        strlcat(ab_xpath, FRR_STATIC_ROUTE_NH_COLOR_XPATH,
                                sizeof(ab_xpath));
-                       nb_cli_enqueue_change(vty, ab_xpath, NB_OP_MODIFY,
-                                             color_str);
+                       if (color_str)
+                               nb_cli_enqueue_change(vty, ab_xpath,
+                                                     NB_OP_MODIFY, color_str);
                }
                if (label_str) {
                        /* copy of label string (start) */