tools/frr-reload: cleanup + --vty_socket
#6466
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Why is this on stderr... Signed-off-by: David Lamparter <equinox@diac24.net>
... to skip the "Building configuration..." header that gets in the way of automated processing. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
- throw vtysh into a wrapper class - ignore "username" commands - use mark output on stdout - some other random cleanups Signed-off-by: David Lamparter <equinox@diac24.net>
After the cleanup, adding this doesn't require updating a zillion locations in the code anymore, just one :) Partially derived from 6a00e91 Originally-by: Emanuele Di Pascale <emanuele@voltanet.io> Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
polychaeta
reviewed
May 26, 2020
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/c921bacc10c544d1a7c8d4b476e7cc34/raw/4dc456b8bc18475a0ce95da12a54dfde88196483/cr_6466_1590513382.diff | git apply
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 29e0842da..cfdffe554 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2843,13 +2843,11 @@ DEFUNSH(VTYSH_ALL, no_vtysh_config_enable_password,
return CMD_SUCCESS;
}
-DEFUN (vtysh_write_terminal,
- vtysh_write_terminal_cmd,
- "write terminal ["DAEMONS_LIST"] [no-header]",
- "Write running configuration to memory, network, or terminal\n"
- "Write to terminal\n"
- DAEMONS_STR
- "Skip \"Building configuration...\" header\n")
+DEFUN(vtysh_write_terminal, vtysh_write_terminal_cmd,
+ "write terminal [" DAEMONS_LIST "] [no-header]",
+ "Write running configuration to memory, network, or terminal\n"
+ "Write to terminal\n" DAEMONS_STR
+ "Skip \"Building configuration...\" header\n")
{
unsigned int i;
char line[] = "do write terminal\n";
@@ -2877,13 +2875,10 @@ DEFUN (vtysh_write_terminal,
return CMD_SUCCESS;
}
-DEFUN (vtysh_show_running_config,
- vtysh_show_running_config_cmd,
- "show running-config ["DAEMONS_LIST"] [no-header]",
- SHOW_STR
- "Current operating configuration\n"
- DAEMONS_STR
- "Skip \"Building configuration...\" header\n")
+DEFUN(vtysh_show_running_config, vtysh_show_running_config_cmd,
+ "show running-config [" DAEMONS_LIST "] [no-header]",
+ SHOW_STR "Current operating configuration\n" DAEMONS_STR
+ "Skip \"Building configuration...\" header\n")
{
return vtysh_write_terminal(self, vty, argc, argv);
}
If you are a new contributor to FRR, please see our contributing guidelines.
💚 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-FRRPULLREQ-12430/ This is a comment from an automated CI system. Warnings Generated during build:Debian 10 amd64 build: Successful with additional warningsDebian Package lintian failed for Debian 10 amd64 build: |
mjstapp
approved these changes
May 28, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
as discussed on the call today, this is the cleanup part from #6343 / #4807 +
--vty_socketfrom #5860