@@ -138,7 +138,7 @@ def __init__(self):
138138 # - have multiple exabgp toward one peer on the same host ( use of pid )
139139 # - have more than once connection toward a peer
140140 # - each connection has it own neihgbor (hence why identificator is not in Protocol)
141- self .uid = f" { self ._GLOBAL [' uid' ] } "
141+ self .uid = f' { self ._GLOBAL [" uid" ] } '
142142 self ._GLOBAL ['uid' ] += 1
143143
144144 def infer (self ):
@@ -159,7 +159,7 @@ def id(self):
159159 # This set must be unique between peer, not full draft-ietf-idr-bgp-multisession-07
160160 def index (self ):
161161 if self ['listen' ] != 0 :
162- return f" peer-ip { self [' peer-address' ]} listen { self [' listen' ] } "
162+ return f' peer-ip { self [" peer-address" ]} listen { self [" listen" ] } '
163163 return self .name ()
164164
165165 def make_rib (self ):
@@ -185,7 +185,7 @@ def name(self):
185185 local_addr = self ['local-address' ] if self ['peer-address' ] is not None else 'auto'
186186 local_as = self ['local-as' ] if self ['local-as' ] is not None else 'auto'
187187 peer_as = self ['peer-as' ] if self ['peer-as' ] is not None else 'auto'
188- return f" neighbor { self [' peer-address' ]} local-ip { local_addr } local-as { local_as } peer-as { peer_as } router-id { self [' router-id' ]} family-allowed { session } "
188+ return f' neighbor { self [" peer-address" ]} local-ip { local_addr } local-as { local_as } peer-as { peer_as } router-id { self [" router-id" ]} family-allowed { session } '
189189
190190 def families (self ):
191191 # this list() is important .. as we use the function to modify self._families
@@ -492,25 +492,25 @@ def configuration(cls, neighbor, with_changes=True):
492492 f'\n \t passive { "true" if neighbor ["passive" ] else "false" } ;\n '
493493 + (f'\n \t listen { neighbor ["listen" ]} ;\n ' if neighbor ['listen' ] else '' )
494494 + (f'\n \t connect { neighbor ["connect" ]} ;\n ' if neighbor ['connect' ] else '' )
495- + f" \t group-updates { ' true' if neighbor [' group-updates' ] else ' false' } ;\n "
496- f" \t auto-flush { ' true' if neighbor [' auto-flush' ] else ' false' } ;\n "
497- f" \t adj-rib-in { ' true' if neighbor [' adj-rib-in' ] else ' false' } ;\n "
498- f" \t adj-rib-out { ' true' if neighbor [' adj-rib-out' ] else ' false' } ;\n "
495+ + f' \t group-updates { " true" if neighbor [" group-updates" ] else " false" } ;\n '
496+ f' \t auto-flush { " true" if neighbor [" auto-flush" ] else " false" } ;\n '
497+ f' \t adj-rib-in { " true" if neighbor [" adj-rib-in" ] else " false" } ;\n '
498+ f' \t adj-rib-out { " true" if neighbor [" adj-rib-out" ] else " false" } ;\n '
499499 + (f'\t md5-password "{ neighbor ["md5-password" ]} ";\n ' if neighbor ['md5-password' ] else '' )
500500 + f'\t md5-base64 { md5_base64_str } ;\n '
501501 + (f'\t md5-ip "{ neighbor ["md5-ip" ]} ";\n ' if not neighbor .auto_discovery else '' )
502502 + (f'\t outgoing-ttl { neighbor ["outgoing-ttl" ]} ;\n ' if neighbor ['outgoing-ttl' ] else '' )
503503 + (f'\t incoming-ttl { neighbor ["incoming-ttl" ]} ;\n ' if neighbor ['incoming-ttl' ] else '' )
504504 + f'\t capability {{\n '
505- f" \t \t asn4 { ' enable' if neighbor [' capability' ][ ' asn4' ] else ' disable' } ;\n "
506- f" \t \t route-refresh { ' enable' if neighbor [' capability' ][ ' route-refresh' ] else ' disable' } ;\n "
507- f" \t \t graceful-restart { neighbor [' capability' ][ ' graceful-restart' ] if neighbor [' capability' ][ ' graceful-restart' ] else ' disable' } ;\n "
508- f" \t \t software-version { ' enable' if neighbor [' capability' ][ ' software-version' ] else ' disable' } ;\n "
509- f" \t \t nexthop { ' enable' if neighbor [' capability' ][ ' nexthop' ] else ' disable' } ;\n "
510- f" \t \t add-path { add_path_str } ;\n "
511- f" \t \t multi-session { ' enable' if neighbor [' capability' ][ ' multi-session' ] else ' disable' } ;\n "
512- f" \t \t operational { ' enable' if neighbor [' capability' ][ ' operational' ] else ' disable' } ;\n "
513- f" \t \t aigp { ' enable' if neighbor [' capability' ][ ' aigp' ] else ' disable' } ;\n "
505+ f' \t \t asn4 { " enable" if neighbor [" capability" ][ " asn4" ] else " disable" } ;\n '
506+ f' \t \t route-refresh { " enable" if neighbor [" capability" ][ " route-refresh" ] else " disable" } ;\n '
507+ f' \t \t graceful-restart { neighbor [" capability" ][ " graceful-restart" ] if neighbor [" capability" ][ " graceful-restart" ] else " disable" } ;\n '
508+ f' \t \t software-version { " enable" if neighbor [" capability" ][ " software-version" ] else " disable" } ;\n '
509+ f' \t \t nexthop { " enable" if neighbor [" capability" ][ " nexthop" ] else " disable" } ;\n '
510+ f' \t \t add-path { add_path_str } ;\n '
511+ f' \t \t multi-session { " enable" if neighbor [" capability" ][ " multi-session" ] else " disable" } ;\n '
512+ f' \t \t operational { " enable" if neighbor [" capability" ][ " operational" ] else " disable" } ;\n '
513+ f' \t \t aigp { " enable" if neighbor [" capability" ][ " aigp" ] else " disable" } ;\n '
514514 f'\t }}\n '
515515 f'\t family {{{ families } \n '
516516 f'\t }}\n '
@@ -586,29 +586,29 @@ def as_dict(cls, answer):
586586 def formated_dict (cls , answer ):
587587 if answer ['duration' ]:
588588 duration_value = timedelta (seconds = answer ['duration' ])
589- duration = f" { ' up for' :<20} { str (duration_value ):>15} { '' :<15} { '' :<15} "
589+ duration = f' { " up for" :<20} { str (duration_value ):>15} { "" :<15} { "" :<15} '
590590 else :
591591 down_value = timedelta (seconds = answer ['down' ])
592- duration = f" { ' down for' :<20} { str (down_value ):>15} { '' :<15} { '' :<15} "
592+ duration = f' { " down for" :<20} { str (down_value ):>15} { "" :<15} { "" :<15} '
593593
594594 formated = {
595595 'peer-address' : answer ['peer-address' ],
596- 'local-address' : f" { ' local' :<20} { answer [' local-address' ]:>15} { '' :<15} { '' :<15} " ,
597- 'state' : f" { ' state' :<20} { answer [' state' ]:>15} { '' :<15} { '' :<15} " ,
596+ 'local-address' : f' { " local" :<20} { answer [" local-address" ]:>15} { "" :<15} { "" :<15} ' ,
597+ 'state' : f' { " state" :<20} { answer [" state" ]:>15} { "" :<15} { "" :<15} ' ,
598598 'duration' : duration ,
599- 'as' : f" { 'AS' :<20} { answer [' local-as' ]:>15} { _pr (answer [' peer-as' ]):>15} { '' :<15} " ,
600- 'id' : f" { 'ID' :<20} { answer [' local-id' ]:>15} { _pr (answer [' peer-id' ]):>15} { '' :<15} " ,
601- 'hold' : f" { ' hold-time' :<20} { answer [' local-hold' ]:>15} { _pr (answer [' peer-hold' ]):>15} { '' :<15} " ,
599+ 'as' : f' { "AS" :<20} { answer [" local-as" ]:>15} { _pr (answer [" peer-as" ]):>15} { "" :<15} ' ,
600+ 'id' : f' { "ID" :<20} { answer [" local-id" ]:>15} { _pr (answer [" peer-id" ]):>15} { "" :<15} ' ,
601+ 'hold' : f' { " hold-time" :<20} { answer [" local-hold" ]:>15} { _pr (answer [" peer-hold" ]):>15} { "" :<15} ' ,
602602 'capabilities' : '\n ' .join (
603- f" { f' { k } :' :<20} { _en (lc ):>15} { _en (pc ):>15} { '' :<15} "
603+ f' { f" { k } :" :<20} { _en (lc ):>15} { _en (pc ):>15} { "" :<15} '
604604 for k , (lc , pc ) in answer ['capabilities' ].items ()
605605 ),
606606 'families' : '\n ' .join (
607- f" { f' { a } { s } :' :<20} { _en (lf ):>15} { _en (rf ):>15} { _addpath (aps , apr ):<15} "
607+ f' { f" { a } { s } :" :<20} { _en (lf ):>15} { _en (rf ):>15} { _addpath (aps , apr ):<15} '
608608 for (a , s ), (lf , rf , apr , aps ) in answer ['families' ].items ()
609609 ),
610610 'messages' : '\n ' .join (
611- f" { f' { k } :' :<20} { ms !s:>15} { mr !s:>15} { '' :<15} " for k , (ms , mr ) in answer ['messages' ].items ()
611+ f' { f" { k } :" :<20} { ms !s:>15} { mr !s:>15} { "" :<15} ' for k , (ms , mr ) in answer ['messages' ].items ()
612612 ),
613613 }
614614
0 commit comments