diff --git a/src/include/s390/dasd/dialogs.rb b/src/include/s390/dasd/dialogs.rb index 62639496..884fe906 100644 --- a/src/include/s390/dasd/dialogs.rb +++ b/src/include/s390/dasd/dialogs.rb @@ -54,7 +54,7 @@ def ListSelectedDASD selected = Convert.convert( UI.QueryWidget(Id(:table), :SelectedItems), from: "any", - to: "list " + to: "list " ) Builtins.y2milestone("selected %1", selected) deep_copy(selected) @@ -497,7 +497,7 @@ def ReloadDASDDialog selected = Convert.convert( UI.QueryWidget(Id(:table), :SelectedItems), from: "any", - to: "list " + to: "list " ) UI.ChangeWidget(Id(:table), :Items, items) UI.ChangeWidget(Id(:table), :SelectedItems, selected) diff --git a/src/include/s390/dasd/wizards.rb b/src/include/s390/dasd/wizards.rb index 92ce0391..46547607 100644 --- a/src/include/s390/dasd/wizards.rb +++ b/src/include/s390/dasd/wizards.rb @@ -42,17 +42,17 @@ def initialize_s390_dasd_wizards(include_target) # @return [Symbol] MainDASDSequence def MainDASDSequence aliases = { - "main" => -> { DASDDialog() }, - "add" => -> { AddDASDDiskDialog() }, + "main" => -> { DASDDialog() }, + "add" => -> { AddDASDDiskDialog() }, "delete" => lambda() { DeleteDASDDiskDialog() } } sequence = { "ws_start" => "main", "main" => { - abort: :abort, - next: :next, - add: "add", + abort: :abort, + next: :next, + add: "add", delete: "delete" }, "add" => { abort: :abort, next: "main" }, diff --git a/src/include/s390/dump/ui.rb b/src/include/s390/dump/ui.rb index 8c90e4cd..90723bd8 100644 --- a/src/include/s390/dump/ui.rb +++ b/src/include/s390/dump/ui.rb @@ -167,7 +167,7 @@ def DumpDialog selected_items = Convert.convert( UI.QueryWidget(Id(:dasd_disks), :SelectedItems), from: "any", - to: "list " + to: "list " ) Builtins.foreach(selected_items) do |dev_line| entries = Builtins.splitstring(dev_line, "\t") diff --git a/src/include/s390/iucvterminal-server/ui.rb b/src/include/s390/iucvterminal-server/ui.rb index 75a130f0..7c47dfcb 100644 --- a/src/include/s390/iucvterminal-server/ui.rb +++ b/src/include/s390/iucvterminal-server/ui.rb @@ -724,7 +724,7 @@ def CommitTsUserDialogSettings grouplist = Convert.convert( UI.QueryWidget(Id(:ts_additional_groups), :SelectedItems), from: "any", - to: "list " + to: "list " ) groups = Builtins.mergestring(grouplist, ",") groupmap = Builtins.listmap(grouplist) { |g| { g => "1" } } @@ -745,10 +745,10 @@ def CommitTsUserDialogSettings @ts_member_conf, username, { - type: :rb_ts_list, - rb_ts_list: [], + type: :rb_ts_list, + rb_ts_list: [], rb_ts_regex: "", - rb_ts_file: "" + rb_ts_file: "" } ) else @@ -766,7 +766,7 @@ def CommitTsGroupDialogSettings items = Convert.convert( UI.QueryWidget(Id(:ts_table_add_groups), :Items), from: "any", - to: "list " + to: "list " ) groups = IUCVTerminalServer.GetGroups(true) @@ -834,10 +834,10 @@ def CommitTsGroupDialogSettings @ts_member_conf, identification, { - type: :rb_ts_list, - rb_ts_list: [], + type: :rb_ts_list, + rb_ts_list: [], rb_ts_regex: "", - rb_ts_file: "" + rb_ts_file: "" } ) end @@ -936,7 +936,7 @@ def GetTsGroupTableUserList items = Convert.convert( UI.QueryWidget(Id(:ts_table_add_groups), :Items), from: "any", - to: "list " + to: "list " ) current_group = Convert.to_string( UI.QueryWidget(Id(:ts_table_add_groups), :CurrentItem) @@ -963,7 +963,7 @@ def SetTSGroupTableUserList(new_list) items = Convert.convert( UI.QueryWidget(Id(:ts_table_add_groups), :Items), from: "any", - to: "list " + to: "list " ) current_group = Convert.to_string( UI.QueryWidget(Id(:ts_table_add_groups), :CurrentItem) @@ -1100,7 +1100,7 @@ def UpdateIdSelections(previous_ids, widget) ids = Convert.convert( UI.QueryWidget(Id(widget), :SelectedItems), from: "any", - to: "list " + to: "list " ) # make sure that only available ids are compared @@ -1350,7 +1350,7 @@ def HandleEvent(widget) @zvm_id_list = Convert.convert( Builtins.union(id_list, id_list), from: "list", - to: "list " + to: "list " ) # sort list @zvm_id_list = Builtins.sort(@zvm_id_list) @@ -1359,7 +1359,7 @@ def HandleEvent(widget) @zvm_id_entries = Convert.convert( Builtins.merge([@TEXT_ALL], @zvm_id_list), from: "list", - to: "list " + to: "list " ) else # reset list to prevent saving the previous settings @@ -1380,7 +1380,7 @@ def HandleEvent(widget) Convert.convert( UI.QueryWidget(Id(:ts_table_add_groups), :Items), from: "any", - to: "list " + to: "list " ) UI.ChangeWidget(Id(:ts_groups_members), :Enabled, groups_exist) UI.ChangeWidget(Id(:ts_groups_select), :Enabled, groups_exist) @@ -1397,7 +1397,7 @@ def HandleEvent(widget) table_data = Convert.convert( UI.QueryWidget(Id(:ts_table_add_groups), :Items), from: "any", - to: "list " + to: "list " ) groupname = Convert.to_string( UI.QueryWidget(Id(:ts_groups_name), :Value) @@ -1416,7 +1416,7 @@ def HandleEvent(widget) items = Convert.convert( UI.QueryWidget(Id(:ts_table_add_groups), :Items), from: "any", - to: "list " + to: "list " ) item = Item(Id(groupname), groupname, @TEXT_YES, "new", "") @@ -1435,7 +1435,7 @@ def HandleEvent(widget) items = Convert.convert( UI.QueryWidget(Id(:ts_table_add_groups), :Items), from: "any", - to: "list " + to: "list " ) groupname = Convert.to_string( UI.QueryWidget(Id(:ts_table_add_groups), :CurrentItem) @@ -1459,7 +1459,7 @@ def HandleEvent(widget) user_list = Convert.convert( UI.QueryWidget(Id(:ts_groups_members), :SelectedItems), from: "any", - to: "list " + to: "list " ) SetTSGroupTableUserList(user_list) end @@ -1509,7 +1509,7 @@ def IUCVTerminalServerDialog @zvm_id_entries = Convert.convert( Builtins.merge([@TEXT_ALL], @zvm_id_list), from: "list", - to: "list " + to: "list " ) # initialize screen @@ -1546,7 +1546,7 @@ def IUCVTerminalServerDialog current_items = Convert.convert( UI.QueryWidget(Id(:ts_table_add_groups), :Items), from: "any", - to: "list " + to: "list " ) if @current_dialog == :ts_open_group_dialog && @ts_groups_items != current_items && diff --git a/src/include/s390/zfcp/dialogs.rb b/src/include/s390/zfcp/dialogs.rb index fdac37bb..b7b9a948 100644 --- a/src/include/s390/zfcp/dialogs.rb +++ b/src/include/s390/zfcp/dialogs.rb @@ -49,7 +49,7 @@ def ListSelectedZFCP selected = Convert.convert( UI.QueryWidget(Id(:table), :SelectedItems), from: "any", - to: "list " + to: "list " ) Builtins.y2milestone("selected %1", selected) deep_copy(selected) @@ -186,7 +186,7 @@ def ReloadZFCPDialog selected = Convert.convert( UI.QueryWidget(Id(:table), :SelectedItems), from: "any", - to: "list " + to: "list " ) UI.ChangeWidget(Id(:table), :Items, items) UI.ChangeWidget(Id(:table), :SelectedItems, selected) diff --git a/src/include/s390/zfcp/wizards.rb b/src/include/s390/zfcp/wizards.rb index fb0aff48..19f4775b 100644 --- a/src/include/s390/zfcp/wizards.rb +++ b/src/include/s390/zfcp/wizards.rb @@ -40,17 +40,17 @@ def initialize_s390_zfcp_wizards(include_target) # @return [Symbol] dialog def MainZFCPSequence aliases = { - "main" => -> { ZFCPDialog() }, - "add" => -> { AddZFCPDiskDialog() }, + "main" => -> { ZFCPDialog() }, + "add" => -> { AddZFCPDiskDialog() }, "delete" => -> { DeleteZFCPDiskDialog() } } sequence = { "ws_start" => "main", "main" => { - abort: :abort, - next: :next, - add: "add", + abort: :abort, + next: :next, + add: "add", delete: "delete" }, "add" => { abort: :abort, next: "main" }, diff --git a/src/modules/DASDController.rb b/src/modules/DASDController.rb index 7628bd7b..56f69c20 100644 --- a/src/modules/DASDController.rb +++ b/src/modules/DASDController.rb @@ -81,7 +81,7 @@ def GetDeviceName(channel) files = Convert.convert( SCR.Read(path(".target.dir"), dir), from: "any", - to: "list " + to: "list " ) if Builtins.size(files) == 1 return Ops.add("/dev/", Ops.get(files, 0, "")) @@ -236,7 +236,7 @@ def Export end } { - "devices" => l, + "devices" => l, "format_unformatted" => @format_unformatted } end @@ -357,7 +357,7 @@ def ProbeDisks disks = Convert.convert( SCR.Read(path(".probe.disk")), from: "any", - to: "list >" + to: "list >" ) disks = Builtins.filter(disks) do |d| Builtins.tolower(Ops.get_string(d, "device", "")) == "dasd" diff --git a/src/modules/IUCVTerminal.rb b/src/modules/IUCVTerminal.rb index ff09b3a7..ad0f6e33 100644 --- a/src/modules/IUCVTerminal.rb +++ b/src/modules/IUCVTerminal.rb @@ -198,7 +198,7 @@ def Read parameters = Convert.convert( SCR.Read(path(".proc.cmdline")), from: "any", - to: "list " + to: "list " ) Builtins.foreach(parameters) do |parameter| if Builtins.regexpmatch(parameter, "console=hvc0") diff --git a/src/modules/IUCVTerminalServer.rb b/src/modules/IUCVTerminalServer.rb index f9844eff..505c5a12 100644 --- a/src/modules/IUCVTerminalServer.rb +++ b/src/modules/IUCVTerminalServer.rb @@ -95,13 +95,13 @@ def GetUsers(local) users = Convert.convert( Users.GetUsers("uid", "local"), from: "map", - to: "map " + to: "map " ) if !local users = Convert.convert( Builtins.union(users, Users.GetUsers("uid", "system")), from: "map", - to: "map " + to: "map " ) end deep_copy(users) @@ -114,13 +114,13 @@ def GetGroups(local) groups = Convert.convert( Users.GetGroups("cn", "local"), from: "map", - to: "map " + to: "map " ) if !local groups = Convert.convert( Builtins.union(groups, Users.GetGroups("cn", "system")), from: "map", - to: "map " + to: "map " ) end deep_copy(groups) @@ -274,10 +274,10 @@ def UpdateTsMemberConfig(name, value) @ts_member_conf, name, { - type: :rb_ts_list, - rb_ts_list: [], + type: :rb_ts_list, + rb_ts_list: [], rb_ts_regex: "", - rb_ts_file: "" + rb_ts_file: "" } ) end @@ -394,7 +394,7 @@ def Read @ts_audited_ids = Convert.convert( Builtins.merge([@TEXT_ALL], @zvm_id_list), from: "list", - to: "list " + to: "list " ) else # only add known ids @@ -411,7 +411,7 @@ def Read @ts_authorization_map = Convert.convert( SCR.Read(path(".etc.iucvterm-ts-authorization.all")), from: "any", - to: "map " + to: "map " ) ts_auth_list = Ops.get_list(@ts_authorization_map, "value", []) Builtins.foreach(ts_auth_list) do |entry| diff --git a/src/modules/ZFCPController.rb b/src/modules/ZFCPController.rb index e2e853ea..1b4c13dd 100644 --- a/src/modules/ZFCPController.rb +++ b/src/modules/ZFCPController.rb @@ -333,7 +333,7 @@ def GetControllers @controllers = Convert.convert( SCR.Read(path(".probe.storage")), from: "any", - to: "list >" + to: "list >" ) @controllers = Builtins.filter(@controllers) do |c| Ops.get_string(c, "device", "") == "zFCP controller" @@ -368,7 +368,7 @@ def ProbeDisks disks = Convert.convert( SCR.Read(path(".probe.disk")), from: "any", - to: "list >" + to: "list >" ) disks = Builtins.filter(disks) do |d| Ops.get_string(d, "bus", "") == "SCSI" @@ -377,7 +377,7 @@ def ProbeDisks tapes = Convert.convert( SCR.Read(path(".probe.tape")), from: "any", - to: "list >" + to: "list >" ) tapes = Builtins.filter(tapes) do |d| Ops.get_string(d, "bus", "") == "SCSI" @@ -386,7 +386,7 @@ def ProbeDisks disks_tapes = Convert.convert( Builtins.merge(disks, tapes), from: "list", - to: "list >" + to: "list >" ) disks_tapes = Builtins.maplist(disks_tapes) { |d| Builtins.filter(d) do |k, _v| @@ -658,7 +658,7 @@ def runCommand(cmd) cmd_output = Convert.convert( SCR.Execute(path(".target.bash_output"), cmd), from: "any", - to: "map " + to: "map " ) if Ops.get_integer(cmd_output, "exit", -1) == 0 ret = Builtins.splitstring( diff --git a/test/zfcp_controller_test.rb b/test/zfcp_controller_test.rb index dcd8a498..9d2c6baf 100755 --- a/test/zfcp_controller_test.rb +++ b/test/zfcp_controller_test.rb @@ -20,7 +20,7 @@ # Removing all fcp devices from blacklist expect(Yast::SCR).to receive(:Execute).with(anything, /\/sbin\/vmcp q v fcp/).and_return( - "exit" => 0, + "exit" => 0, "stdout" => "FCP F800 ON FCP F807 CHPID 1C SUBCHANNEL = 000B\n F800 TOKEN = 0000000362A42C00") expect(Yast::SCR).to receive(:Execute).with(anything, /\/sbin\/cio_ignore -r f800/).and_return(0) @@ -37,7 +37,7 @@ describe "#Import" do it "Imports the devices from a Hash" do - import_data = { "devices"=>[{"controller_id" => "0.0.fa00"}, + import_data = { "devices" => [{"controller_id" => "0.0.fa00"}, {"controller_id" => "0.0.fc00"}, {"controller_id" => "0.0.f800"}, {"controller_id" => "0.0.f900"}]} @@ -59,7 +59,7 @@ describe "#GetFilteredDevices" do it "Filters the devices" do - import_data = { "devices"=>[{"controller_id" => "0.0.fa00"}, + import_data = { "devices" => [{"controller_id" => "0.0.fa00"}, {"controller_id" => "0.0.fb00"}, {"controller_id" => "0.0.fc00"}, {"controller_id" => "0.0.f800"}, @@ -69,8 +69,8 @@ Yast::ZFCPController.filter_max = Yast::ZFCPController.FormatChannel("0.0.FA00") Yast::ZFCPController.filter_min = Yast::ZFCPController.FormatChannel("0.0.f900") expect(Yast::ZFCPController.GetFilteredDevices()).to eq({ - 0=>{"detail"=>{"controller_id"=>"0.0.fa00", "wwpn"=>"", "fcp_lun"=>""}}, - 4=>{"detail"=>{"controller_id"=>"0.0.f900", "wwpn"=>"", "fcp_lun"=>""}}}) + 0 => {"detail"=>{"controller_id"=>"0.0.fa00", "wwpn"=>"", "fcp_lun"=>""}}, + 4 => {"detail"=>{"controller_id"=>"0.0.f900", "wwpn"=>"", "fcp_lun"=>""}}}) end end end