Skip to content

Commit

Permalink
rename isiBFT? to iBFT? and publish iBFT? (rename equal_nodes to equa…
Browse files Browse the repository at this point in the history
…lNodes)
  • Loading branch information
gabi2 committed Feb 16, 2016
1 parent c278ce6 commit 6b0bba2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/include/iscsi-client/dialogs.rb
Expand Up @@ -533,7 +533,7 @@ def ConnAuthDialog(return_to)
Label.NextButton
)

if (IscsiClientLib.isiBFT?(IscsiClientLib.getCurrentNodeValues))
if (IscsiClientLib.iBFT?(IscsiClientLib.getCurrentNodeValues))
UI.ChangeWidget(Id("startup"), :Enabled, false)
end

Expand Down
10 changes: 5 additions & 5 deletions src/modules/IscsiClientLib.rb
Expand Up @@ -782,7 +782,7 @@ def getCurrentNodeValues
#
# @return [Bool] nodes are equal?
#
def equal_nodes?(n1, n2)
def equalNodes?(n1, n2)
return false if n1.empty?

keys = [
Expand All @@ -800,8 +800,8 @@ def equal_nodes?(n1, n2)
# @param [Hash] iSCSI node values as hash
# @return [Bool] is iSCSI session booted from firmware?
#
def isiBFT?(node_info)
return equal_nodes?(getiBFT, node_info)
def iBFT?(node_info)
return equalNodes?(getiBFT, node_info)
end

# Get (manual/onboot/automatic) status of target connection
Expand All @@ -812,7 +812,7 @@ def getStartupStatus
log.info "Getting status of record #{@currentRecord}"
curr_node = getCurrentNodeValues

if (isiBFT?(curr_node))
if (iBFT?(curr_node))
# always show status "onboot" for iBFT (startup value from node doesn't matter)
log.info "Startup status for iBFT is always onboot"
return "onboot"
Expand Down Expand Up @@ -1731,7 +1731,7 @@ def GetDiscoveryCmd(ip, port, use_fw: false, only_new: false)
publish :function => :LoadOffloadModules, :type => "list <string> ()"
publish :function => :GetDiscoveryCmd, :type => "string (string, string, map)"
publish :function => :getCurrentNodeValues, :type => "map <string, any>) ()"
publish :function => :isiBFT, :type => "boolean (map <string, any>)"
publish :function => :iBFT?, :type => "boolean (map <string, any>)"
end

IscsiClientLib = IscsiClientLibClass.new
Expand Down

0 comments on commit 6b0bba2

Please sign in to comment.