Merge branch 'current' into 2fa

14 files changed, 311 insertions, 159 deletions

diff --git a/interface-definitions/include/bgp/afi-export-import.xml.i b/interface-definitions/include/bgp/afi-export-import.xml.i
new file mode 100644
index 000000000..86817cdb3
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-export-import.xml.i
@@ -0,0 +1,41 @@
+<!-- include start from bgp/afi-export-import.xml.i -->
+<node name="export">
+  <properties>
+    <help>Export routes from this address-family</help>
+  </properties>
+  <children>
+    <leafNode name="vpn">
+      <properties>
+        <help>to/from default instance VPN RIB</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<node name="import">
+  <properties>
+    <help>Import routes to this address-family</help>
+  </properties>
+  <children>
+    <leafNode name="vpn">
+      <properties>
+        <help>to/from default instance VPN RIB</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="vrf">
+      <properties>
+        <help>VRF to import from</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>VRF instance name</description>
+        </valueHelp>
+        <completionHelp>
+          <path>vrf name</path>
+        </completionHelp>
+        <multi/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-l2vpn-common.xml.i b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
index 1673f25a5..8deb189ab 100644
--- a/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
+++ b/interface-definitions/include/bgp/afi-l2vpn-common.xml.i
@@ -11,17 +11,48 @@
     <valueless/>
   </properties>
 </leafNode>
-<leafNode name="rd">
+#include <include/bgp/route-distinguisher.xml.i>
+<node name="route-target">
   <properties>
-    <help>Route Distinguisher</help>
-    <valueHelp>
-      <format>txt</format>
-      <description>Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy)</description>
-    </valueHelp>
-    <constraint>
-      <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-    </constraint>
+    <help>Route Target</help>
   </properties>
-</leafNode>
-#include <include/bgp/route-target.xml.i>
+  <children>
+    <leafNode name="both">
+      <properties>
+        <help>Route Target both import and export</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="bgp-route-target" argument="--single"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="import">
+      <properties>
+        <help>Route Target import</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="bgp-route-target" argument="--single"/>
+        </constraint>
+      </properties>
+    </leafNode>
+    <leafNode name="export">
+      <properties>
+        <help>Route Target export</help>
+        <valueHelp>
+          <format>txt</format>
+          <description>Route target (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+        </valueHelp>
+        <constraint>
+          <validator name="bgp-route-target" argument="--single"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-label.xml.i b/interface-definitions/include/bgp/afi-label.xml.i
new file mode 100644
index 000000000..f7a1f609f
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-label.xml.i
@@ -0,0 +1,36 @@
+<!-- include start from bgp/afi-label.xml.i -->
+<node name="label">
+  <properties>
+    <help>Label value for VRF</help>
+  </properties>
+  <children>
+    <node name="vpn">
+      <properties>
+        <help>Between current address-family and VPN</help>
+      </properties>
+      <children>
+        <leafNode name="export">
+          <properties>
+            <help>For routes leaked from current address-family to VPN</help>
+            <completionHelp>
+              <list>auto</list>
+            </completionHelp>
+            <valueHelp>
+              <format>auto</format>
+              <description>Automatically assign a label</description>
+            </valueHelp>
+            <valueHelp>
+              <format>u32:0-1048575</format>
+              <description>Label Value</description>
+            </valueHelp>
+            <constraint>
+              <validator name="numeric" argument="--range 0-1048575"/>
+              <regex>^(auto)$</regex>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-path-limit.xml.i b/interface-definitions/include/bgp/afi-path-limit.xml.i
new file mode 100644
index 000000000..e3d630a57
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-path-limit.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bgp/afi-path-limit.xml.i -->
+<leafNode name="path-limit">
+  <properties>
+    <help>AS-path hopcount limit</help>
+    <valueHelp>
+      <format>u32:0-255</format>
+      <description>AS path hop count limit</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--range 0-255"/>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-rd.xml.i b/interface-definitions/include/bgp/afi-rd.xml.i
new file mode 100644
index 000000000..c4d29268c
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-rd.xml.i
@@ -0,0 +1,28 @@
+<!-- include start from bgp/afi-rd.xml.i -->
+<node name="rd">
+  <properties>
+    <help>Specify route distinguisher</help>
+  </properties>
+  <children>
+    <node name="vpn">
+      <properties>
+        <help>Between current address-family and VPN</help>
+      </properties>
+      <children>
+        <leafNode name="export">
+          <properties>
+            <help>For routes leaked from current address-family to VPN</help>
+            <valueHelp>
+              <format>ASN:NN_OR_IP-ADDRESS:NN</format>
+              <description>Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy)</description>
+            </valueHelp>
+            <constraint>
+              <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map-export-import.xml.i b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
new file mode 100644
index 000000000..eae10d312
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-map-export-import.xml.i
@@ -0,0 +1,34 @@
+<!-- include start from bgp/afi-route-map.xml.i -->
+<leafNode name="export">
+  <properties>
+    <help>Route-map to filter outgoing route updates</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route map name</description>
+    </valueHelp>
+    <constraint>
+      <regex>^[-_a-zA-Z0-9.]+$</regex>
+    </constraint>
+    <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
+  </properties>
+</leafNode>
+<leafNode name="import">
+  <properties>
+    <help>Route-map to filter incoming route updates</help>
+    <completionHelp>
+      <path>policy route-map</path>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Route map name</description>
+    </valueHelp>
+    <constraint>
+      <regex>^[-_a-zA-Z0-9.]+$</regex>
+    </constraint>
+    <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map-vpn.xml.i b/interface-definitions/include/bgp/afi-route-map-vpn.xml.i
new file mode 100644
index 000000000..e6be113c5
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-map-vpn.xml.i
@@ -0,0 +1,17 @@
+<!-- include start from bgp/afi-route-map-vpn.xml.i -->
+<node name="route-map">
+  <properties>
+    <help>Route-map to filter route updates to/from this peer</help>
+  </properties>
+  <children>
+    <node name="vpn">
+      <properties>
+        <help>Between current address-family and VPN</help>
+      </properties>
+      <children>
+        #include <include/bgp/afi-route-map-export-import.xml.i>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-map.xml.i b/interface-definitions/include/bgp/afi-route-map.xml.i
index 24a5ddd12..0b6178176 100644
--- a/interface-definitions/include/bgp/afi-route-map.xml.i
+++ b/interface-definitions/include/bgp/afi-route-map.xml.i
@@ -4,38 +4,7 @@
     <help>Route-map to filter route updates to/from this peer</help>
   </properties>
   <children>
