From 48d44c5471e991f07aa97e726e251efd91e03b72 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Tue, 3 Dec 2019 22:40:11 +0100
Subject: T1843: recursively include IP address definitions in VIF/VIF-S
 definitions

---
 interface-definitions/include/vif-s.xml.i | 60 ++-----------------------------
 interface-definitions/include/vif.xml.i   | 30 +---------------
 2 files changed, 3 insertions(+), 87 deletions(-)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/vif-s.xml.i b/interface-definitions/include/vif-s.xml.i
index 9726e9156..8828aca13 100644
--- a/interface-definitions/include/vif-s.xml.i
+++ b/interface-definitions/include/vif-s.xml.i
@@ -7,35 +7,7 @@
     <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
   </properties>
   <children>
-    <leafNode name="address">
-      <properties>
-        <help>IP address</help>
-        <completionHelp>
-          <list>dhcp dhcpv6</list>
-        </completionHelp>
-        <valueHelp>
-          <format>ipv4net</format>
-          <description>IPv4 address and prefix length</description>
-        </valueHelp>
-        <valueHelp>
-          <format>ipv6net</format>
-          <description>IPv6 address and prefix length</description>
-        </valueHelp>
-        <valueHelp>
-          <format>dhcp</format>
-          <description>Dynamic Host Configuration Protocol</description>
-        </valueHelp>
-        <valueHelp>
-          <format>dhcpv6</format>
-          <description>Dynamic Host Configuration Protocol for IPv6</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ip-cidr"/>
-          <regex>(dhcp|dhcpv6)</regex>
-        </constraint>
-        <multi/>
-      </properties>
-    </leafNode>
+    #include <include/address-ipv4-ipv6-dhcp.xml.i>
     <leafNode name="description">
       <properties>
         <help>Interface description</help>
@@ -153,35 +125,7 @@
         <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
       </properties>
       <children>
-        <leafNode name="address">
-          <properties>
-            <help>IP address</help>
-            <completionHelp>
-              <list>dhcp dhcpv6</list>
-            </completionHelp>
-            <valueHelp>
-              <format>ipv4net</format>
-              <description>IPv4 address and prefix length</description>
-            </valueHelp>
-            <valueHelp>
-              <format>ipv6net</format>
-              <description>IPv6 address and prefix length</description>
-            </valueHelp>
-            <valueHelp>
-              <format>dhcp</format>
-              <description>Dynamic Host Configuration Protocol</description>
-            </valueHelp>
-            <valueHelp>
-              <format>dhcpv6</format>
-              <description>Dynamic Host Configuration Protocol for IPv6</description>
-            </valueHelp>
-            <constraint>
-              <validator name="ip-cidr"/>
-              <regex>(dhcp|dhcpv6)</regex>
-            </constraint>
-            <multi/>
-          </properties>
-        </leafNode>
+        #include <include/address-ipv4-ipv6-dhcp.xml.i>
         <leafNode name="description">
           <properties>
             <help>Interface description</help>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index c6268dbe5..489107ece 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -11,35 +11,7 @@
     <constraintErrorMessage>VLAN ID must be between 0 and 4094</constraintErrorMessage>
   </properties>
   <children>
-    <leafNode name="address">
-      <properties>
-        <help>IP address</help>
-        <completionHelp>
-          <list>dhcp dhcpv6</list>
-        </completionHelp>
-        <valueHelp>
-          <format>ipv4net</format>
-          <description>IPv4 address and prefix length</description>
-        </valueHelp>
-        <valueHelp>
-          <format>ipv6net</format>
-          <description>IPv6 address and prefix length</description>
-        </valueHelp>
-        <valueHelp>
-          <format>dhcp</format>
-          <description>Dynamic Host Configuration Protocol</description>
-        </valueHelp>
-        <valueHelp>
-          <format>dhcpv6</format>
-          <description>Dynamic Host Configuration Protocol for IPv6</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ip-cidr"/>
-          <regex>(dhcp|dhcpv6)</regex>
-        </constraint>
-        <multi/>
-      </properties>
-    </leafNode>
+    #include <include/address-ipv4-ipv6-dhcp.xml.i>
     <leafNode name="description">
       <properties>
         <help>Interface description</help>
-- 
cgit v1.2.3