Script 'mail_helper' called by ro
Hello packager,
This is just FYI. Your package was checked in in distribution "sle12"
by autobuild-member: ro.
Here comes the log...
---------------------------%<------------------------------
Hi,
here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-isns -> sle12
## BNC# 887477 : "yast2-isns: calls of 'isnsadm' have to adapted to new syntax" (ASSIGNED/)
Changes:
--------
--- /work/SRC/SUSE:SLE-12:GA/yast2-isns/yast2-isns.changes 2014-06-27 15:42:51.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2-isns/yast2-isns.changes 2014-09-08 12:15:16.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Sep 4 13:39:48 UTC 2014 - cwh@suse.com
+
+- adapted to open-isns (bnc#887477 + fate#316901) by
+ - removing UI parts of things not supported by open-isns
+ - changing calls of 'isnsadm' to new syntax
+- 3.1.4
+
+-------------------------------------------------------------------
calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-isns
- yast2-schema
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-isns (Old)
and /mounts/work_src_done/SLE12/yast2-isns (BS:build ID:43800 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-isns", Maintainer is "yast-commit@opensuse.org"
Old:
----
yast2-isns-3.1.3.tar.bz2
New:
----
yast2-isns-3.1.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-isns.spec ++++++
--- /var/tmp/diff_new_pack.eNvBRn/_old 2014-09-08 14:12:09.000000000 +0200
+++ /var/tmp/diff_new_pack.eNvBRn/_new 2014-09-08 14:12:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-isns
-Version: 3.1.3
+Version: 3.1.4
Release: 0
License: GPL-2.0
Group: System/YaST
++++++ yast2-isns-3.1.3.tar.bz2 -> yast2-isns-3.1.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/package/yast2-isns.changes new/yast2-isns-3.1.4/package/yast2-isns.changes
--- old/yast2-isns-3.1.3/package/yast2-isns.changes 2014-06-27 14:22:32.000000000 +0200
+++ new/yast2-isns-3.1.4/package/yast2-isns.changes 2014-09-08 12:10:50.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Sep 4 13:39:48 UTC 2014 - cwh@suse.com
+
+- adapted to open-isns (bnc#887477 + fate#316901) by
+ - removing UI parts of things not supported by open-isns
+ - changing calls of 'isnsadm' to new syntax
+- 3.1.4
+
+-------------------------------------------------------------------
Thu Jun 5 11:23:03 CEST 2014 - gs@suse.de
- correct name for firewall service, adjust 'isnsd' service start
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/package/yast2-isns.spec new/yast2-isns-3.1.4/package/yast2-isns.spec
--- old/yast2-isns-3.1.3/package/yast2-isns.spec 2014-06-27 14:22:32.000000000 +0200
+++ new/yast2-isns-3.1.4/package/yast2-isns.spec 2014-09-08 12:10:50.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-isns
-Version: 3.1.3
+Version: 3.1.4
Release: 0
License: GPL-2.0
Group: System/YaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/src/include/isns/dialogs.rb new/yast2-isns-3.1.4/src/include/isns/dialogs.rb
--- old/yast2-isns-3.1.3/src/include/isns/dialogs.rb 2014-06-27 14:22:32.000000000 +0200
+++ new/yast2-isns-3.1.4/src/include/isns/dialogs.rb 2014-09-08 12:10:50.000000000 +0200
@@ -38,8 +38,6 @@
HStretch(),
HSpacing(1),
VBox(
- "ipaddress",
- VSpacing(2),
"auto_start_up",
VSpacing(2),
"firewall",
@@ -50,7 +48,7 @@
),
VStretch()
),
- "widget_names" => ["ipaddress", "auto_start_up", "firewall"]
+ "widget_names" => ["auto_start_up", "firewall"]
},
# second tab - iSCSI Nodes
"members" => {
@@ -71,16 +69,6 @@
HBox(HStretch(), VBox("dd_display_members"), HStretch())
),
"widget_names" => ["dd_display", "dd_display_members"]
- },
- # fourth tab - discovery domain sets
- "discoverydomainsets" => {
- "header" => _("Discovery Domains Sets"),
- "contents" => VBox(
- HBox(HStretch(), VBox("dds_display"), HStretch()),
- VStretch(),
- HBox(HStretch(), VBox("dds_display_members"), HStretch())
- ),
- "widget_names" => ["dds_display", "dds_display_members"]
}
}
@@ -105,24 +93,6 @@
)
}
),
- "ipaddress" => {
- "widget" => :custom,
- "custom_widget" => VBox(
- HBox(
- InputField(
- Id(:isnsaddress),
- Opt(:hstretch),
- _("Address of iSNS Server")
- )
- )
- ),
- "init" => fun_ref(method(:initAddress), "void (string)"),
- "handle" => fun_ref(
- method(:handleAddress),
- "symbol (string, map)"
- ),
- "help" => Ops.get_string(@HELPS, "ipaddress", "")
- },
"firewall" => CWMFirewallInterfaces.CreateOpenFirewallWidget(
{ "services" => ["service:isns"], "display_details" => true }
),
@@ -204,66 +174,6 @@
"symbol (string, map)"
),
"help" => Ops.get_string(@HELPS, "dd_display_members", "")
- },
- "dds_display" => {
- "widget" => :custom,
- "custom_widget" => VBox(
- Heading(_("Discovery Domains Sets")),
- HBox(
- VSpacing(5),
- Table(
- Id(:dds_table),
- Opt(:notify, :immediate),
- Header(_("Discovery Domain Set Name")),
- []
- )
- ),
- Left(
- HBox(
- PushButton(Id(:add), _("Create Discovery Domain Set")),
- PushButton(Id(:delete), _("Delete")),
- HSpacing(25)
- )
- )
- ),
- "init" => fun_ref(
- method(:initDiscoveryDomainSet),
- "void (string)"
- ),
- "handle" => fun_ref(
- method(:handleDiscoveryDomainSet),
- "symbol (string, map)"
- ),
- "help" => Ops.get_string(@HELPS, "dds_display", "")
- },
- "dds_display_members" => {
- "widget" => :custom,
- "custom_widget" => VBox(
- Heading(_("Discovery Domain Set Members")),
- HBox(
- VSpacing(10),
- Table(
- Id(:dds_members_table),
- Header(_("Discovery Domain Name")),
- []
- )
- ),
- Left(
- HBox(
- PushButton(Id(:adddd), _("Add Discovery Domain")),
- PushButton(Id(:remove), _("Remove"))
- )
- )
- ),
- "init" => fun_ref(
- method(:initDiscoveryDomainSetMembers),
- "void (string)"
- ),
- "handle" => fun_ref(
- method(:handleDiscoveryDomainSetMembers),
- "symbol (string, map)"
- ),
- "help" => Ops.get_string(@HELPS, "dds_display_members", "")
}
}
end
@@ -280,8 +190,7 @@
"tab_order" => [
"service",
"members",
- "discoverydomains",
- "discoverydomainsets"
+ "discoverydomains"
],
"tabs" => @tabs_descr,
"widget_descr" => @widgets,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/src/include/isns/helps.rb new/yast2-isns-3.1.4/src/include/isns/helps.rb
--- old/yast2-isns-3.1.3/src/include/isns/helps.rb 2014-06-27 14:22:32.000000000 +0200
+++ new/yast2-isns-3.1.4/src/include/isns/helps.rb 2014-09-08 12:10:50.000000000 +0200
@@ -36,9 +36,6 @@
"summary" => _(
"<p><b><big>iSNS Configuration</big></b><br>\nConfigure an iSNS server.<br></p>\n"
),
- "ipaddress" => _(
- "<b><big>iSNS Server location</big></b><br>The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n"
- ),
"iscsi_display" => _(
"<p>The list of all available iSCSI nodes registered with the iSNS service are displayed.</p> <p>Nodes are registered by iSCSI initiators and iSCSI targets.</p> <p> It is only possible to <b>delete</b> them. Deleting a node removes it from the iSNS database.</p>"
),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/src/include/isns/widgets.rb new/yast2-isns-3.1.4/src/include/isns/widgets.rb
--- old/yast2-isns-3.1.3/src/include/isns/widgets.rb 2014-06-27 14:22:32.000000000 +0200
+++ new/yast2-isns-3.1.4/src/include/isns/widgets.rb 2014-09-08 12:10:50.000000000 +0200
@@ -16,13 +16,10 @@
Yast.import "IsnsServer"
Yast.import "String"
Yast.import "Report"
-
- @address = ""
end
# **************** global funcions and variables *****
def DiscoveryDomainDetailDialog(values_before)
- values_before = deep_copy(values_before)
ret_map = {}
dd_dialog = VBox(
Heading(_("Create New Discovery Domain")),
@@ -31,128 +28,33 @@
3,
InputField(Id(:ddentry), Opt(:hstretch), _("Discovery Domain Name"))
),
- VSpacing(1),
- HBox(
- HSpacing(3),
- VBox(
- Label(
- _(
- "Select discovery domain set to which discovery domain will be added."
- )
- ),
- SelectionBox(Id(:ddsentries), _("Discovery Domain Name Set"))
- ),
- HSpacing(3)
- ),
- VSpacing(1),
ButtonBox(
- PushButton(Id(:ok), Label.OKButton),
+ PushButton(Id(:ok), Opt(:default), Label.OKButton),
PushButton(Id(:cancel), Label.CancelButton)
),
VSpacing(1)
)
UI.OpenDialog(dd_dialog)
-
- inc_items = []
- count = 0
- index = ""
- first = ""
- Builtins.foreach(IsnsServer.readDDS(@address)) do |ddsentry|
- if count == 0
- index = ddsentry
- count = 1
- else
- inc_items = Builtins.add(inc_items, Item(Id(index), ddsentry))
- count = 0
- first = ddsentry if first == ""
- end
- end
-
- UI.ChangeWidget(Id(:ddsentries), :Items, inc_items)
- UI.ChangeWidget(Id(:ddsentries), :CurrentItem, first)
+ UI.SetFocus(:ddentry)
ret = :nil
while ret != :ok && ret != :cancel
enable = false
- ret = Convert.to_symbol(UI.UserInput)
+ ret = UI.UserInput
end
if ret == :cancel
ret_map = {}
else
- dd_name = Convert.to_string(UI.QueryWidget(:ddentry, :Value))
-
- dds_id = Convert.to_string(
- UI.QueryWidget(Id(:ddsentries), :CurrentItem)
- )
- Builtins.y2milestone("creating dd add to dds: %1", dds_id)
- IsnsServer.addDD(@address, dd_name)
-
- count2 = 0
- dd_index = ""
- Builtins.foreach(IsnsServer.readDD(@address)) do |dd|
- if count2 == 0
- dd_index = dd
- count2 = 1
- else
- IsnsServer.addDDSMember(@address, dds_id, dd_index) if dd == dd_name
- count2 = 0
- end
- end
-
+ dd_name = UI.QueryWidget(:ddentry, :Value)
+ IsnsServer.addDD(dd_name)
ret_map = { "VALUE" => dd_name }
end
UI.CloseDialog
- deep_copy(ret_map)
+ ret_map
end
- def DiscoveryDomainSetDetailDialog(values_before)
- values_before = deep_copy(values_before)
- ret_map = {}
- dds_dialog = HBox(
- HSpacing(5),
- VBox(
- VSpacing(1),
- Left(
- HWeight(
- 3,
- InputField(
- Id(:ddsentry),
- Opt(:hstretch),
- _("Discovery Domain Set Name")
- )
- )
- ),
- Left(
- ButtonBox(
- PushButton(Id(:ok), Label.OKButton),
- PushButton(Id(:cancel), Label.CancelButton)
- )
- ),
- VSpacing(1)
- ),
- HSpacing(5)
- )
- UI.OpenDialog(dds_dialog)
-
- ret = :nil
- while ret != :ok && ret != :cancel
- enable = false
- ret = Convert.to_symbol(UI.UserInput)
- end
-
- if ret == :cancel
- ret_map = {}
- else
- value = Convert.to_string(UI.QueryWidget(:ddsentry, :Value))
- ret_map = { "VALUE" => value }
- end
- UI.CloseDialog
- deep_copy(ret_map)
- end
-
- def CreateNode(values_before)
- values_before = deep_copy(values_before)
+ def CreateNode()
ret_map = {}
node_dialog = HBox(
HSpacing(5),
@@ -230,7 +132,7 @@
1,
""
)
- IsnsServer.addDDMember(@address, dd_id, iqn)
+ IsnsServer.addDDMember(dd_id, iqn)
initDiscoveryDomainPotentialISCSI(dd_id)
end
end
@@ -239,82 +141,28 @@
deep_copy(ret_map)
end
- def DisplayAllDiscoveryDomainsDialog(dds_name, dds_id)
- ret_map = {}
- dds_dialog = VBox(
- Heading(_("Add Discovery Domain to Set")),
- Label(dds_name),
- HSpacing(50),
- Heading(_("Available Discovery Domains")),
- HBox(VSpacing(10), Table(Id(:dd_table), Header(_("Name")), [])),
- Left(
- HBox(
- PushButton(Id(:add), _("Add Discovery Domain")),
- PushButton(Id(:exit), _("Done"))
- )
- )
- )
- UI.OpenDialog(dds_dialog)
-
- initDiscoveryDomainPotential(dds_id)
-
- ret = :nil
- while ret != :exit
- enable = false
- ret = Convert.to_symbol(UI.UserInput)
- if ret == :add
- Builtins.y2milestone("Add a dds member")
- dd_id = Convert.to_string(UI.QueryWidget(Id(:dd_table), :CurrentItem))
- IsnsServer.addDDSMember(@address, dds_id, dd_id)
- initDiscoveryDomainPotential(dds_id)
- end
- end
-
- UI.CloseDialog
- deep_copy(ret_map)
- end
-
-
- def initAddress(key)
- @address = Ops.get_string(
- Convert.convert(
- SCR.Execute(
- path(".target.bash_output"),
- "cat /etc/isns.conf|cut -d'=' -f2|tr -d '\n'"
- ),
- :from => "any",
- :to => "map "
- ),
- "stdout",
- ""
- )
- UI.ChangeWidget(:isnsaddress, :Value, @address)
-
- nil
- end
def initISCSI(key)
- count = 0
type = _("Target or Initiator")
inc_items = []
checkISNS
- Builtins.foreach(IsnsServer.readISCSI(@address)) do |key2|
- inc_items = Builtins.add(
- inc_items,
- Item(
- Id(count),
- Ops.get_string(key2, "NODE", ""),
- Ops.get_string(key2, "TYPE", "")
- )
- )
- count = Ops.add(count, 1)
+ list = IsnsServer.readISCSI
+
+ list.each_with_index do |key, index|
+ inc_items.push(Item(
+ Id(index),
+ key["NODE"],
+ key["TYPE"]
+ )
+ )
end
UI.ChangeWidget(Id(:members_table), :Items, inc_items)
nil
end
+
def initDiscoveryDomainPotentialISCSI(key)
count = 0
type = _("Target or Initiator")
@@ -323,9 +171,9 @@
ddmembers = []
found = "FALSE"
- ddmembers = IsnsServer.readDDMembers(@address, key)
+ ddmembers = IsnsServer.readDDMembers(key)
- Builtins.foreach(IsnsServer.readISCSI(@address)) do |iscsinode2|
+ Builtins.foreach(IsnsServer.readISCSI) do |iscsinode2|
found = "FALSE"
Builtins.foreach(ddmembers) do |ddmember|
if Ops.get_string(ddmember, "NODE", "") ==
@@ -351,79 +199,32 @@
nil
end
def initDDISCSIMembers(key)
- count = 0
- index = ""
- ddid = ""
inc_items = []
Builtins.y2milestone("initDDISCSIMembers key is:%1", key)
if key == "dd_display_members"
- key = Convert.to_string(UI.QueryWidget(Id(:dd_table), :CurrentItem))
+ key = UI.QueryWidget(Id(:dd_table), :CurrentItem)
end
ddid = key
- Builtins.foreach(IsnsServer.readDDMembers(@address, ddid)) do |result|
+ IsnsServer.readDDMembers(ddid).each_with_index do |result, index|
Builtins.y2milestone("iscsiMembers: %1", key)
- inc_items = Builtins.add(
- inc_items,
- Item(
- Id(count),
- Ops.get_string(result, "NODE", ""),
- Ops.get_string(result, "TYPE", "")
- )
- )
- count = Ops.add(count, 1)
+ inc_items << Item(Id(index), result["NODE"], result["TYPE"])
end
UI.ChangeWidget(Id(:dd_members_table), :Items, inc_items)
nil
end
- def initDiscoveryDomain(key)
- count = 0
- index = ""
- inc_items = []
+ def initDiscoveryDomain(key = nil)
checkISNS
- Builtins.foreach(IsnsServer.readDD(@address)) do |dd|
- if count == 0
- index = dd
- count = 1
- else
- inc_items = Builtins.add(inc_items, Item(Id(index), dd))
- count = 0
- end
- end
-
- UI.ChangeWidget(Id(:dd_table), :Items, inc_items)
-
- nil
- end
- def initDiscoveryDomainPotential(key)
- count = 0
- index = ""
inc_items = []
- ddsmembers = []
- found = "FALSE"
-
- ddsmembers = IsnsServer.readDDSMembers(@address, key)
-
- Builtins.foreach(IsnsServer.readDD(@address)) do |dd|
- if count == 0
- index = dd
- count = 1
- else
- found = "FALSE"
- Builtins.foreach(ddsmembers) do |ddsmember|
- found = "TRUE" if ddsmember == dd
- end
- if found == "FALSE"
- inc_items = Builtins.add(inc_items, Item(Id(index), dd))
- end
- count = 0
- end
+ IsnsServer.readDD.each do |dd|
+ dd["DD name"] = "default" if dd["DD ID"] == "0"
+ inc_items << Item(Id(dd["DD ID"]), dd["DD name"])
end
UI.ChangeWidget(Id(:dd_table), :Items, inc_items)
@@ -431,87 +232,15 @@
nil
end
- def initDiscoveryDomainSet(key)
- count = 0
- index = ""
-
- inc_items = []
-
- Builtins.y2milestone("isnsaddress is %1", @address)
-
- checkISNS
-
- Builtins.foreach(IsnsServer.readDDS(@address)) do |key2|
- if count == 0
- index = key2
- count = 1
- else
- inc_items = Builtins.add(inc_items, Item(Id(index), key2))
- count = 0
- end
- end
-
- UI.ChangeWidget(Id(:dds_table), :Items, inc_items)
-
- nil
- end
- def initDiscoveryDomainSetMembers(key)
- count = 0
- index = ""
- inc_items = []
- dds_id = ""
-
- if key == "dds_display_members"
- key = Convert.to_string(UI.QueryWidget(Id(:dds_table), :CurrentItem))
- end
-
- dds_id = key
-
- Builtins.foreach(IsnsServer.readDDSMembers(@address, dds_id)) do |key2|
- Builtins.y2milestone("results received: %1", key2)
- if count == 0
- index = key2
- count = 1
- else
- inc_items = Builtins.add(inc_items, Item(Id(index), key2))
- count = 0
- end
- end
-
- UI.ChangeWidget(Id(:dds_members_table), :Items, inc_items)
-
- nil
- end
-
-
- def handleAddress(key, event)
- event = deep_copy(event)
- @address = Convert.to_string(UI.QueryWidget(:isnsaddress, :Value))
- SCR.Execute(
- path(".target.bash_output"),
- Builtins.sformat("echo \"isns_address=%1\">/etc/isns.conf", @address)
- )
- Builtins.y2milestone("isnsaddress is %1", @address)
- nil
- end
-
-
def handleISCSI(key, event)
- event = deep_copy(event)
- if Ops.get_string(event, "EventReason", "") == "Activated"
- case Ops.get_symbol(event, "WidgetID")
+ if event["EventReason"] == "Activated"
+ case event["WidgetID"]
when :delete
@del = UI.QueryWidget(Id(:members_table), :CurrentItem)
if @del != nil
if Popup.ContinueCancel(_("Really delete the selected item?"))
- discoverydomainsetname = Ops.get_string(
- Convert.to_term(
- UI.QueryWidget(Id(:members_table), term(:Item, @del))
- ),
- 1,
- ""
- )
- IsnsServer.deleteISCSI(@address, discoverydomainsetname)
+ iqn = UI.QueryWidget(Id(:members_table), term(:Item, @del))[1]
+ IsnsServer.deleteISCSI(iqn)
initISCSI("")
else
Builtins.y2milestone("Delete canceled")
@@ -539,63 +268,15 @@
)
if @del != nil
if Popup.ContinueCancel(_("Really delete this domain?"))
- IsnsServer.deleteDD(@address, @del)
- initDiscoveryDomain("")
+ IsnsServer.deleteDD(@del)
+ initDiscoveryDomain
else
Builtins.y2milestone("Delete canceled")
end
end
when :add
@add_map = DiscoveryDomainDetailDialog({ "VALUE" => "" })
- if @add_map != {}
- # IsnsServer::addDD(address, add_map["VALUE"]:"");
- initDiscoveryDomain("")
- end
- end
- end
-
- nil
- end
-
- def handleDiscoveryDomainSet(key, event)
- event = deep_copy(event)
- mycurrent = Convert.to_string(
- UI.QueryWidget(Id(:dds_table), :CurrentItem)
- )
- Builtins.y2milestone(
- "handleDiscoveryDomainSet action called: %1 -- %2 -- %3",
- key,
- event,
- mycurrent
- )
-
- if Ops.get_string(event, "EventReason", "") == "SelectionChanged"
- Builtins.y2milestone("selectionChangedEvent")
- dds_id = Convert.to_string(UI.QueryWidget(Id(:dds_table), :CurrentItem))
- Builtins.y2milestone("selectionChangedEvent - dds-id:%1", dds_id)
- initDiscoveryDomainSetMembers(dds_id)
- end
-
- if Ops.get_string(event, "EventReason", "") == "Activated"
- case Ops.get_symbol(event, "WidgetID")
- when :delete
- @del = Convert.to_string(
- UI.QueryWidget(Id(:dds_table), :CurrentItem)
- )
- if @del != nil
- if Popup.ContinueCancel(_("Really delete the selected item?"))
- IsnsServer.deleteDDS(@address, @del)
- initDiscoveryDomainSet("")
- else
- Builtins.y2milestone("Delete canceled")
- end
- end
- when :add
- @add_map = DiscoveryDomainSetDetailDialog({ "VALUE" => "" })
- if @add_map != {}
- IsnsServer.addDDS(@address, Ops.get_string(@add_map, "VALUE", ""))
- initDiscoveryDomainSet("")
- end
+ initDiscoveryDomain unless @add_map.empty?
end
end
@@ -624,7 +305,7 @@
dd_id = Convert.to_string(
UI.QueryWidget(Id(:dd_table), :CurrentItem)
)
- IsnsServer.deleteDDMember(@address, dd_id, dd_name)
+ IsnsServer.deleteDDMember(dd_id, dd_name)
initDDISCSIMembers(dd_id)
when :addiscsinode
dd_id = Convert.to_string(
@@ -647,12 +328,11 @@
""
)
- add_map = CreateNode({ "VALUE" => "" })
+ add_map = CreateNode()
if add_map != {}
IsnsServer.addDDMember(
- @address,
dd_id,
- Ops.get_string(add_map, "VALUE", "")
+ add_map["VALUE"]
)
end
@@ -663,52 +343,12 @@
nil
end
- def handleDiscoveryDomainSetMembers(key, event)
- event = deep_copy(event)
- if Ops.get_string(event, "EventReason", "") == "Activated"
- case Ops.get_symbol(event, "WidgetID")
- when :delete
- # domain Set deleted, but we get this event so update the members table
- dds_id = Convert.to_string(
- UI.QueryWidget(Id(:dds_table), :CurrentItem)
- )
- initDiscoveryDomainSetMembers(dds_id)
- when :remove
- Builtins.y2milestone("Unassign a dds member")
- dds_id = Convert.to_string(
- UI.QueryWidget(Id(:dds_table), :CurrentItem)
- )
- dd_id = Convert.to_string(
- UI.QueryWidget(Id(:dds_members_table), :CurrentItem)
- )
- IsnsServer.deleteDDSMember(@address, dds_id, dd_id)
- initDiscoveryDomainSetMembers(dds_id)
- when :adddd
- Builtins.y2milestone("Add a dds member")
- dds_id = Convert.to_string(
- UI.QueryWidget(Id(:dds_table), :CurrentItem)
- )
- dds_name = Ops.get_string(
- Convert.to_term(
- UI.QueryWidget(Id(:dds_table), term(:Item, dds_id))
- ),
- 1,
- ""
- )
- add_map1 = DisplayAllDiscoveryDomainsDialog(dds_name, dds_id)
- initDiscoveryDomainSetMembers(dds_id)
- end
- end
-
- nil
- end
def checkISNS
- isns_status = IsnsServer.testISNSAccess(@address)
- if isns_status != "OK"
+ if !IsnsServer.testISNSAccess
# boolean display = true;
# Report::DisplayErrors(display,10);
Report.Error(
- _("Unable to connect to iSNS server. Check iSNS server address.")
+ _("Unable to connect to iSNS server. Check if iSNS server is running.")
)
return 1
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-isns-3.1.3/src/modules/IsnsServer.rb new/yast2-isns-3.1.4/src/modules/IsnsServer.rb
--- old/yast2-isns-3.1.3/src/modules/IsnsServer.rb 2014-06-27 14:22:32.000000000 +0200
+++ new/yast2-isns-3.1.4/src/modules/IsnsServer.rb 2014-09-08 12:10:50.000000000 +0200
@@ -13,10 +13,10 @@
module Yast
class IsnsServerClass < Module
+
def main
textdomain "isns"
- Yast.import "Progress"
Yast.import "Report"
Yast.import "Summary"
Yast.import "Message"
@@ -124,7 +124,7 @@
# Data was modified?
# @return true if modified
def Modified
- Builtins.y2debug("modified=%1", @modified)
+ y2debug("modified=%1", @modified)
@modified
end
@@ -136,37 +136,14 @@
:to => "map "
)
# IsnsServerFunctions::parseConfig( read_values );
- Builtins.y2milestone("isns readConfig")
+ y2milestone("isns readConfig")
true
end
- # write configuration file /etc/ietd.conf
- def writeConfig
- # prepare map, because perl->ycp lost information about data types (integers in this case)
- # map config_file = IsnsServerFunctions::writeConfig();
- # config_file["type"]=tointeger(config_file["type"]:"1");
- # config_file["file"]=tointeger(config_file["file"]:"1");
- # list