-    <leafNode name="export">
-      <properties>
-        <help>Route-map to filter outgoing route updates</help>
-        <completionHelp>
-          <path>policy route-map</path>
-        </completionHelp>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route map name</description>
-        </valueHelp>
-        <constraint>
-          <regex>^[-_a-zA-Z0-9.]+$</regex>
-        </constraint>
-        <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
-      </properties>
-    </leafNode>
-    <leafNode name="import">
-      <properties>
-        <help>Route-map to filter incoming route updates</help>
-        <completionHelp>
-          <path>policy route-map</path>
-        </completionHelp>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route map name</description>
-        </valueHelp>
-        <constraint>
-          <regex>^[-_a-zA-Z0-9.]+$</regex>
-        </constraint>
-        <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
-      </properties>
-    </leafNode>
+    #include <include/bgp/afi-route-map-export-import.xml.i>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-route-target-vpn.xml.i b/interface-definitions/include/bgp/afi-route-target-vpn.xml.i
new file mode 100644
index 000000000..1dc184a02
--- /dev/null
+++ b/interface-definitions/include/bgp/afi-route-target-vpn.xml.i
@@ -0,0 +1,52 @@
+<!-- include start from bgp/route-target-both.xml.i -->
+<node name="route-target">
+  <properties>
+    <help>Specify route distinguisher</help>
+  </properties>
+  <children>
+    <node name="vpn">
+      <properties>
+        <help>Between current address-family and VPN</help>
+      </properties>
+      <children>
+        <leafNode name="both">
+          <properties>
+            <help>Route Target both import and export</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="bgp-route-target" argument="--multi"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="import">
+          <properties>
+            <help>Route Target import</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="bgp-route-target" argument="--multi"/>
+            </constraint>
+          </properties>
+        </leafNode>
+        <leafNode name="export">
+          <properties>
+            <help>Route Target export</help>
+            <valueHelp>
+              <format>txt</format>
+              <description>Space separated route target list (A.B.C.D:MN|EF:OPQR|GHJK:MN)</description>
+            </valueHelp>
+            <constraint>
+              <validator name="bgp-route-target" argument="--multi"/>
+            </constraint>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
+  </children>
+</node>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/neighbor-description.xml.i b/interface-definitions/include/bgp/neighbor-description.xml.i
deleted file mode 100644
index 3095d2560..000000000
--- a/interface-definitions/include/bgp/neighbor-description.xml.i
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- include start from bgp/neighbor-description.xml.i -->
-<leafNode name="description">
-  <properties>
-    <help>Neighbor specific description</help>
-  </properties>
-</leafNode>
-<!-- include end -->
diff --git a/interface-definitions/include/bgp/neighbor-local-as.xml.i b/interface-definitions/include/bgp/neighbor-local-as.xml.i
index 28c6b72b6..8868e3093 100644
--- a/interface-definitions/include/bgp/neighbor-local-as.xml.i
+++ b/interface-definitions/include/bgp/neighbor-local-as.xml.i
@@ -1,22 +1,29 @@
 <!-- include start from bgp/neighbor-local-as.xml.i -->
 <tagNode name="local-as">
   <properties>
