Readd BIRD, and upgrade to support 2.0.

Fixes #145
metallb · Mar 1, 2018 · 5e01338 · 5e01338
1 parent 19da00a
commit 5e01338
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 35 deletions.
diff --git a/manifests/test-bgp-router.yaml b/manifests/test-bgp-router.yaml
@@ -31,11 +31,9 @@ spec:
               fieldPath: status.hostIP
         ports:
         - name: bird
-          containerPort: 1179
-        - name: quagga
           containerPort: 179
-        - name: gobgp
-          containerPort: 2179
+        - name: quagga
+          containerPort: 1179
         - name: http
           containerPort: 7472
         securityContext:
@@ -76,22 +74,6 @@ spec:
     app: test-bgp-router
   clusterIP: 10.96.0.101
 
----
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: metallb-system
-  name: test-bgp-router-gobgp
-spec:
-  ports:
-  - name: bgp
-    port: 179
-    protocol: TCP
-    targetPort: gobgp
-  selector:
-    app: test-bgp-router
-  clusterIP: 10.96.0.102
-
 ---
 apiVersion: v1
 kind: Service

diff --git a/manifests/tutorial-1.yaml b/manifests/tutorial-1.yaml
@@ -6,16 +6,12 @@ metadata:
 data:
   config: |
     peers:
-    # Temporarily disabled due to bug #142
-    # - my-asn: 64512
-    #   peer-asn: 64512
-    #   peer-address: 10.96.0.100
     - my-asn: 64512
       peer-asn: 64512
-      peer-address: 10.96.0.101
+      peer-address: 10.96.0.100
     - my-asn: 64512
       peer-asn: 64512
-      peer-address: 10.96.0.102
+      peer-address: 10.96.0.101
     address-pools:
     - name: my-ip-space
       protocol: bgp

diff --git a/test-bgp-router/bird.go b/test-bgp-router/bird.go
@@ -4,32 +4,36 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net"
+	"os"
 	"os/exec"
 	"strings"
 )
 
 func hasBird() bool {
-	// Disabled pending bug #142
-	// _, err := os.Stat("/usr/sbin/bird")
-	// return err == nil
-	return false
+	_, err := os.Stat("/usr/sbin/bird")
+	return err == nil
 }
 
 func writeBirdConfig() error {
 	cfg := fmt.Sprintf(`
 router id 10.96.0.100;
-listen bgp port 1179;
 log stderr all;
 debug protocols all;
 protocol device {
 }
 protocol static {
+  ipv4;
   route %s/32 via "eth0";
 }
 protocol bgp minikube {
-  local 10.96.0.100 as 64512;
+  local as 64512;
   neighbor %s as 64512;
   passive;
+  multihop;
+  ipv4 {
+    table master4;
+    import all;
+  };
   error wait time 1, 2;
 }
 `, nodeIP(), nodeIP())

diff --git a/test-bgp-router/main.go b/test-bgp-router/main.go
@@ -55,7 +55,7 @@ func runTCPDump() error {
 	if err := os.Mkdir("/run/tcpdump", 0600); err != nil {
 		return err
 	}
-	c := exec.Command("/usr/sbin/tcpdump", "-i", "eth0", "-w", "/run/tcpdump/pcap", "tcp", "port", "1179")
+	c := exec.Command("/usr/sbin/tcpdump", "-i", "eth0", "-w", "/run/tcpdump/pcap", "tcp", "port", "179", "or", "tcp", "port", "1179")
 	if err := c.Start(); err != nil {
 		return err
 	}
@@ -69,7 +69,7 @@ func runTCPDump() error {
 }
 
 func installNatRule() error {
-	for _, port := range []int{179, 1179, 2179} {
+	for _, port := range []int{179, 1179} {
 		if err := runBlocking("/sbin/iptables", "-t", "nat", "-A", "INPUT", "-p", "tcp", "--dport", strconv.Itoa(port), "-j", "SNAT", "--to", nodeIP()); err != nil {
 			return err
 		}

diff --git a/test-bgp-router/quagga.go b/test-bgp-router/quagga.go
@@ -43,7 +43,7 @@ func runQuagga() error {
 	if err := runOrCrash("/usr/sbin/zebra", "-A", "127.0.0.1", "-f", "/etc/quagga/zebra.conf"); err != nil {
 		return err
 	}
-	if err := runOrCrash("/usr/sbin/bgpd", "-A", "127.0.0.1", "-f", "/etc/quagga/bgpd.conf"); err != nil {
+	if err := runOrCrash("/usr/sbin/bgpd", "-p 1179", "-A", "127.0.0.1", "-f", "/etc/quagga/bgpd.conf"); err != nil {
 		return err
 	}
 	return nil