Skip to content

Commit

Permalink
tools: update to use FRR name
Browse files Browse the repository at this point in the history
Signed-off-by: Jafar Al-Gharaibeh <[email protected]>
  • Loading branch information
Jafaral committed Jul 12, 2017
1 parent 9abbae0 commit 1a8c43f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions tools/frr-reload.py
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ def compare_context_objects(newconf, running):
delete_bgpd = True
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'):
for line in running_ctx.lines:
lines_to_del.append((running_ctx_keys, line))
Expand Down Expand Up @@ -1010,7 +1010,7 @@ def compare_context_objects(newconf, running):
# the "neighbor 1.1.1.1 route-map FOO out" line...so we compare the
# 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
# reloading against has the following:
#
Expand Down Expand Up @@ -1038,7 +1038,7 @@ def compare_context_objects(newconf, running):
lines_to_add.extend(lines_to_add_first_pass)

# 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:
#
# interface swp1
Expand Down
4 changes: 2 additions & 2 deletions tools/multiple-bgpd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ PREFIX=192.168.145.
#PREFIX=3ffe:123:456::
ADDRPLEN=32
CONFBASE=/tmp
PIDBASE=/var/run/quagga
CHOWNSTR=quagga:quagga
PIDBASE=/var/run/frr
CHOWNSTR=frr:frr

for H in `seq 1 ${NUM}` ; do
CONF="${CONFBASE}"/bgpd${H}.conf
Expand Down
2 changes: 1 addition & 1 deletion tools/vty_index.cocci
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ fn << rule11.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 @
identifier rule11.fn;
identifier T, argname;
Expand Down

0 comments on commit 1a8c43f

Please sign in to comment.