-    <help>Local AS number [REQUIRED]</help>
+    <help>Specify alternate ASN for this BGP process</help>
     <valueHelp>
       <format>u32:1-4294967294</format>
-      <description>Local AS number</description>
+      <description>Autonomous System Number (ASN)</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-4294967294"/>
     </constraint>
   </properties>
   <children>
-    <leafNode name="no-prepend">
+    <node name="no-prepend">
       <properties>
-        <help>Disable prepending local-as to updates from EBGP peers</help>
-        <valueless/>
+        <help>Disable prepending local-as from/to updates for eBGP peers</help>
       </properties>
-    </leafNode>
+      <children>
+        <leafNode name="replace-as">
+          <properties>
+            <help>Prepend only local-as from/to updates for eBGP peers</help>
+            <valueless/>
+          </properties>
+        </leafNode>
+      </children>
+    </node>
   </children>
 </tagNode>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/protocol-common-config.xml.i b/interface-definitions/include/bgp/protocol-common-config.xml.i
index 5080ce588..2dfae517e 100644
--- a/interface-definitions/include/bgp/protocol-common-config.xml.i
+++ b/interface-definitions/include/bgp/protocol-common-config.xml.i
@@ -93,6 +93,9 @@
             </tagNode>
           </children>
         </node>
+        #include <include/bgp/afi-export-import.xml.i>
+        #include <include/bgp/afi-label.xml.i>
+        #include <include/bgp/afi-maximum-paths.xml.i>
         <tagNode name="network">
           <properties>
             <help>BGP network</help>
@@ -114,7 +117,9 @@
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
-        #include <include/bgp/afi-maximum-paths.xml.i>
+        #include <include/bgp/afi-rd.xml.i>
+        #include <include/bgp/afi-route-map-vpn.xml.i>
+        #include <include/bgp/afi-route-target-vpn.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
@@ -372,18 +377,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="rd">
-              <properties>
-                <help>Route Distinguisher</help>
-                <valueHelp>
-                  <format>txt</format>
-                  <description>Route Distinguisher, asn:xxx</description>
-                </valueHelp>
-                <constraint>
-                  <regex>^[0-9]{1,10}:[0-9]{1,5}$</regex>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/route-distinguisher.xml.i>
             <leafNode name="label">
               <properties>
                 <help>MPLS label value assigned to route</help>
@@ -489,6 +483,9 @@
             </tagNode>
           </children>
         </node>
+        #include <include/bgp/afi-export-import.xml.i>
+        #include <include/bgp/afi-label.xml.i>
+        #include <include/bgp/afi-maximum-paths.xml.i>
         <tagNode name="network">
           <properties>
             <help>BGP network</help>
@@ -501,22 +498,13 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="path-limit">
-              <properties>
-                <help>AS-path hopcount limit</help>
-                <valueHelp>
-                  <format>u32:0-255</format>
-                  <description>AS path hop count limit</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-255"/>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/afi-path-limit.xml.i>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
-        #include <include/bgp/afi-maximum-paths.xml.i>
+        #include <include/bgp/afi-rd.xml.i>
+        #include <include/bgp/afi-route-map-vpn.xml.i>
+        #include <include/bgp/afi-route-target-vpn.xml.i>
         <node name="redistribute">
           <properties>
             <help>Redistribute routes from other protocols into BGP</help>
@@ -672,18 +660,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="path-limit">
-              <properties>
-                <help>AS-path hopcount limit</help>
-                <valueHelp>
-                  <format>u32:0-255</format>
-                  <description>AS path hop count limit</description>
-                </valueHelp>
-                <constraint>
-                  <validator name="numeric" argument="--range 0-255"/>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/afi-path-limit.xml.i>
             #include <include/route-map.xml.i>
           </children>
         </tagNode>
