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

pimd: make show ip mroute output consistent #8952

Merged
merged 1 commit into from
Jun 30, 2021

Conversation

Jafaral
Copy link
Member

@Jafaral Jafaral commented Jun 29, 2021

We had 3 different string output formats in various places.
Make them all the same.

Signed-off-by: Jafar Al-Gharaibeh [email protected]

@polychaeta polychaeta added the pim label Jun 29, 2021
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/5632137f933ffe238a0575d8096e6b2e/raw/d64c1be034f15589620704b0c1b36d70105aa83e/cr_8952_1624993567.diff | git apply

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index bcc05fab3..98eab9b69 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -6445,8 +6445,8 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty,
 		if (!uj && !found_oif) {
 			vty_out(vty,
 				"%-15s %-15s %-8s %-6s %-16s %-16s %-3d  %8s\n",
-				src_str, grp_str, "-", proto, in_ifname, "none", 0,
-				"--:--:--");
+				src_str, grp_str, "-", proto, in_ifname, "none",
+				0, "--:--:--");
 		}
 	}
 

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.

We had 3 different string output formats in various places.
Make them all the same.

Signed-off-by: Jafar Al-Gharaibeh <[email protected]>
@LabN-CI
Copy link
Collaborator

LabN-CI commented Jun 29, 2021

Outdated results 💚

Basic BGPD CI results: SUCCESS, 0 tests failed

_ _
Result SUCCESS git merge/8952 79a9752
Date 06/29/2021
Start 15:13:05
Finish 15:38:30
Run-Time 25:25
Total 1815
Pass 1815
Fail 0
Valgrind-Errors
Valgrind-Loss
Details vncregress-2021-06-29-15:13:05.txt
Log autoscript-2021-06-29-15:14:17.log.bz2
Memory 486 516 431

For details, please contact louberger

@NetDEF-CI
Copy link
Collaborator

NetDEF-CI commented Jun 29, 2021

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

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: Incomplete

Ubuntu 18.04 arm7 build: Incomplete (check logs for details)
Ubuntu 18.04 arm7 build: Incomplete (check logs for details)
Ubuntu 18.04 ppc64le build: Incomplete (check logs for details)
Ubuntu 18.04 arm7 build: Incomplete (check logs for details)
Ubuntu 18.04 arm7 build: Incomplete (check logs for details)
Ubuntu 18.04 ppc64le build: Incomplete (check logs for details)
Ubuntu 16.04 arm8 build: Incomplete (check logs for details)
Ubuntu 18.04 arm7 build: Incomplete (check logs for details)
Ubuntu 18.04 arm7 build: Incomplete (check logs for details)
Ubuntu 18.04 ppc64le build: Incomplete (check logs for details)
Ubuntu 18.04 arm7 build: Incomplete (check logs for details)
Ubuntu 18.04 arm7 build: Incomplete (check logs for details)
Ubuntu 18.04 ppc64le build: Incomplete (check logs for details)
Ubuntu 16.04 arm8 build: Incomplete (check logs for details)
Ubuntu 16.04 arm7 build: Incomplete (check logs for details)
Successful on other platforms/tests
  • Ubuntu 20.04 amd64 build
  • Ubuntu 18.04 i386 build
  • Fedora 29 amd64 build
  • Ubuntu 16.04 i386 build
  • CentOS 7 amd64 build
  • CentOS 8 amd64 build
  • Ubuntu 18.04 arm8 build
  • Debian 11 amd64 build
  • Debian 10 amd64 build
  • FreeBSD 12 amd64 build
  • OpenBSD 6 amd64 build
  • Debian 9 amd64 build
  • NetBSD 8 amd64 build
  • Ubuntu 16.04 amd64 build
  • FreeBSD 11 amd64 build
  • Ubuntu 18.04 amd64 build
### Basic Tests: Incomplete

@NetDEF-CI
Copy link
Collaborator

Continuous Integration Result: FAILED

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

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: Incomplete

Ubuntu 18.04 ppc64le build: Incomplete (check logs for details)
Successful on other platforms/tests
  • Ubuntu 18.04 arm7 build
  • Ubuntu 20.04 amd64 build
  • Ubuntu 18.04 i386 build
  • Ubuntu 16.04 i386 build
  • Fedora 29 amd64 build
  • Debian 10 amd64 build
  • Ubuntu 16.04 arm8 build
  • Debian 11 amd64 build
  • Ubuntu 18.04 amd64 build
  • CentOS 7 amd64 build
  • FreeBSD 12 amd64 build
  • Ubuntu 16.04 arm7 build
  • CentOS 8 amd64 build
  • NetBSD 8 amd64 build
  • Debian 9 amd64 build
  • OpenBSD 6 amd64 build
  • Ubuntu 16.04 amd64 build
  • FreeBSD 11 amd64 build
  • Ubuntu 18.04 arm8 build
### Basic Tests: Incomplete

@LabN-CI
Copy link
Collaborator

LabN-CI commented Jun 29, 2021

💚 Basic BGPD CI results: SUCCESS, 0 tests failed

Results table
_ _
Result SUCCESS git merge/8952 530b12c
Date 06/29/2021
Start 16:59:49
Finish 17:25:25
Run-Time 25:36
Total 1815
Pass 1815
Fail 0
Valgrind-Errors
Valgrind-Loss
Details vncregress-2021-06-29-16:59:49.txt
Log autoscript-2021-06-29-17:01:08.log.bz2
Memory 509 518 430

For details, please contact louberger

@qlyoung qlyoung merged commit 309f6af into FRRouting:master Jun 30, 2021
@Jafaral
Copy link
Member Author

Jafaral commented Aug 12, 2021

@Mergifyio backport stable/8.0

@mergify
Copy link

mergify bot commented Aug 12, 2021

Command backport stable/8.0: success

Backports have been created

donaldsharp added a commit that referenced this pull request Aug 17, 2021
pimd: make show ip mroute output consistent (backport #8952)
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