From ca75e23fee7e4c9f809e5cabf158e9aa749c997d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 27 Jan 2021 20:38:25 +0100
Subject: rpki: T3255: provide full protocol support in XML and Python

This commit provides the implementation of the OSPF CLI with a Jinja2 template
that is loaded by FRR reload.
---
 interface-definitions/protocols-rpki.xml.in | 85 +++++++++++------------------
 1 file changed, 31 insertions(+), 54 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/protocols-rpki.xml.in b/interface-definitions/protocols-rpki.xml.in
index b8db49e36..d96db0683 100644
--- a/interface-definitions/protocols-rpki.xml.in
+++ b/interface-definitions/protocols-rpki.xml.in
@@ -1,32 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Protocol RPKI configuration -->
 <interfaceDefinition>
   <node name="protocols">
     <children>
-      <node name="nrpki" owner="${vyos_conf_scripts_dir}/protocols_rpki.py">
+      <node name="rpki" owner="${vyos_conf_scripts_dir}/protocols_rpki.py">
         <properties>
           <help>BGP prefix origin validation</help>
         </properties>
         <children>
           <tagNode name="cache">
             <properties>
-              <help>RPKI cache server instance</help>
+              <help>RPKI cache server address</help>
+              <valueHelp>
+                <format>ipv4</format>
+                <description>IP address of NTP server</description>
+              </valueHelp>
+              <valueHelp>
+                <format>ipv6</format>
+                <description>IPv6 address of NTP server</description>
+              </valueHelp>
+              <valueHelp>
+                <format>hostname</format>
+                <description>Fully qualified domain name of NTP server</description>
+              </valueHelp>
+              <constraint>
+                <validator name="ipv4-address"/>
+                <validator name="ipv6-address"/>
+                <validator name="fqdn"/>
+              </constraint>
             </properties>
             <children>
-              <leafNode name="address">
+              #include <include/port-number.xml.i>
+              <leafNode name="preference">
                 <properties>
-                  <help>RPKI cache server address</help>
-                </properties>
-              </leafNode>
-              <leafNode name="port">
-                <properties>
-                  <help>TCP port number</help>
+                  <help>Preference of the cache server</help>
                   <valueHelp>
-                    <format>u32:1-65535</format>
-                    <description>TCP port number</description>
+                    <format>u32:1-255</format>
+                    <description>Polling period</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="numeric" argument="--range 1-65535"/>
+                    <validator name="numeric" argument="--range 1-255"/>
                   </constraint>
                 </properties>
               </leafNode>
@@ -68,55 +80,20 @@
               </node>
             </children>
           </tagNode>
-          <leafNode name="initial-synchronization-timeout">
-            <properties>
-              <help>Initial RPKI cache synchronization timeout</help>
-              <valueHelp>
-                <format>u32:0-4294967295</format>
-                <description>Initial RPKI cache synchronization timeout</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 0-4294967295"/>
-              </constraint>
-            </properties>
-          </leafNode>
           <leafNode name="polling-period">
             <properties>
-              <help>RPKI cache polling period</help>
-              <valueHelp>
-                <format>u32:1-1300</format>
-                <description>Polling period</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-1300"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="preference">
-            <properties>
-              <help>RPKI cache preference</help>
-              <valueHelp>
-                <format>u32:0-4294967295</format>
-                <description>RPKI cache preference</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 0-4294967295"/>
-              </constraint>
-            </properties>
-          </leafNode>
-          <leafNode name="timeout">
-            <properties>
-              <help>RPKI cache reply timeout</help>
+              <help>RPKI cache polling period (default: 600)</help>
               <valueHelp>
-                <format>u32:0-4294967295</format>
-                <description>RPKI cache reply timeout</description>
+                <format>u32:1-86400</format>
+                <description>Polling period in seconds</description>
               </valueHelp>
               <constraint>
-                <validator name="numeric" argument="--range 0-4294967295"/>
+                <validator name="numeric" argument="--range 1-86400"/>
               </constraint>
             </properties>
+            <defaultValue>600</defaultValue>
           </leafNode>
-        </children> 
+        </children>
       </node>
     </children>
   </node>
-- 
cgit v1.2.3