From d221947a896df179e9f631dbefc6c9916e68a5f9 Mon Sep 17 00:00:00 2001
From: brent s <r00t@square-r00t.net>
Date: Fri, 15 May 2020 18:01:10 -0400
Subject: [PATCH] holy shit, more restructuring

---
 schema/lib/elements/he_ipv6.xsd |  6 ++++--
 schema/lib/types/he_ipv6.xsd    | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/schema/lib/elements/he_ipv6.xsd b/schema/lib/elements/he_ipv6.xsd
index 6abaf4d..da99644 100644
--- a/schema/lib/elements/he_ipv6.xsd
+++ b/schema/lib/elements/he_ipv6.xsd
@@ -23,14 +23,16 @@
           <xs:sequence minOccurs="1" maxOccurs="unbounded">
             <xs:element name="assign" minOccurs="1" maxOccurs="unbounded">
               <xs:complexType>
+                <xs:all>
+                  <xs:element name="ra" type="t_he_ipv6_ra" minOccurs="0" maxOccurs="1"/>
+                </xs:all>
                 <xs:attribute name="prefix" type="t_he_ipv6_prefix_local" use="optional" default="64"/>
                 <xs:attribute name="alloc" type="t_he_ipv6_prefix" use="optional" default="64"/>
                 <xs:attribute name="iface" type="t_linux_iface_name" use="required"/>
               </xs:complexType>
             </xs:element>
           </xs:sequence>
-          <xs:attribute name="radvd" type="xs:boolean" use="optional" default="false"/>
-          <xs:attribute name="radvdDns" type="xs:boolean" use="optional" default="false"/>
+          <xs:attribute name="raProvider" type="t_he_ipv6_ra_providers" use="optional"/>
         </xs:complexType>
         <xs:unique name="uniq_he_assign">
           <xs:selector xpath=".//*"/>
diff --git a/schema/lib/types/he_ipv6.xsd b/schema/lib/types/he_ipv6.xsd
index a663f61..463665f 100644
--- a/schema/lib/types/he_ipv6.xsd
+++ b/schema/lib/types/he_ipv6.xsd
@@ -17,4 +17,18 @@
     </xs:restriction>
   </xs:simpleType>
 
+  <xs:complexType name="t_he_ipv6_ra">
+    <xs:all>
+      <xs:element name="dns" type="xs:boolean" default="false"/>
+      <xs:element name="dhcpv6" type="xs:boolean" default="false"/>
+    </xs:all>
+  </xs:complexType>
+
+  <xs:simpleType name="t_he_ipv6_ra_providers">
+    <xs:restriction base="xs:token">
+      <xs:enumeration value="dnsmasq"/>
+      <xs:enumeration value="radvd"/>
+    </xs:restriction>
+  </xs:simpleType>
+
 </xs:schema>