From b60c4b2c0a27307f48a6760bb2f32392029a1055 Mon Sep 17 00:00:00 2001
From: Martin Winter <mwinter@opensourcerouting.org>
Date: Thu, 7 Feb 2019 15:12:14 -0800
Subject: [PATCH] snapcraft: Add FabricD to Snap package

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
---
 snapcraft/README.snap_build.md          |  8 ++++++++
 snapcraft/README.usage.md               |  2 ++
 snapcraft/defaults/fabricd.conf.default |  0
 snapcraft/scripts/Makefile              |  1 +
 snapcraft/scripts/fabricd-service       | 13 +++++++++++++
 snapcraft/snapcraft.yaml.in             | 18 ++++++++++++++++--
 6 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 snapcraft/defaults/fabricd.conf.default
 create mode 100644 snapcraft/scripts/fabricd-service

diff --git a/snapcraft/README.snap_build.md b/snapcraft/README.snap_build.md
index 7c42848451..e43f63f2d9 100644
--- a/snapcraft/README.snap_build.md
+++ b/snapcraft/README.snap_build.md
@@ -92,6 +92,14 @@ All the commands are prefixed with frr.
     frr.ripngd-debug
     frr.ldp-debug
     frr.zebra-debug
+    frr.pimd-debug
+    frr.nhrpd-debug
+    frr.babeld-debug
+    frr.eigrpd-debug
+    frr.pbrd-debug
+    frr.staticd-debug
+    frr.bfdd-debug
+    frr.fabricd-debug
 
 vtysh can be accessed as frr.vtysh (Make sure you have /snap/bin in your
 path). If access as `vtysh` instead of `frr.vtysh` is needed, you can enable it
diff --git a/snapcraft/README.usage.md b/snapcraft/README.usage.md
index a7b51a5656..6a0864c8c5 100644
--- a/snapcraft/README.usage.md
+++ b/snapcraft/README.usage.md
@@ -66,6 +66,8 @@ depend on them). These are mainly intended to debug the Snap
         Starts staticd daemon in foreground
 - `frr.bfdd-debug`:
         Starts bfdd daemon in foreground
+- `frr.fabricd-debug`:
+        Starts fabricd daemon in foreground
 
 MPLS (LDP)
 ----------
diff --git a/snapcraft/defaults/fabricd.conf.default b/snapcraft/defaults/fabricd.conf.default
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/snapcraft/scripts/Makefile b/snapcraft/scripts/Makefile
index e3a7708f23..7ddb7f0769 100644
--- a/snapcraft/scripts/Makefile
+++ b/snapcraft/scripts/Makefile
@@ -17,6 +17,7 @@ install:
 	install -D -m 0755 pbrd-service $(DESTDIR)/bin/
 	install -D -m 0755 staticd-service $(DESTDIR)/bin/
 	install -D -m 0755 bfdd-service $(DESTDIR)/bin/
+	install -D -m 0755 fabricd-service $(DESTDIR)/bin/
 	install -D -m 0755 set-options $(DESTDIR)/bin/
 	install -D -m 0755 show_version $(DESTDIR)/bin/
 
diff --git a/snapcraft/scripts/fabricd-service b/snapcraft/scripts/fabricd-service
new file mode 100644
index 0000000000..586f061ef0
--- /dev/null
+++ b/snapcraft/scripts/fabricd-service
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e -x
+
+if ! [ -e $SNAP_DATA/fabricd.conf ]; then
+    cp $SNAP/etc/frr/fabricd.conf.default $SNAP_DATA/fabricd.conf
+fi
+exec $SNAP/sbin/fabricd \
+    -f $SNAP_DATA/fabricd.conf \
+    --pid_file $SNAP_DATA/fabricd.pid \
+    --socket $SNAP_DATA/zsock \
+    --vty_socket $SNAP_DATA
+
diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in
index a0222a86a4..54865b9c80 100644
--- a/snapcraft/snapcraft.yaml.in
+++ b/snapcraft/snapcraft.yaml.in
@@ -4,8 +4,8 @@ summary: FRRouting BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP/EIGRP/BFD routing da
 description: BGP/OSPFv2/OSPFv3/ISIS/RIP/RIPng/PIM/LDP/EIGRP/BFD routing daemon
  FRRouting (FRR) is free software which manages TCP/IP based routing 
  protocols. It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, 
- RIPng, PIM, LDP, Babel, EIGRP, PBR (Policy-based routing) and BFD as well as
- the IPv6 versions of these.
+ RIPng, PIM, LDP, Babel, EIGRP, PBR (Policy-based routing), BFD and OpenFabric
+ as well as the IPv6 versions of these.
  FRRouting (frr) is a fork of Quagga.
 confinement: strict
 grade: devel
@@ -127,6 +127,13 @@ apps:
             - network
             - network-bind
             - network-control
+    fabricd:
+        command: bin/fabricd-service
+        daemon: simple
+        plugs:
+            - network
+            - network-bind
+            - network-control
     set:
         command: bin/set-options
     zebra-debug:
@@ -219,6 +226,12 @@ apps:
             - network
             - network-bind
             - network-control
+    fabricd-debug:
+        command: sbin/fabricd -f $SNAP_DATA/fabricd.conf --pid_file $SNAP_DATA/fabricd.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA
+        plugs:
+            - network
+            - network-bind
+            - network-control
 
 parts:
     rtrlib:
@@ -337,6 +350,7 @@ parts:
             eigrpd.conf.default: etc/frr/eigrpd.conf.default
             pbrd.conf.default: etc/frr/pbrd.conf.default
             bfdd.conf.default: etc/frr/bfdd.conf.default
+            fabricd.conf.default: etc/frr/fabricd.conf.default
             vtysh.conf.default: etc/frr/vtysh.conf.default
             staticd.conf.default: etc/frr/staticd.conf.default
     frr-scripts:
-- 
2.39.5