tools: update to use FRR name

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
This commit is contained in:
Jafar Al-Gharaibeh 2017-07-12 13:26:22 -05:00
parent 9abbae000b
commit 1a8c43f114
3 changed files with 6 additions and 6 deletions

View file

@ -812,7 +812,7 @@ def compare_context_objects(newconf, running):
delete_bgpd = True delete_bgpd = True
lines_to_del.append((running_ctx_keys, None)) lines_to_del.append((running_ctx_keys, None))
# We cannot do 'no interface' in quagga, and so deal with it # We cannot do 'no interface' in FRR, and so deal with it
elif running_ctx_keys[0].startswith('interface'): elif running_ctx_keys[0].startswith('interface'):
for line in running_ctx.lines: for line in running_ctx.lines:
lines_to_del.append((running_ctx_keys, line)) lines_to_del.append((running_ctx_keys, line))
@ -1010,7 +1010,7 @@ if __name__ == '__main__':
# the "neighbor 1.1.1.1 route-map FOO out" line...so we compare the # the "neighbor 1.1.1.1 route-map FOO out" line...so we compare the
# configs again to put this line back. # configs again to put this line back.
# There are many keywords in quagga that can only appear one time under # There are many keywords in FRR that can only appear one time under
# a context, take "bgp router-id" for example. If the config that we are # a context, take "bgp router-id" for example. If the config that we are
# reloading against has the following: # reloading against has the following:
# #
@ -1038,7 +1038,7 @@ if __name__ == '__main__':
lines_to_add.extend(lines_to_add_first_pass) lines_to_add.extend(lines_to_add_first_pass)
# Only do deletes on the first pass. The reason being if we # Only do deletes on the first pass. The reason being if we
# configure a bgp neighbor via "neighbor swp1 interface" quagga # configure a bgp neighbor via "neighbor swp1 interface" FRR
# will automatically add: # will automatically add:
# #
# interface swp1 # interface swp1

View file

@ -10,8 +10,8 @@ PREFIX=192.168.145.
#PREFIX=3ffe:123:456:: #PREFIX=3ffe:123:456::
ADDRPLEN=32 ADDRPLEN=32
CONFBASE=/tmp CONFBASE=/tmp
PIDBASE=/var/run/quagga PIDBASE=/var/run/frr
CHOWNSTR=quagga:quagga CHOWNSTR=frr:frr
for H in `seq 1 ${NUM}` ; do for H in `seq 1 ${NUM}` ; do
CONF="${CONFBASE}"/bgpd${H}.conf CONF="${CONFBASE}"/bgpd${H}.conf

View file

@ -141,7 +141,7 @@ fn << rule11.fn;
@@ @@
print "R11 removing vty-index argument on %s(...)" % (fn) print "R11 removing vty-index argument on %s(...)" % (fn)
#/* find type of the argument - note args are mostly unnamed in Quagga :( */ #/* find type of the argument - note args are mostly unnamed in FRR :( */
@ rule12 @ @ rule12 @
identifier rule11.fn; identifier rule11.fn;
identifier T, argname; identifier T, argname;