split part of the neighbor configuration coming from the config file into a dict

Author: thomas-mangin

src/exabgp/bgp/message/open/capability/capabilities.py

@@ -87,13 +87,13 @@ def _protocol(self, neighbor):
         self[Capability.CODE.MULTIPROTOCOL] = mp
 
     def _asn4(self, neighbor):
-        if not neighbor.asn4:
+        if not neighbor['capability']['asn4']:
             return
 
-        self[Capability.CODE.FOUR_BYTES_ASN] = ASN4(neighbor.local_as)
+        self[Capability.CODE.FOUR_BYTES_ASN] = ASN4(neighbor['local-as'])
 
     def _nexthop(self, neighbor):
-        if not neighbor.nexthop:
+        if not neighbor['capability']['nexthop']:
             return
 
         nexthops = neighbor.nexthops()
@@ -105,48 +105,48 @@ def _nexthop(self, neighbor):
         self[Capability.CODE.NEXTHOP] = NextHop(nh_pairs)
 
     def _addpath(self, neighbor):
-        if not neighbor.add_path:
+        if not neighbor['capability']['add-path']:
             return
 
         families = neighbor.addpaths()
         ap_families = []
         for allowed in self._ADD_PATH:
             if allowed in families:
                 ap_families.append(allowed)
-        self[Capability.CODE.ADD_PATH] = AddPath(ap_families, neighbor.add_path)
+        self[Capability.CODE.ADD_PATH] = AddPath(ap_families, neighbor['capability']['add-path'])
 
     def _graceful(self, neighbor, restarted):
-        if not neighbor.graceful_restart:
+        if not neighbor['capability']['graceful-restart']:
             return
 
         self[Capability.CODE.GRACEFUL_RESTART] = Graceful().set(
             Graceful.RESTART_STATE if restarted else 0x0,
-            neighbor.graceful_restart,
+            neighbor['capability']['graceful-restart'],
             [(afi, safi, Graceful.FORWARDING_STATE) for (afi, safi) in neighbor.families()],
         )
 
     def _refresh(self, neighbor):
-        if not neighbor.route_refresh:
+        if not neighbor['capability']['route-refresh']:
             return
         self[Capability.CODE.ROUTE_REFRESH] = RouteRefresh()
         self[Capability.CODE.ENHANCED_ROUTE_REFRESH] = EnhancedRouteRefresh()
 
     def _extended_message(self, neighbor):
-        if not neighbor.extended_message:
+        if not neighbor['capability']['extended-message']:
             return
 
         self[Capability.CODE.EXTENDED_MESSAGE] = ExtendedMessage()
 
     def _hostname(self, neighbor):
-        self[Capability.CODE.HOSTNAME] = HostName(neighbor.host_name, neighbor.domain_name)
+        self[Capability.CODE.HOSTNAME] = HostName(neighbor['host-name'], neighbor['domain-name'])
 
     def _operational(self, neighbor):
-        if not neighbor.operational:
+        if not neighbor['capability']['operational']:
             return
         self[Capability.CODE.OPERATIONAL] = Operational()
 
     def _session(self, neighbor):
-        if not neighbor.multisession:
+        if not neighbor['capability']['multi-session']:
             return
         # XXX: FIXME: should it not be the RFC version ?
         self[Capability.CODE.MULTISESSION] = MultiSession().set([Capability.CODE.MULTIPROTOCOL])

src/exabgp/bgp/message/open/capability/negotiated.py

@@ -37,7 +37,7 @@ def __init__(self, neighbor):
         self.msg_size = ExtendedMessage.INITIAL_SIZE
         self.operational = False
         self.refresh = REFRESH.ABSENT  # pylint: disable=E1101
-        self.aigp = None
+        self.aigp = neighbor['capability']['aigp']
         self.mismatch = []
 
     def sent(self, sent_open):
@@ -132,21 +132,21 @@ def _negotiate(self):
         # 		self.received_open_size = self.peer.bgp.received_open_size - 19
 
     def validate(self, neighbor):
-        if neighbor.peer_as is not None and self.peer_as != neighbor.peer_as:
+        if neighbor['peer-as'] is not None and self.peer_as != neighbor['peer-as']:
             return (
                 2,
                 2,
-                'ASN in OPEN (%d) did not match ASN expected (%d)' % (self.received_open.asn, neighbor.peer_as),
+                'ASN in OPEN (%d) did not match ASN expected (%d)' % (self.received_open.asn, neighbor['peer-as']),
             )
 
         # RFC 6286 : https://tools.ietf.org/html/rfc6286
         # XXX: FIXME: check that router id is not self
         if self.received_open.router_id == RouterID('0.0.0.0'):
             return (2, 3, '0.0.0.0 is an invalid router_id')
 
-        if self.received_open.asn == neighbor.local_as:
+        if self.received_open.asn == neighbor['local-as']:
             # router-id must be unique within an ASN
-            if self.received_open.router_id == neighbor.router_id:
+            if self.received_open.router_id == neighbor['router-id']:
                 return (
                     2,
                     3,
@@ -172,16 +172,16 @@ def validate(self, neighbor):
         return None
 
     def nexthopself(self, afi):
-        if afi == self.neighbor.local_address.afi:
-            return self.neighbor.local_address
+        if afi == self.neighbor['local-address'].afi:
+            return self.neighbor['local-address']
 
         # attempting to not barf for next-hop self when the peer is IPv6
         if afi == AFI.ipv4:
-            return self.neighbor.router_id
+            return self.neighbor['router-id']
 
         raise TypeError(
             'use of "next-hop self": the route (%s) does not have the same family as the BGP tcp session (%s)'
-            % (afi, self.neighbor.local_address.afi)
+            % (afi, self.neighbor['local-address'].afi)
         )
 
 

src/exabgp/bgp/message/update/attribute/aigp.py

@@ -78,7 +78,7 @@ def __ne__(self, other):
         return not self.__eq__(other)
 
     def pack(self, negotiated):
-        if negotiated.neighbor.aigp:
+        if negotiated.aigp:
             return self._packed
         if negotiated.local_as == negotiated.peer_as:
             return self._packed
@@ -89,7 +89,7 @@ def __repr__(self):
 
     @classmethod
     def unpack(cls, data, negotiated):
-        if not negotiated.neighbor.aigp:
+        if not negotiated.aigp:
             # AIGP must only be accepted on configured sessions
             return None
         return cls(unpack('!Q', data[:8] & 0x000000FFFFFFFFFF), data[:8])