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

Fix hash-based router ID calculation for IPv4 #231

Merged
merged 2 commits into from Apr 3, 2019

Conversation

Projects
None yet
3 participants
@roshanirathi
Copy link

commented Apr 3, 2019

No description provided.

Support hits command
   1	/usr/bin/go
  14	/usr/bin/git
   5	/usr/bin/vim
   3	/usr/bin/make
   5	/bin/ls
   1	/usr/bin/mesg for ipv4 router id
@fasaxc

This comment has been minimized.

Copy link
Member

commented Apr 3, 2019

I was confused about how this test could possibly have passed before so I tied running the tests locally and found a bug in the test harness that meant it didn't spot if confd failed to render a template when a previous test had successfully rendered it. Please can you add this change to your PR to guard against that problem in future (I tested it locally and it seemed to do the trick):

diff --git a/tests/test_suite_common.sh b/tests/test_suite_common.sh
index b4d5919..99192dc 100755
--- a/tests/test_suite_common.sh
+++ b/tests/test_suite_common.sh
@@ -372,6 +372,9 @@ run_individual_test_oneshot() {
        start_typha
     fi
 
+    # Clean up the output directory.
+    rm -f /etc/calico/confd/config/*
+
     # Run confd in oneshot mode.
     BGP_LOGSEVERITYSCREEN="debug" confd -confdir=/etc/calico/confd -onetime >$LOGPATH/logss 2>&1 || true
 
@fasaxc

fasaxc approved these changes Apr 3, 2019

@fasaxc fasaxc merged commit 49f4121 into projectcalico:master Apr 3, 2019

2 checks passed

license/cla Contributor License Agreement is signed.
Details
semaphoreci The build passed on Semaphore.
Details

@fasaxc fasaxc added this to the Calico v3.7.0 milestone Apr 3, 2019

@fasaxc fasaxc changed the title Support `hash` for ipv4 router id Fix hash-based router ID calculation for IPv4 Apr 3, 2019

@caseydavenport

This comment has been minimized.

Copy link
Member

commented Apr 15, 2019

Cherry pick to v3.6: #232

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.