Merge pull request #9798 from abuibrahim/master

fix broken northbound confd

8 files changed, 51 insertions, 5 deletions

diff --git a/yang/confd/confd.frr-ripd.yang b/yang/confd/confd.frr-ripd.yang
index 9b21c0756..7bbe54cca 100644
--- a/yang/confd/confd.frr-ripd.yang
+++ b/yang/confd/confd.frr-ripd.yang
@@ -11,8 +11,10 @@ module confd.frr-ripd {
 
   tailf:annotate-module "frr-ripd" {
     tailf:annotate-statement "container[name='ripd']" {
-      tailf:annotate-statement "container[name='state']" {
-        tailf:callpoint "state";
+      tailf:annotate-statement "list[name='instance']" {
+        tailf:annotate-statement "container[name='state']" {
+          tailf:callpoint "state";
+        }
       }
     }
     tailf:annotate-statement "rpc[name='clear-rip-route']" {
diff --git a/yang/confd/confd.frr-ripngd.yang b/yang/confd/confd.frr-ripngd.yang
index 5d876ff4d..83383fb45 100644
--- a/yang/confd/confd.frr-ripngd.yang
+++ b/yang/confd/confd.frr-ripngd.yang
@@ -11,8 +11,10 @@ module confd.frr-ripngd {
 
   tailf:annotate-module "frr-ripngd" {
     tailf:annotate-statement "container[name='ripngd']" {
-      tailf:annotate-statement "container[name='state']" {
-        tailf:callpoint "state";
+      tailf:annotate-statement "list[name='instance']" {
+        tailf:annotate-statement "container[name='state']" {
+          tailf:callpoint "state";
+        }
       }
     }
     tailf:annotate-statement "rpc[name='clear-ripng-route']" {
diff --git a/yang/frr-bgp-bmp.yang b/yang/frr-bgp-bmp.yang
index 2417874ea..cf945cabe 100644
--- a/yang/frr-bgp-bmp.yang
+++ b/yang/frr-bgp-bmp.yang
@@ -13,6 +13,8 @@ submodule frr-bgp-bmp {
     prefix frr-bt;
   }
 
+  include "frr-bgp-common-multiprotocol";
+
   organization
     "FRRouting";
   contact
diff --git a/yang/frr-bgp-common-structure.yang b/yang/frr-bgp-common-structure.yang
index 2ad22a143..3378c10c0 100644
--- a/yang/frr-bgp-common-structure.yang
+++ b/yang/frr-bgp-common-structure.yang
@@ -25,6 +25,8 @@ submodule frr-bgp-common-structure {
     prefix frr-bt;
   }
 
+  include "frr-bgp-common";
+
   organization
     "FRRouting";
   contact
diff --git a/yang/frr-bgp-neighbor.yang b/yang/frr-bgp-neighbor.yang
index 03af643ba..6d7358066 100644
--- a/yang/frr-bgp-neighbor.yang
+++ b/yang/frr-bgp-neighbor.yang
@@ -5,6 +5,10 @@ submodule frr-bgp-neighbor {
     prefix "bgp";
   }
 
+  include "frr-bgp-common-multiprotocol";
+
+  include "frr-bgp-common-structure";
+
   organization
     "FRRouting";
   contact
diff --git a/yang/frr-bgp-peer-group.yang b/yang/frr-bgp-peer-group.yang
index 80c9ecff2..15c31bf01 100644
--- a/yang/frr-bgp-peer-group.yang
+++ b/yang/frr-bgp-peer-group.yang
@@ -13,6 +13,10 @@ submodule frr-bgp-peer-group {
     prefix frr-bt;
   }
 
+  include "frr-bgp-common-structure";
+
+  include "frr-bgp-neighbor";
+
   organization
     "FRRouting";
   contact
diff --git a/yang/frr-routing.yang b/yang/frr-routing.yang
index f8441669a..6a721b292 100644
--- a/yang/frr-routing.yang
+++ b/yang/frr-routing.yang
@@ -1,7 +1,7 @@
 module frr-routing {
   yang-version "1.1";
   namespace "http://frrouting.org/yang/routing";
-  prefix "rt";
+  prefix "frr-routing";
 
   import ietf-yang-types {
     prefix "yang";
diff --git a/yang/subdir.am b/yang/subdir.am
index a2243fb8e..828ebd908 100644
--- a/yang/subdir.am
+++ b/yang/subdir.am
@@ -88,6 +88,10 @@ dist_yangmodels_DATA += yang/frr-bgp-types.yang
 dist_yangmodels_DATA += yang/frr-bgp.yang
 endif
 
+if OSPFD
+dist_yangmodels_DATA += yang/frr-ospfd.yang
+endif
+
 if PATHD
 dist_yangmodels_DATA += yang/frr-pathd.yang
 endif
@@ -97,3 +101,29 @@ CLEANFILES += \
 	yang/ietf/*.c \
 	yang/confd/*.c \
 	#
+
+if CONFD
+
+SUBMODULES = $(shell cd $(top_srcdir); grep -l belongs-to $(dist_yangmodels_DATA))
+EXCLUDED_MODULES = $(SUBMODULES) yang/frr-module-translator.yang
+YANG_MODULES = $(filter-out $(EXCLUDED_MODULES),$(dist_yangmodels_DATA))
+
+fxsdir = $(sysconfdir)/confd
+fxs_DATA = $(YANG_MODULES:.yang=.fxs)
+
+SUFFIXES += .fxs
+CLEANFILES += $(fxs_DATA)
+
+AM_V_CONFDC = $(AM_V_CONFDC_@AM_V@)
+AM_V_CONFDC_ = $(AM_V_CONFDC_@AM_DEFAULT_V@)
+AM_V_CONFDC_0 = @echo "  CONFDC  " $@;
+
+CONFDC_FLAGS = --yangpath $(srcdir)/yang --yangpath $(srcdir)/yang/ietf
+
+yang/%.fxs: yang/%.yang yang/confd/confd.%.yang
+	$(AM_V_CONFDC)$(CONFDC) $(CONFDC_FLAGS) -c -o $@ -a $(srcdir)/yang/confd/confd.$*.yang -- $<
+
+yang/%.fxs: yang/%.yang
+	$(AM_V_CONFDC)$(CONFDC) $(CONFDC_FLAGS) -c -o $@ -- $<
+
+endif