@@ -772,18 +749,7 @@
             </constraint>
           </properties>
           <children>
-            <leafNode name="rd">
-              <properties>
-                <help>Route Distinguisher</help>
-                <valueHelp>
-                  <format>txt</format>
-                  <description>Route Distinguisher, asn:xxx</description>
-                </valueHelp>
-                <constraint>
-                  <regex>^[0-9]{1,10}:[0-9]{1,5}$</regex>
-                </constraint>
-              </properties>
-            </leafNode>
+            #include <include/bgp/route-distinguisher.xml.i>
             <leafNode name="label">
               <properties>
                 <help>MPLS label value assigned to route</help>
@@ -994,9 +960,9 @@
         </constraint>
       </properties>
     </leafNode>
+    #include <include/generic-description.xml.i>
     #include <include/bgp/neighbor-bfd.xml.i>
     #include <include/bgp/neighbor-capability.xml.i>
-    #include <include/bgp/neighbor-description.xml.i>
     #include <include/bgp/neighbor-disable-capability-negotiation.xml.i>
     #include <include/bgp/neighbor-disable-connected-check.xml.i>
     #include <include/bgp/neighbor-ebgp-multihop.xml.i>
@@ -1008,6 +974,7 @@
       <children>
         #include <include/bgp/peer-group.xml.i>
         #include <include/bgp/remote-as.xml.i>
+        #include <include/source-interface.xml.i>
         <node name="v6only">
           <properties>
             <help>Enable BGP with v6 link-local only</help>
@@ -1286,12 +1253,6 @@
             </constraint>
           </properties>
         </leafNode>
-        <leafNode name="no-ipv4-unicast">
-          <properties>
-            <help>Deactivate IPv4 unicast for a peer by default</help>
-            <valueless/>
-          </properties>
-        </leafNode>
       </children>
     </node>
     <leafNode name="deterministic-med">
@@ -1452,9 +1413,9 @@
         #include <include/bgp/neighbor-afi-l2vpn-evpn.xml.i>
       </children>
     </node>
+    #include <include/generic-description.xml.i>
     #include <include/bgp/neighbor-bfd.xml.i>
     #include <include/bgp/neighbor-capability.xml.i>
-    #include <include/bgp/neighbor-description.xml.i>
     #include <include/bgp/neighbor-disable-capability-negotiation.xml.i>
     #include <include/bgp/neighbor-disable-connected-check.xml.i>
     #include <include/bgp/neighbor-ebgp-multihop.xml.i>
diff --git a/interface-definitions/include/bgp/route-distinguisher.xml.i b/interface-definitions/include/bgp/route-distinguisher.xml.i
new file mode 100644
index 000000000..6d0aa3ef1
--- /dev/null
+++ b/interface-definitions/include/bgp/route-distinguisher.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from bgp/route-distinguisher.xml.i -->
+<leafNode name="rd">
+  <properties>
+    <help>Route Distinguisher</help>
+    <valueHelp>
+      <format>ASN:NN_OR_IP-ADDRESS:NN</format>
+      <description>Route Distinguisher, (x.x.x.x:yyy|xxxx:yyyy)</description>
+    </valueHelp>
+    <constraint>
+      <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/bgp/route-target.xml.i b/interface-definitions/include/bgp/route-target.xml.i
deleted file mode 100644
index 674b6db15..000000000
--- a/interface-definitions/include/bgp/route-target.xml.i
+++ /dev/null
@@ -1,45 +0,0 @@
-<!-- include start from bgp/route-target.xml.i -->
-<node name="route-target">
-  <properties>
-    <help>Route Target</help>
-  </properties>
-  <children>
-    <leafNode name="both">
-      <properties>
-        <help>Route Target both import and export</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="export">
-      <properties>
-        <help>Route Target export</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-    <leafNode name="import">
-      <properties>
-        <help>Route Target import</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Route target (x.x.x.x:yyy|xxxx:yyyy)</description>
-        </valueHelp>
-        <constraint>
-          <regex>^((25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)(\.(25[0-5]|2[0-4][0-9]|[1][0-9][0-9]|[1-9][0-9]|[0-9]?)){3}|[0-9]{1,10}):[0-9]{1,5}$</regex>
-        </constraint>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->