server: support peering with ipv6 link local address

fix DialTCPTimeoutWithMD5Sig to handle ipv6 scope-id
also update ipv6 test to test this feature

Signed-off-by: ISHIDA Wataru <ishida.wataru@lab.ntt.co.jp>

3 files changed, 21 insertions, 10 deletions

diff --git a/test/lib/base.py b/test/lib/base.py
index ffbf03b5..4f2e8a69 100644
--- a/test/lib/base.py
+++ b/test/lib/base.py
@@ -155,6 +155,7 @@ class Container(object):
         self.image = image
         self.shared_volumes = []
         self.ip_addrs = []
+        self.ip6_addrs = []
         self.is_running = False
         self.eths = []
 
@@ -184,6 +185,9 @@ class Container(object):
             if line.strip().startswith("inet "):
                 elems = [e.strip() for e in line.strip().split(' ')]
                 self.ip_addrs.append(('eth0', elems[1], 'docker0'))
+            elif line.strip().startswith("inet6 "):
+                elems = [e.strip() for e in line.strip().split(' ')]
+                self.ip6_addrs.append(('eth0', elems[1], 'docker0'))
         return 0
 
     def stop(self):
@@ -262,15 +266,23 @@ class BGPContainer(Container):
                  policies=None, passive=False,
                  is_rr_client=False, cluster_id=None,
                  flowspec=False, bridge='', reload_config=True, as2=False,
-                 graceful_restart=None, local_as=None, prefix_limit=None):
+                 graceful_restart=None, local_as=None, prefix_limit=None,
+                 v6=False):
         neigh_addr = ''
         local_addr = ''
-        for me, you in itertools.product(self.ip_addrs, peer.ip_addrs):
+        it = itertools.product(self.ip_addrs, peer.ip_addrs)
+        if v6:
+            it = itertools.product(self.ip6_addrs, peer.ip6_addrs)
+
+        for me, you in it:
             if bridge != '' and bridge != me[2]:
                 continue
             if me[2] == you[2]:
                 neigh_addr = you[1]
                 local_addr = me[1]
+                if v6:
+                    addr, mask = local_addr.split('/')
+                    local_addr = "{0}%{1}/{2}".format(addr, me[0], mask)
                 break
 
         if neigh_addr == '':
diff --git a/test/lib/gobgp.py b/test/lib/gobgp.py
index 7627fd50..0f86f388 100644
--- a/test/lib/gobgp.py
+++ b/test/lib/gobgp.py
@@ -267,11 +267,14 @@ class GoBGPContainer(BGPContainer):
                  'afi-safis': afi_safi_list,
                  'timers': {'config': {
                      'connect-retry': 10,
-                    }},
+                  }},
+                 'transport': {'config': {
+                     'local-address': info['local_addr'].split('/')[0],
+                  }},
                  }
 
             if info['passive']:
-                n['transport'] = {'config': {'passive-mode': True}}
+                n['transport']['config']['passive-mode'] = True
 
             if info['is_rs_client']:
                 n['route-server'] = {'config': {'route-server-client': True}}
diff --git a/test/scenario_test/route_server_ipv4_v6_test.py b/test/scenario_test/route_server_ipv4_v6_test.py
index c32bfecf..c79939fd 100644
--- a/test/scenario_test/route_server_ipv4_v6_test.py
+++ b/test/scenario_test/route_server_ipv4_v6_test.py
@@ -63,16 +63,12 @@ class GoBGPIPv6Test(unittest.TestCase):
             g1.add_peer(ctn, is_rs_client=True)
             ctn.add_peer(g1)
 
-        br02 = Bridge(name='br02', subnet='2001::/96')
-        br02.addif(g1)
         for ctn in v6:
-            br02.addif(ctn)
-            g1.add_peer(ctn, is_rs_client=True, bridge=br02.name)
-            ctn.add_peer(g1, bridge=br02.name)
+            g1.add_peer(ctn, is_rs_client=True, v6=True)
+            ctn.add_peer(g1, v6=True)
 
         cls.gobgp = g1
         cls.quaggas = {'q1': q1, 'q2': q2, 'q3': q3, 'q4': q4}
-        cls.bridges = {'br02': br02}
         cls.ipv4s = {'q1': q1, 'q2': q2}
         cls.ipv6s = {'q3': q3, 'q4': q4}