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.

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

vtysh: respect --disable-daemon configure flags #7198

Merged
merged 2 commits into from
Sep 29, 2020

Conversation

idryzhov
Copy link
Contributor

Don't install nodes for daemons that are disabled by configure flags.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Don't install nodes for daemons that are disabled by configure flags.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
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/ca799145ab3d0e2130149687a5f96910/raw/72a4c0748bafcd921e178131556849e5688636ee/cr_7198_1601377630.diff | git apply

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 9993e7335..c38379c9e 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1978,11 +1978,11 @@ DEFUNSH(VTYSH_PBRD, vtysh_pbr_map, vtysh_pbr_map_cmd,
 }
 
 DEFSH(VTYSH_PBRD, vtysh_no_pbr_map_cmd, "no pbr-map PBRMAP [seq (1-700)]",
-	NO_STR
-	"Delete pbr-map\n"
-	"The name of  the PBR MAP\n"
-	"Sequence to delete from existing pbr-map entry\n"
-	"Sequence number\n")
+      NO_STR
+      "Delete pbr-map\n"
+      "The name of  the PBR MAP\n"
+      "Sequence to delete from existing pbr-map entry\n"
+      "Sequence number\n")
 #endif /* HAVE_PBRD */
 
 #if HAVE_BFDD > 0
@@ -4195,7 +4195,7 @@ void vtysh_init_vty(void)
 	install_element(VRF_NODE, &vtysh_end_all_cmd);
 	install_element(VRF_NODE, &vtysh_exit_vrf_cmd);
 	install_element(VRF_NODE, &vtysh_quit_vrf_cmd);
-	
+
 	install_node(&rmap_node);
 	install_element(CONFIG_NODE, &vtysh_route_map_cmd);
 	install_element(RMAP_NODE, &vtysh_exit_rmap_cmd);

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.

@LabN-CI
Copy link
Collaborator

LabN-CI commented Sep 29, 2020

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/7198 0eb5751
Date 09/29/2020
Start 07:26:34
Finish 07:52:26
Run-Time 25:52
Total 1815
Pass 1815
Fail 0
Valgrind-Errors 0
Valgrind-Loss 0
Details vncregress-2020-09-29-07:26:34.txt
Log autoscript-2020-09-29-07:27:29.log.bz2
Memory 465 465 424

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-14426/

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
<stdin>:1034: trailing whitespace.
	
warning: 1 line adds whitespace errors.
Report for vtysh.c | 2 issues
===============================================
< ERROR: trailing whitespace
< #4198: FILE: /tmp/f1-8245/vtysh.c:4198:

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-14426/artifact/DEB10BUILD/ErrorLog/log_lintian.txt)

W: frr source: package-needs-versioned-debhelper-build-depends 10
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr source: package-needs-versioned-debhelper-build-depends 10
W: frr source: pkg-js-tools-test-is-missing
W: frr source: newer-standards-version 4.5.0.3 (current is 4.3.0)
W: frr: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20200929-02-g0eb5751da-0 (missing) -> 7.6-dev-20200929-02-g0eb5751da-0~deb10u1
W: frr-snmp: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20200929-02-g0eb5751da-0 (missing) -> 7.6-dev-20200929-02-g0eb5751da-0~deb10u1
W: frr-doc: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20200929-02-g0eb5751da-0 (missing) -> 7.6-dev-20200929-02-g0eb5751da-0~deb10u1
W: frr-rpki-rtrlib: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20200929-02-g0eb5751da-0 (missing) -> 7.6-dev-20200929-02-g0eb5751da-0~deb10u1
W: frr-pythontools: changelog-file-missing-explicit-entry 6.0-2 -> 7.6-dev-20200929-02-g0eb5751da-0 (missing) -> 7.6-dev-20200929-02-g0eb5751da-0~deb10u1
Ubuntu 18.04 arm8 build: Successful with additional warnings

Debian Package lintian failed for Ubuntu 18.04 arm8 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-14426/artifact/U18ARM8BUILD/ErrorLog/log_lintian.txt)

W: frr source: package-needs-versioned-debhelper-build-depends 10
W: frr source: package-needs-versioned-debhelper-build-depends 10
Ubuntu 18.04 amd64 build: Successful with additional warnings

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

W: frr source: package-needs-versioned-debhelper-build-depends 10
W: frr source: package-needs-versioned-debhelper-build-depends 10
Ubuntu 18.04 ppc64le build: Successful with additional warnings

Debian Package lintian failed for Ubuntu 18.04 ppc64le build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-14426/artifact/U1804PPC64LEBUILD/ErrorLog/log_lintian.txt)

W: frr source: package-needs-versioned-debhelper-build-depends 10
W: frr source: package-needs-versioned-debhelper-build-depends 10
Debian 9 amd64 build: Successful with additional warnings

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

W: frr source: package-needs-versioned-debhelper-build-depends 10
W: frr source: package-needs-versioned-debhelper-build-depends 10
Ubuntu 18.04 arm7 build: Successful with additional warnings

Debian Package lintian failed for Ubuntu 18.04 arm7 build:
(see full package build log at https://ci1.netdef.org/browse/FRR-FRRPULLREQ-14426/artifact/U18ARM7BUILD/ErrorLog/log_lintian.txt)

W: frr source: package-needs-versioned-debhelper-build-depends 10
W: frr source: package-needs-versioned-debhelper-build-depends 10

@donaldsharp donaldsharp merged commit e84c831 into FRRouting:master Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants