staticd: output config using NB callbacks instead of operational data #9410
Conversation
There was a problem hiding this comment.
Thanks for your contribution to FRR!
Click for style suggestions
To apply these suggestions:
curl -s https://gist.githubusercontent.com/polychaeta/742baafd1c125fed1245b00034097b25/raw/c8fcc505a8ffcba5aa8edf078a8e407f33d23db8/cr_9410_1629135091.diff | git apply
diff --git a/staticd/static_vrf.c b/staticd/static_vrf.c
index 265757260..c8900eb49 100644
--- a/staticd/static_vrf.c
+++ b/staticd/static_vrf.c
@@ -153,8 +153,7 @@ static int static_vrf_config_write(struct vty *vty)
struct lyd_node *dnode;
int written = 0;
- dnode = yang_dnode_get(running_config->dnode,
- "/frr-routing:routing");
+ dnode = yang_dnode_get(running_config->dnode, "/frr-routing:routing");
if (dnode) {
nb_cli_show_dnode_cmds(vty, dnode, false);
written = 1;
diff --git a/staticd/static_vty.c b/staticd/static_vty.c
index cc875bb2a..7863dd45a 100644
--- a/staticd/static_vty.c
+++ b/staticd/static_vty.c
@@ -1043,7 +1043,8 @@ static int mpls_label_iter_cb(const struct lyd_node *dnode, void *arg)
}
static void nexthop_cli_show(struct vty *vty, const struct lyd_node *route,
- const struct lyd_node *src, const struct lyd_node *path,
+ const struct lyd_node *src,
+ const struct lyd_node *path,
const struct lyd_node *nexthop, bool show_defaults)
{
const char *vrf;
@@ -1119,12 +1120,12 @@ static void nexthop_cli_show(struct vty *vty, const struct lyd_node *route,
if (yang_dnode_exists(path, "./tag")) {
tag = yang_dnode_get_uint32(path, "./tag");
if (tag != 0 || show_defaults)
- vty_out(vty, " tag %"PRIu32, tag);
+ vty_out(vty, " tag %" PRIu32, tag);
}
distance = yang_dnode_get_uint8(path, "./distance");
if (distance != ZEBRA_STATIC_DISTANCE_DEFAULT || show_defaults)
- vty_out(vty, " %"PRIu8, distance);
+ vty_out(vty, " %" PRIu8, distance);
iter.vty = vty;
iter.first = true;
@@ -1137,7 +1138,7 @@ static void nexthop_cli_show(struct vty *vty, const struct lyd_node *route,
table_id = yang_dnode_get_uint32(path, "./table-id");
if (table_id || show_defaults)
- vty_out(vty, " table %"PRIu32, table_id);
+ vty_out(vty, " table %" PRIu32, table_id);
if (yang_dnode_exists(nexthop, "./onlink")) {
onlink = yang_dnode_get_bool(nexthop, "./onlink");
@@ -1153,10 +1154,11 @@ static void nexthop_cli_show(struct vty *vty, const struct lyd_node *route,
}
void static_nexthop_cli_show(struct vty *vty, struct lyd_node *dnode,
- bool show_defaults)
+ bool show_defaults)
{
const struct lyd_node *path = yang_dnode_get_parent(dnode, "path-list");
- const struct lyd_node *route = yang_dnode_get_parent(path, "route-list");
+ const struct lyd_node *route =
+ yang_dnode_get_parent(path, "route-list");
nexthop_cli_show(vty, route, NULL, path, dnode, show_defaults);
}
@@ -1173,7 +1175,7 @@ void static_src_nexthop_cli_show(struct vty *vty, struct lyd_node *dnode,
int static_nexthop_cli_cmp(struct lyd_node *dnode1, struct lyd_node *dnode2)
{
-
+
enum static_nh_type nh_type1, nh_type2;
struct prefix prefix1, prefix2;
int ret;
@@ -1215,13 +1217,11 @@ int static_nexthop_cli_cmp(struct lyd_node *dnode1, struct lyd_node *dnode2)
if (ret)
return ret;
- return if_cmp_name_func(
- yang_dnode_get_string(dnode1, "./vrf"),
- yang_dnode_get_string(dnode2, "./vrf"));
+ return if_cmp_name_func(yang_dnode_get_string(dnode1, "./vrf"),
+ yang_dnode_get_string(dnode2, "./vrf"));
}
-int static_route_list_cli_cmp(struct lyd_node *dnode1,
- struct lyd_node *dnode2)
+int static_route_list_cli_cmp(struct lyd_node *dnode1, struct lyd_node *dnode2)
{
const char *afi_safi1, *afi_safi2;
afi_t afi1, afi2;
diff --git a/staticd/static_vty.h b/staticd/static_vty.h
index 4482d2b6c..8861afa46 100644
--- a/staticd/static_vty.h
+++ b/staticd/static_vty.h
@@ -24,15 +24,14 @@ extern "C" {
#endif
void static_cli_show(struct vty *vty, struct lyd_node *dnode,
- bool show_defaults);
+ bool show_defaults);
void static_cli_show_end(struct vty *vty, struct lyd_node *dnode);
void static_nexthop_cli_show(struct vty *vty, struct lyd_node *dnode,
- bool show_defaults);
+ bool show_defaults);
void static_src_nexthop_cli_show(struct vty *vty, struct lyd_node *dnode,
- bool show_defaults);
+ bool show_defaults);
int static_nexthop_cli_cmp(struct lyd_node *dnode1, struct lyd_node *dnode2);
-int static_route_list_cli_cmp(struct lyd_node *dnode1,
- struct lyd_node *dnode2);
+int static_route_list_cli_cmp(struct lyd_node *dnode1, struct lyd_node *dnode2);
int static_src_list_cli_cmp(struct lyd_node *dnode1, struct lyd_node *dnode2);
int static_path_list_cli_cmp(struct lyd_node *dnode1, struct lyd_node *dnode2);
If you are a new contributor to FRR, please see our contributing guidelines.
After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.
idryzhov
force-pushed
the
static-show-run-nb
branch
from
8913ecc to
830aa0a
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedNetBSD 8 amd64 build: Failed (click for details)NetBSD 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI012BUILD/config.log/config.log.gzMake failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI012BUILD/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U1604I386/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI021BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U1804AMD64/config.status/config.status Ubuntu 18.04 arm7 build: Failed (click for details)Make failed for Ubuntu 18.04 arm7 build: Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz> Ubuntu 20.04 amd64 build: Failed (click for details)Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U2004AMD64BUILD/config.status/config.statusMake failed for Ubuntu 20.04 amd64 build: Ubuntu 20.04 amd64 build: Unknown Log <config.log.gz> Ubuntu 18.04 arm8 build: Failed (click for details)Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U18ARM8BUILD/config.log/config.log.gzMake failed for Ubuntu 18.04 arm8 build: Debian 11 amd64 build: Failed (click for details)Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/DEB11AMD64/config.status/config.statusMake failed for Debian 11 amd64 build: Debian 11 amd64 build: Unknown Log <config.log.gz> Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U1804PPC64LEBUILD/config.status/config.status Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/F29BUILD/config.status/config.status Ubuntu 16.04 arm8 build: Failed (click for details)Make failed for Ubuntu 16.04 arm8 build: Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz> FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI009BUILD/config.status/config.status CentOS 8 amd64 build: Failed (click for details)CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CENTOS8BUILD/config.status/config.statusMake failed for CentOS 8 amd64 build: CentOS 8 amd64 build: Unknown Log <config.log.gz> Ubuntu 16.04 arm7 build: Failed (click for details)Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI101BUILD/config.log/config.log.gzMake failed for Ubuntu 16.04 arm7 build: Debian 10 amd64 build: Failed (click for details)Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/DEB10BUILD/config.log/config.log.gzMake failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/DEB10BUILD/config.status/config.status Ubuntu 18.04 i386 build: Failed (click for details)Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U18I386BUILD/config.log/config.log.gz Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U18I386BUILD/config.status/config.statusMake failed for Ubuntu 18.04 i386 build: FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/FBSD12AMD64/config.status/config.status Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsNetBSD 8 amd64 build: Failed (click for details)NetBSD 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI012BUILD/config.log/config.log.gzMake failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI012BUILD/config.status/config.status Ubuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U1604I386/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI021BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI014BUILD/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U1804AMD64/config.status/config.status Ubuntu 18.04 arm7 build: Failed (click for details)Make failed for Ubuntu 18.04 arm7 build: Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz> Ubuntu 20.04 amd64 build: Failed (click for details)Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U2004AMD64BUILD/config.status/config.statusMake failed for Ubuntu 20.04 amd64 build: Ubuntu 20.04 amd64 build: Unknown Log <config.log.gz> Ubuntu 18.04 arm8 build: Failed (click for details)Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U18ARM8BUILD/config.log/config.log.gzMake failed for Ubuntu 18.04 arm8 build: Debian 11 amd64 build: Failed (click for details)Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/DEB11AMD64/config.status/config.statusMake failed for Debian 11 amd64 build: Debian 11 amd64 build: Unknown Log <config.log.gz> Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U1804PPC64LEBUILD/config.status/config.status Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/F29BUILD/config.status/config.status Ubuntu 16.04 arm8 build: Failed (click for details)Make failed for Ubuntu 16.04 arm8 build: Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz> FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI009BUILD/config.status/config.status CentOS 8 amd64 build: Failed (click for details)CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CENTOS8BUILD/config.status/config.statusMake failed for CentOS 8 amd64 build: CentOS 8 amd64 build: Unknown Log <config.log.gz> Ubuntu 16.04 arm7 build: Failed (click for details)Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/CI101BUILD/config.log/config.log.gzMake failed for Ubuntu 16.04 arm7 build: Debian 10 amd64 build: Failed (click for details)Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/DEB10BUILD/config.log/config.log.gzMake failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/DEB10BUILD/config.status/config.status Ubuntu 18.04 i386 build: Failed (click for details)Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U18I386BUILD/config.log/config.log.gz Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/U18I386BUILD/config.status/config.statusMake failed for Ubuntu 18.04 i386 build: FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21097/artifact/FBSD12AMD64/config.status/config.status |
idryzhov
force-pushed
the
static-show-run-nb
branch
from
830aa0a to
b10f62a
Compare
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: FailedUbuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U1604I386/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U1804PPC64LEBUILD/config.status/config.status NetBSD 8 amd64 build: Failed (click for details)NetBSD 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI012BUILD/config.log/config.log.gzMake failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI012BUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI021BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI014BUILD/config.status/config.status Debian 11 amd64 build: Failed (click for details)Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/DEB11AMD64/config.status/config.statusMake failed for Debian 11 amd64 build: Debian 11 amd64 build: Unknown Log <config.log.gz> Ubuntu 20.04 amd64 build: Failed (click for details)Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U2004AMD64BUILD/config.status/config.statusMake failed for Ubuntu 20.04 amd64 build: Ubuntu 20.04 amd64 build: Unknown Log <config.log.gz> Ubuntu 18.04 arm7 build: Failed (click for details)Make failed for Ubuntu 18.04 arm7 build: Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz> Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/F29BUILD/config.status/config.status Debian 10 amd64 build: Failed (click for details)Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/DEB10BUILD/config.log/config.log.gzMake failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/DEB10BUILD/config.status/config.status FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI009BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Failed (click for details)Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U18ARM8BUILD/config.log/config.log.gzMake failed for Ubuntu 18.04 arm8 build: Ubuntu 16.04 arm8 build: Failed (click for details)Make failed for Ubuntu 16.04 arm8 build: Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz> FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/FBSD12AMD64/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U1804AMD64/config.status/config.status Ubuntu 18.04 i386 build: Failed (click for details)Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U18I386BUILD/config.log/config.log.gz Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U18I386BUILD/config.status/config.statusMake failed for Ubuntu 18.04 i386 build: Ubuntu 16.04 arm7 build: Failed (click for details)Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI101BUILD/config.log/config.log.gzMake failed for Ubuntu 16.04 arm7 build: CentOS 8 amd64 build: Failed (click for details)CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CENTOS8BUILD/config.status/config.statusMake failed for CentOS 8 amd64 build: CentOS 8 amd64 build: Unknown Log <config.log.gz> Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsUbuntu 16.04 i386 build: Failed (click for details)Make failed for Ubuntu 16.04 i386 build: Ubuntu 16.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U1604I386/config.status/config.status Ubuntu 18.04 ppc64le build: Failed (click for details)Make failed for Ubuntu 18.04 ppc64le build: Ubuntu 18.04 ppc64le build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U1804PPC64LEBUILD/config.status/config.status NetBSD 8 amd64 build: Failed (click for details)NetBSD 8 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI012BUILD/config.log/config.log.gzMake failed for NetBSD 8 amd64 build: NetBSD 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI012BUILD/config.status/config.status Debian 9 amd64 build: Failed (click for details)Make failed for Debian 9 amd64 build: Debian 9 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI021BUILD/config.status/config.status Ubuntu 16.04 amd64 build: Failed (click for details)Make failed for Ubuntu 16.04 amd64 build: Ubuntu 16.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI014BUILD/config.status/config.status Debian 11 amd64 build: Failed (click for details)Debian 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/DEB11AMD64/config.status/config.statusMake failed for Debian 11 amd64 build: Debian 11 amd64 build: Unknown Log <config.log.gz> Ubuntu 20.04 amd64 build: Failed (click for details)Ubuntu 20.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U2004AMD64BUILD/config.status/config.statusMake failed for Ubuntu 20.04 amd64 build: Ubuntu 20.04 amd64 build: Unknown Log <config.log.gz> Ubuntu 18.04 arm7 build: Failed (click for details)Make failed for Ubuntu 18.04 arm7 build: Ubuntu 18.04 arm7 build: Unknown Log <config.log.gz> Fedora 29 amd64 build: Failed (click for details)Make failed for Fedora 29 amd64 build: Fedora 29 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/F29BUILD/config.status/config.status Debian 10 amd64 build: Failed (click for details)Debian 10 amd64 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/DEB10BUILD/config.log/config.log.gzMake failed for Debian 10 amd64 build: Debian 10 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/DEB10BUILD/config.status/config.status FreeBSD 11 amd64 build: Failed (click for details)Make failed for FreeBSD 11 amd64 build: FreeBSD 11 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI009BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Failed (click for details)Ubuntu 18.04 arm8 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U18ARM8BUILD/config.status/config.status Ubuntu 18.04 arm8 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U18ARM8BUILD/config.log/config.log.gzMake failed for Ubuntu 18.04 arm8 build: Ubuntu 16.04 arm8 build: Failed (click for details)Make failed for Ubuntu 16.04 arm8 build: Ubuntu 16.04 arm8 build: Unknown Log <config.log.gz> FreeBSD 12 amd64 build: Failed (click for details)Make failed for FreeBSD 12 amd64 build: FreeBSD 12 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/FBSD12AMD64/config.status/config.status Ubuntu 18.04 amd64 build: Failed (click for details)Make failed for Ubuntu 18.04 amd64 build: Ubuntu 18.04 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U1804AMD64/config.status/config.status Ubuntu 18.04 i386 build: Failed (click for details)Ubuntu 18.04 i386 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U18I386BUILD/config.log/config.log.gz Ubuntu 18.04 i386 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/U18I386BUILD/config.status/config.statusMake failed for Ubuntu 18.04 i386 build: Ubuntu 16.04 arm7 build: Failed (click for details)Ubuntu 16.04 arm7 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI101BUILD/config.status/config.status Ubuntu 16.04 arm7 build: Unknown Log URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CI101BUILD/config.log/config.log.gzMake failed for Ubuntu 16.04 arm7 build: CentOS 8 amd64 build: Failed (click for details)CentOS 8 amd64 build: config.status output from configure script can be found at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21098/artifact/CENTOS8BUILD/config.status/config.statusMake failed for CentOS 8 amd64 build: CentOS 8 amd64 build: Unknown Log <config.log.gz> |
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests Ubuntu 18.04 i386 part 3: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO3U18I386-21100/test Topology Tests failed for Topotests Ubuntu 18.04 i386 part 3: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21100/artifact/TOPO3U18I386/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 i386 part 9: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO9U18I386-21100/test Topology Tests failed for Topotests Ubuntu 18.04 i386 part 9: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21100/artifact/TOPO9U18I386/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 arm8 part 1: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 1: No useful log foundSuccessful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests Ubuntu 18.04 i386 part 3: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO3U18I386-21100/test Topology Tests failed for Topotests Ubuntu 18.04 i386 part 3: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21100/artifact/TOPO3U18I386/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 i386 part 9: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO9U18I386-21100/test Topology Tests failed for Topotests Ubuntu 18.04 i386 part 9: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21100/artifact/TOPO9U18I386/ErrorLog/log_topotests.txt Topotests Ubuntu 18.04 arm8 part 1: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 1: No useful log found |
| return YANG_ITER_CONTINUE; | ||
| } | ||
|
|
||
| static void nexthop_cli_show(struct vty *vty, const struct lyd_node *route, |
There was a problem hiding this comment.
Should we not start all functions in this file with "static_"? I thought that is general convention being followed in FRR code.
There was a problem hiding this comment.
Same comment applies to all other functions added in this PR.
There was a problem hiding this comment.
This is a static (internal) function so it doesn't matter. All public functions are prefixed with static_.
| if (ret) | ||
| return ret; | ||
|
|
||
| return if_cmp_name_func(yang_dnode_get_string(dnode1, "./vrf"), |
There was a problem hiding this comment.
Should this compare not be the first compare criteria?
There was a problem hiding this comment.
I realise this is comparing the next hops within the same route. So the VRF here is the outgoing VRF the next hop points to. So maybe this correct order. I am really not sure what the order should be. Please give it a thought and take a final call appropriately.
There was a problem hiding this comment.
Yes, it's nexthop-vrf so it should be last to compare.
|
@idryzhov I have reviewed the code changes. Mostly everything looks okay. However I have pointed out few points to consider in the comments. Thanks for making these changes anyways!! |
|
Also suggest that you include a sample output for the 'show running-config' output for STATICd with and without these changes somewhere in the description. Hoping there's no change in the output format as a result of these changes. |
There's no difference in the output other than added sorting. Previously only the nexthops within the route were sorted, now everything is sorted – routes, paths, and nexthops. I don't see any point in adding the same text two times in the commit message. |
|
ci:rerun |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests Ubuntu 18.04 arm8 part 1: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 1: No useful log foundSuccessful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests Ubuntu 18.04 arm8 part 1: Failed (click for details)Topotests Ubuntu 18.04 arm8 part 1: No useful log found |
|
ci:rerun |
Continuous Integration Result: FAILEDContinuous Integration Result: FAILEDSee below for issues. This is a comment from an automated CI system. Get source / Pull Request: SuccessfulBuilding Stage: SuccessfulBasic Tests: FailedTopotests Ubuntu 18.04 amd64 part 9: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO9U18AMD64-21175/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 9: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21175/artifact/TOPO9U18AMD64/ErrorLog/log_topotests.txt Successful on other platforms/tests
Warnings Generated during build:Checkout code: Successful with additional warningsTopotests Ubuntu 18.04 amd64 part 9: Failed (click for details)Topology Test Results are at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-TOPO9U18AMD64-21175/test Topology Tests failed for Topotests Ubuntu 18.04 amd64 part 9: see full log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21175/artifact/TOPO9U18AMD64/ErrorLog/log_topotests.txt |
|
ci:rerun |
Continuous Integration Result: SUCCESSFULContinuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21198/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warnings |
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
idryzhov
force-pushed
the
static-show-run-nb
branch
from
b10f62a to
f800deb
Compare
Outdated results 💚Basic BGPD CI results: SUCCESS, 0 tests failed
For details, please contact louberger |
Continuous Integration Result: SUCCESSFULContinuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-FRRPULLREQ-21500/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warnings |
|
|
||
| if (vrf->vrf_id != VRF_DEFAULT) | ||
| vty_endframe(vty, "exit-vrf\n!\n"); | ||
| dnode = yang_dnode_get(running_config->dnode, "/frr-routing:routing"); |
There was a problem hiding this comment.
The node chosen here seems very shallow in the tree, this probably works b/c its traversing a libyang tree inside staticd. Wondering, if this code has to move with newer centralized management will it break? Is there a more specific node that could be chosen?
There was a problem hiding this comment.
I don't see any problem that can happen when this is moved to mgmtd. Yes, using this path means that it'll output the whole config, not only the staticd config, but this is the point of mgmtd :)
Not my bug, I didn't even change any vtysh code. It was introduced in #9497. |
staticd/static_routes.c
Outdated
| continue; | ||
| } | ||
| } | ||
| static_nexthop_list_add_after(&(pn->nexthop_list), cp, nh); |
There was a problem hiding this comment.
Have a concern that downstream code (in zebra?) may count on this sorting for having deterministic ECMP NH selection.. it probably shouldn't but let's check.
There was a problem hiding this comment.
Removed this change.
idryzhov
force-pushed
the
static-show-run-nb
branch
from
f800deb to
6cc73da
Compare
💚 Basic BGPD CI results: SUCCESS, 0 tests failedResults table
For details, please contact louberger |
Continuous Integration Result: SUCCESSFULCongratulations, this patch passed basic tests Tested-by: NetDEF / OpenSourceRouting.org CI System CI System Testrun URL: https://ci1.netdef.org/browse/FRR-PULLREQ2-161/ This is a comment from an automated CI system. Warnings Generated during build:Checkout code: Successful with additional warnings |
The main change is in the title. There are also a couple of auxiliary commits, please, check their descriptions individually.
Closes #8746.