I have the following one nit comment and one question: augment "/rt:routing/rt:ribs/rt:rib/" + "rt:routes/rt:route/rt:next-hop/rt:next-hop-options/" + "rt:next-hop-list/rt:next-hop-list/rt:next-hop" { description "Augment the multiple next hops with repair path."; uses repair-path; } The description is slightly misleading. It is to agument a single next-hop in the next-hop-list, not "multiple next hops". Shouldn't the repair path be applicable to static routes as well?