More robust FcoeClient (when vlan_fcoe is an empty string)

yast · Feb 20, 2020 · bbf3362 · bbf3362
1 parent 855334e
commit bbf3362
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/modules/FcoeClient.rb b/src/modules/FcoeClient.rb
@@ -1689,7 +1689,8 @@ def AutoPackages
     # @param card [Hash] a hash with all the information about a network interface
     # @return [String, nil] nil if no FCoE VLAN is configured for the given interface
     def fcoe_vlan(card)
-      fcoe_vlan = card.fetch("fcoe_vlan", "")
+      fcoe_vlan = card["fcoe_vlan"]
+      return nil if fcoe_vlan.nil? || fcoe_vlan.empty?
       return nil if fcoe_vlan == @NOT_AVAILABLE || fcoe_vlan == @NOT_CONFIGURED
 
       fcoe_vlan

diff --git a/test/fcoe_client_write_spec.rb b/test/fcoe_client_write_spec.rb
@@ -25,7 +25,8 @@
       let(:interfaces) do
         [
           { "dev_name" => "eth0", "fcoe_vlan" => "not available" },
-          { "dev_name" => "eth1", "fcoe_vlan" => "not configured" }
+          { "dev_name" => "eth1", "fcoe_vlan" => "not configured" },
+          { "dev_name" => "eth2", "fcoe_vlan" => "" },
         ]
       end
 
@@ -46,6 +47,7 @@
         [
           { "dev_name" => "eth0", "fcoe_vlan" => "not available" },
           { "dev_name" => "eth1", "fcoe_vlan" => "eth1.500-fcoe" },
+          { "dev_name" => "eth2", "fcoe_vlan" => "" },
         ]
       end