From 6459275397eee140892f583375558c51d7e7b613 Mon Sep 17 00:00:00 2001 From: Qi Luo Date: Fri, 29 Jun 2018 14:33:43 -0700 Subject: [PATCH] Revert "[vs-test]: not forward routes with no-export community (#1774)" (#1828) This reverts commit b37540febd70a1dddf54aadfebf11007968585c9. --- platform/vs/tests/bounce/files/bgpd.conf | 13 ------ platform/vs/tests/bounce/files/exabgp1.conf | 21 ---------- platform/vs/tests/bounce/files/exabgp2.conf | 11 ----- platform/vs/tests/bounce/test_bounce.py | 45 --------------------- 4 files changed, 90 deletions(-) delete mode 100644 platform/vs/tests/bounce/files/bgpd.conf delete mode 100644 platform/vs/tests/bounce/files/exabgp1.conf delete mode 100644 platform/vs/tests/bounce/files/exabgp2.conf delete mode 100644 platform/vs/tests/bounce/test_bounce.py diff --git a/platform/vs/tests/bounce/files/bgpd.conf b/platform/vs/tests/bounce/files/bgpd.conf deleted file mode 100644 index 40322cedbc..0000000000 --- a/platform/vs/tests/bounce/files/bgpd.conf +++ /dev/null @@ -1,13 +0,0 @@ -router bgp 65501 - bgp router-id 1.1.1.1 - no bgp default ipv4-unicast - neighbor 10.0.0.1 remote-as 65502 - address-family ipv4 - neighbor 10.0.0.1 activate - maximum-paths 64 - exit-address-family - neighbor 10.0.0.3 remote-as 65503 - address-family ipv4 - neighbor 10.0.0.3 activate - maximum-paths 64 - exit-address-family diff --git a/platform/vs/tests/bounce/files/exabgp1.conf b/platform/vs/tests/bounce/files/exabgp1.conf deleted file mode 100644 index 0e78bd61db..0000000000 --- a/platform/vs/tests/bounce/files/exabgp1.conf +++ /dev/null @@ -1,21 +0,0 @@ -neighbor 10.0.0.0 { - router-id 1.1.1.2; - local-address 10.0.0.1; - local-as 65502; - peer-as 65501; - group-updates false; - - family{ - ipv4 unicast; - } - - static { - route 1.1.1.1/32{ - next-hop 10.0.0.1; - community no-export; - } - route 2.2.2.2/32{ - next-hop 10.0.0.1; - } - } -} diff --git a/platform/vs/tests/bounce/files/exabgp2.conf b/platform/vs/tests/bounce/files/exabgp2.conf deleted file mode 100644 index 3e67c18a82..0000000000 --- a/platform/vs/tests/bounce/files/exabgp2.conf +++ /dev/null @@ -1,11 +0,0 @@ -neighbor 10.0.0.2 { - router-id 1.1.1.3; - local-address 10.0.0.3; - local-as 65503; - peer-as 65501; - group-updates false; - - family { - ipv4 unicast; - } -} diff --git a/platform/vs/tests/bounce/test_bounce.py b/platform/vs/tests/bounce/test_bounce.py deleted file mode 100644 index 57616ec0bc..0000000000 --- a/platform/vs/tests/bounce/test_bounce.py +++ /dev/null @@ -1,45 +0,0 @@ -from swsscommon import swsscommon -import os -import re -import time -import json - -def test_bounce(dvs): - dvs.servers[0].runcmd("pkill -f exabgp") - dvs.copy_file("/etc/quagga/", "bounce/files/bgpd.conf") - dvs.runcmd("supervisorctl start bgpd") - dvs.runcmd("ip addr add 10.0.0.0/31 dev Ethernet0") - dvs.runcmd("ifconfig Ethernet0 up") - - dvs.runcmd("ip addr add 10.0.0.2/31 dev Ethernet4") - dvs.runcmd("ifconfig Ethernet4 up") - - dvs.servers[0].runcmd("ip addr add 10.0.0.1/31 dev eth0") - dvs.servers[0].runcmd("ifconfig eth0 up") - - dvs.servers[1].runcmd("ip addr add 10.0.0.3/31 dev eth0") - dvs.servers[1].runcmd("ifconfig eth0 up") - - time.sleep(5) - - p1 = dvs.servers[0].runcmd_async("exabgp -d bounce/files/exabgp1.conf") - p2 = dvs.servers[1].runcmd_async("exabgp -d bounce/files/exabgp2.conf") - - time.sleep(20) - - sum_res = dvs.runcmd(["vtysh", "-c", "show ip bgp sum"]) - all_route = dvs.runcmd(["vtysh", "-c", "show ip bgp"]) - announce_route = dvs.runcmd(["vtysh", "-c", "show ip bgp neighbors 10.0.0.3 advertised-routes"]) - - p1.terminate() - p1 = p1.wait() - - p2.terminate() - p2 = p2.wait() - - print sum_res - print announce_route - assert "1.1.1.1/32" in all_route - assert "1.1.1.1/32" not in announce_route - assert "2.2.2.2/32" in all_route - assert "2.2.2.2/32" in announce_route