Merge pull request #241 from apwiggins/FRR-patch-1

Frr patch 1 - add basic FRR service functionality

daemon/core/services/frr.py

@@ -171,7 +171,7 @@ bootdaemon()
 
     flags=""
 
-    if [ "$1" = "xpimd" ] && \\
+    if [ "$1" = "pimd" ] && \\
         grep -E -q '^[[:space:]]*router[[:space:]]+pim6[[:space:]]*$' $FRR_CONF; then
         flags="$flags -6"
     fi
@@ -210,7 +210,7 @@ bootfrr()
     done
 
     if grep -E -q '^[[:space:]]*router[[:space:]]+pim6?[[:space:]]*$' $FRR_CONF; then
-        bootdaemon "xpimd"
+        bootdaemon "pimd"
     fi
 
     $FRR_BIN_DIR/vtysh -b
@@ -597,7 +597,7 @@ class FRRBabel(FrrService):
             if hasattr(ifc, "control") and ifc.control is True:
                 continue
             cfg += "  network %s\n" % ifc.name
-        cfg += "  redistribute static\n  redistribute connected\n"
+        cfg += "  redistribute static\n  redistribute ipv4 connected\n"
         return cfg
 
     @classmethod
@@ -608,14 +608,14 @@ class FRRBabel(FrrService):
             return "  babel wired\n  babel split-horizon\n"
 
 
-class FRRXpimd(FrrService):
+class FRRpimd(FrrService):
     """
     PIM multicast routing based on XORP.
     """
-    name = 'FRRXpimd'
+    name = 'FRRpimd'
     startup = ()
-    shutdown = ('killall xpimd',)
-    validate = ('pidof xpimd',)
+    shutdown = ('killall pimd',)
+    validate = ('pidof pimd',)
     ipv4_routing = True
 
     @classmethod

daemon/data/core.conf

@@ -12,6 +12,9 @@ port = 4038
 numthreads = 1
 quagga_bin_search = "/usr/local/bin /usr/bin /usr/lib/quagga"
 quagga_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/quagga"
+frr_bin_search = "/usr/local/bin /usr/bin /usr/lib/frr"
+frr_sbin_search = "/usr/local/sbin /usr/sbin /usr/lib/frr"
+
 # uncomment the following line to load custom services from the specified dir
 #   this may be a comma-separated list, and directory names should be unique
 #   and not named 'services'