Merge pull request #1058 from yast/schema_change

Schema change

.gitignore

@@ -33,3 +33,4 @@ testsuite/run/
 /coverage
 *.pot
 config.*
+/test/data/scr_read/var/log

package/yast2-network.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 12 13:08:03 UTC 2020 - Josef Reidinger <jreidinger@suse.com>
+
+- Autoyast schema: Allow optional types for string and map objects
+  (bsc#1170886)
+- 4.3.0
+
 -------------------------------------------------------------------
 Thu Apr 16 07:19:26 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
 

package/yast2-network.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.2.66
+Version:        4.3.0
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

src/autoyast-rnc/host.rnc

@@ -1,14 +1,15 @@
 default namespace = "http://www.suse.com/1.0/yast2ns"
 namespace config = "http://www.suse.com/1.0/configns"
 namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-# These currently conflict with the including files
-# which would need adjustments
-#include "common.rnc"
+
+include "common.rnc"
+
 ## to be overriden if included
 #start = element profile { host }
 
 host =
   element host {
+    MAP,
     hosts?
   }
 
@@ -20,11 +21,14 @@ hosts =
 
 hosts_entry =
   element hosts_entry {
-    element host_address { text } &
+    MAP,
+    (
+      element host_address { STRING } &
 # we do not declare "names =, name =" because the conflict potential is big
-    element names {
-    LIST,
-      element name { text } +
-    }
+      element names {
+      LIST,
+        element name { STRING } +
+      }
+    )
   }