Merge 1466a68 into e874035

yast · Feb 18, 2022 · f92aa59 · f92aa59
2 parents e874035 + 1466a68
commit f92aa59
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 2 deletions.
diff --git a/package/yast2-fcoe-client.changes b/package/yast2-fcoe-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 18 11:47:53 UTC 2022 - Knut Anderssen <kanderssen@suse.com>
+
+- Added AutoYaST schema (bsc#1194895)
+- 4.3.1
+
 -------------------------------------------------------------------
 Mon Aug 10 17:49:50 CEST 2020 - schubi@suse.de
 

diff --git a/package/yast2-fcoe-client.spec b/package/yast2-fcoe-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-fcoe-client
-Version:        4.3.0
+Version:        4.3.1
 Release:        0
 Summary:        YaST2 - Configuration of Fibre Channel over Ethernet
 Group:          System/YaST
@@ -62,6 +62,7 @@ Ethernet (FCoE) configuration.
 %{yast_scrconfdir}
 %doc %{yast_docdir}
 %{yast_icondir}
+%{yast_schemadir}
 %license COPYING
 
 %changelog
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -17,6 +17,10 @@ ynclude_DATA = \
   include/fcoe-client/complex.rb \
   include/fcoe-client/helps.rb
 
+schemafilesdir = $(schemadir)/autoyast/rnc
+schemafiles_DATA = \
+  autoyast-rnc/fcoe-client.rnc
+
 scrconf_DATA = \
   scrconf/fcoe_config.scr \
   scrconf/fcoe_cfg-ethx.scr
@@ -31,6 +35,7 @@ scalabledir = @icondir@/hicolor/scalable/apps
 scalable_DATA = \
   icons/hicolor/scalable/apps/yast-fcoe.svg
 
-EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA) $(scrconf_DATA) $(desktop_DATA) $(symbolic_DATA) $(scalable_DATA)
+EXTRA_DIST = $(module_DATA) $(client_DATA) $(ynclude_DATA)  $(scrconf_DATA) $(desktop_DATA) \
+             $(schemafiles_DATA) $(symbolic_DATA) $(scalable_DATA)
 
 include $(top_srcdir)/Makefile.am.common
diff --git a/src/autoyast-rnc/fcoe-client.rnc b/src/autoyast-rnc/fcoe-client.rnc
@@ -0,0 +1,51 @@
+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"
+
+fcoe-client =
+  element fcoe-client {
+    MAP,
+    (
+      fcoe_cfg? &
+      fcoe_interfaces? &
+      fcoe_service_start?
+    )
+  }
+
+
+fcoe_cfg = element fcoe_cfg {
+      MAP,
+      (
+        element DEBUG { STRING_ATTR, ("yes" | "no") } &
+        element USE_SYSLOG { STRING_ATTR, ("yes" | "no") }
+      )
+}
+
+fcoe_interfaces = element interfaces {
+      LIST,
+      element (interface | listentry) {
+        MAP,
+        (
+          element dev_name { STRING } &
+          element mac_addr { STRING } &
+          element device   { STRING } &
+          element vlan_interface { STRING } &
+          element fcoe_vlan { STRING } &
+          element fcoe_enable { STRING_ATTR, ("yes" | "no") } &
+          element dcb_required { STRING_ATTR, ("yes" | "no") } &
+          element auto_vlan { STRING_ATTR, ("yes" | "no") } &
+          element dcb_capable { STRING_ATTR, ("yes" | "no") } &
+          element cfg_device { STRING }
+        )
+      }*
+}
+
+fcoe_service_start = element service_start {
+      MAP,
+      (
+        element fcoe { BOOLEAN } &
+        element lldpad { BOOLEAN }
+      )
+}
diff --git a/src/desktop/org.opensuse.yast.FCoEClient.desktop b/src/desktop/org.opensuse.yast.FCoEClient.desktop
@@ -14,6 +14,7 @@ X-SuSE-YaST-Geometry=
 X-SuSE-YaST-SortKey=
 X-SuSE-YaST-AutoInstResource=fcoe-client
 X-SuSE-YaST-AutoInstClonable=true
+X-SuSE-YaST-AutoInstSchema=fcoe-client.rnc
 X-SuSE-YaST-Keywords=fibre,channel,ethernet,network
 
 Icon=yast-fcoe