Support different AY bridge forward delay attributes

yast · Jan 15, 2021 · 96209e1 · 96209e1
1 parent eccad29
commit 96209e1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/autoyast-rnc/networking.rnc b/src/autoyast-rnc/networking.rnc
@@ -219,7 +219,8 @@ bridge_settings = (
   element bridge              { STRING_ATTR, ("yes" | "no") }? &
   element bridge_ports        { STRING }? &
   element bridge_stp          { STRING_ATTR, ("on" | "off") }? &
-  element bridge_forwarddelay { STRING }?
+  element bridge_forwarddelay { STRING }? &
+  element bridge_forward_delay { STRING }?
 )
 
 #

diff --git a/src/lib/y2network/autoinst/interfaces_reader.rb b/src/lib/y2network/autoinst/interfaces_reader.rb
@@ -204,6 +204,11 @@ def load_bridge(config, interface_section)
         if !interface_section.bridge_stp.to_s.empty?
           config.stp = interface_section.bridge_stp == "on"
         end
+
+        if !interface_section.bridge_forwarddelay.to_s.empty?
+          config.forward_delay = interface_section.bridge_forwarddelay.to_i
+        end
+
         if !interface_section.bridge_forward_delay.to_s.empty?
           config.forward_delay = interface_section.bridge_forward_delay.to_i
         end

diff --git a/src/lib/y2network/autoinst_profile/interface_section.rb b/src/lib/y2network/autoinst_profile/interface_section.rb
@@ -78,6 +78,7 @@ def self.attributes
           { name: :bridge }, # yes/no # why? bridge always have to be yes
           { name: :bridge_ports },
           { name: :bridge_stp }, # on/off
+          { name: :bridge_forwarddelay },
           { name: :bridge_forward_delay },
           { name: :wireless_ap },
           { name: :wireless_auth_mode },
@@ -216,9 +217,13 @@ def self.attributes
       # @!attribute bridge_stp
       #  @return [String] "on" if stp is enabled
 
+      # @!attribute bridge_forwarddelay
+      #  @return [String] time of delay
+
       # @!attribute bridge_forward_delay
       #  @return [String] time of delay
 
+
       # @!attribute wireless_ap
       # @!attribute wireless_auth_mode
       # @!attribute wireless_bitrate