From f478250e4930f3e0b964073ad08f3bb4d70c0794 Mon Sep 17 00:00:00 2001
From: Josef Reidinger <jreidinger@suse.cz>
Date: Wed, 6 May 2020 15:50:57 +0200
Subject: [PATCH] allow optional string and map types

---
 src/autoyast-rnc/configuration_management.rnc | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/autoyast-rnc/configuration_management.rnc b/src/autoyast-rnc/configuration_management.rnc
index 8feeb92e..e72928a6 100644
--- a/src/autoyast-rnc/configuration_management.rnc
+++ b/src/autoyast-rnc/configuration_management.rnc
@@ -2,23 +2,28 @@ default namespace = "http://www.suse.com/1.0/yast2ns"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
 namespace config = "http://www.suse.com/1.0/configns"
 
+include "common.rnc"
+
 configuration_management = element configuration_management {
-  element type { text }? &
-  element master { text }? &
-  element auth_attempts { INTEGER }? &
-  element auth_time_out { INTEGER }? &
-  element enable_services { BOOLEAN }? &
-  element formulas_roots { LIST, formulas_root* }? &
-  element states_roots { LIST, states_root* }? &
-  element pillar_root { text }? &
-  element pillar_url { text }? &
-  element keys_url { text }? &
-  element states_url { text }? &
-  element modules_url { LIST, modules_url* }? &
-  element enabled_states { LIST, enabled_state* }?
+  MAP,
+  (
+    element type { STRING }? &
+    element master { STRING }? &
+    element auth_attempts { INTEGER }? &
+    element auth_time_out { INTEGER }? &
+    element enable_services { BOOLEAN }? &
+    element formulas_roots { LIST, formulas_root* }? &
+    element states_roots { LIST, states_root* }? &
+    element pillar_root { STRING }? &
+    element pillar_url { STRING }? &
+    element keys_url { STRING }? &
+    element states_url { STRING }? &
+    element modules_url { LIST, modules_url* }? &
+    element enabled_states { LIST, enabled_state* }?
+  )
 }
 
-formulas_root = element (path | listentry) { text }
-states_root = element (path | listentry) { text }
-modules_url = element (url | listentry) { text }
-enabled_state = element (state | listentry) { text }
+formulas_root = element (path | listentry) { STRING }
+states_root = element (path | listentry) { STRING }
+modules_url = element (url | listentry) { STRING }
+enabled_state = element (state | listentry) { STRING }