Author: mzugec Date: Thu Jul 2 14:09:18 2009 New Revision: 57845 URL: http://svn.opensuse.org/viewcvs/yast?rev=57845&view=rev Log: initial commit into svn Added: trunk/isns/ trunk/isns/MAINTAINER trunk/isns/Makefile.cvs trunk/isns/RPMNAME trunk/isns/VERSION trunk/isns/_cvsignore trunk/isns/agents/ trunk/isns/agents/Makefile.am trunk/isns/agents/_cvsignore trunk/isns/configure.in.in trunk/isns/doc/ trunk/isns/doc/Makefile.am trunk/isns/doc/_cvsignore trunk/isns/doc/autodocs/ trunk/isns/doc/autodocs/Makefile.am trunk/isns/doc/autodocs/_cvsignore trunk/isns/package/ trunk/isns/package/_cvsignore trunk/isns/package/yast2-isns.changes trunk/isns/src/ trunk/isns/src/Makefile.am trunk/isns/src/_cvsignore trunk/isns/src/complex.ycp trunk/isns/src/dialogs.ycp trunk/isns/src/helps.ycp trunk/isns/src/isns.desktop trunk/isns/src/isns.ycp trunk/isns/src/isns_auto.ycp trunk/isns/src/isns_proposal.ycp trunk/isns/src/wizards.ycp trunk/isns/testsuite/ trunk/isns/testsuite/Makefile.am trunk/isns/testsuite/_cvsignore trunk/isns/testsuite/tests/ trunk/isns/testsuite/tests/Isns.err trunk/isns/testsuite/tests/Isns.out trunk/isns/testsuite/tests/Isns.ycp trunk/isns/testsuite/tests/_cvsignore trunk/isns/yast2-isns.spec.in Added: trunk/isns/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/MAINTAINER?rev=57845&view=auto ============================================================================== --- trunk/isns/MAINTAINER (added) +++ trunk/isns/MAINTAINER Thu Jul 2 14:09:18 2009 @@ -0,0 +1 @@ +Michal Zugec <mzugec@novell.com> Added: trunk/isns/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/Makefile.cvs?rev=57845&view=auto ============================================================================== --- trunk/isns/Makefile.cvs (added) +++ trunk/isns/Makefile.cvs Thu Jul 2 14:09:18 2009 @@ -0,0 +1,22 @@ +# +# Makefile.cvs +# +PREFIX = /usr + +LIB = $(shell y2tool get-lib) + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/isns/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/RPMNAME?rev=57845&view=auto ============================================================================== --- trunk/isns/RPMNAME (added) +++ trunk/isns/RPMNAME Thu Jul 2 14:09:18 2009 @@ -0,0 +1 @@ +yast2-isns Added: trunk/isns/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/VERSION?rev=57845&view=auto ============================================================================== --- trunk/isns/VERSION (added) +++ trunk/isns/VERSION Thu Jul 2 14:09:18 2009 @@ -0,0 +1 @@ +2.15.0 Added: trunk/isns/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/_cvsignore?rev=57845&view=auto ============================================================================== --- trunk/isns/_cvsignore (added) +++ trunk/isns/_cvsignore Thu Jul 2 14:09:18 2009 @@ -0,0 +1,20 @@ +Makefile +Makefile.am +Makefile.am.common +Makefile.in +aclocal.m4 +config.cache +config.guess +config.h.in +config.log +config.status +config.sub +configure +configure.in +depcomp +install-sh +missing +mkinstalldirs +stamp-h +isns.pot +autom4te.cache Added: trunk/isns/agents/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/agents/Makefile.am?rev=57845&view=auto ============================================================================== --- trunk/isns/agents/Makefile.am (added) +++ trunk/isns/agents/Makefile.am Thu Jul 2 14:09:18 2009 @@ -0,0 +1,7 @@ +# Makefile.am for isns/agents + +agent_SCRIPTS = + +scrconf_DATA = isnsd.scr + +EXTRA_DIST = $(agent_SCRIPTS) $(scrconf_DATA) Added: trunk/isns/agents/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/agents/_cvsignore?rev=57845&view=auto ============================================================================== --- trunk/isns/agents/_cvsignore (added) +++ trunk/isns/agents/_cvsignore Thu Jul 2 14:09:18 2009 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/isns/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/configure.in.in?rev=57845&view=auto ============================================================================== --- trunk/isns/configure.in.in (added) +++ trunk/isns/configure.in.in Thu Jul 2 14:09:18 2009 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/isns/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/doc/Makefile.am?rev=57845&view=auto ============================================================================== --- trunk/isns/doc/Makefile.am (added) +++ trunk/isns/doc/Makefile.am Thu Jul 2 14:09:18 2009 @@ -0,0 +1,10 @@ +# Makefile.am for isns/doc + +SUBDIRS = autodocs + +htmldir = $(docdir) + +doc_DATA = +html_DATA = + +EXTRA_DIST = $(doc_DATA) $(html_DATA) Added: trunk/isns/doc/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/doc/_cvsignore?rev=57845&view=auto ============================================================================== --- trunk/isns/doc/_cvsignore (added) +++ trunk/isns/doc/_cvsignore Thu Jul 2 14:09:18 2009 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/isns/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/doc/autodocs/Makefile.am?rev=57845&view=auto ============================================================================== --- trunk/isns/doc/autodocs/Makefile.am (added) +++ trunk/isns/doc/autodocs/Makefile.am Thu Jul 2 14:09:18 2009 @@ -0,0 +1,3 @@ +# Makefile.am for isns/doc/autodocs + +include $(top_srcdir)/autodocs-ycp.ami Added: trunk/isns/doc/autodocs/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/doc/autodocs/_cvsignore?rev=57845&view=auto ============================================================================== --- trunk/isns/doc/autodocs/_cvsignore (added) +++ trunk/isns/doc/autodocs/_cvsignore Thu Jul 2 14:09:18 2009 @@ -0,0 +1,3 @@ +Makefile +Makefile.in +*.html Added: trunk/isns/package/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/package/_cvsignore?rev=57845&view=auto ============================================================================== --- trunk/isns/package/_cvsignore (added) +++ trunk/isns/package/_cvsignore Thu Jul 2 14:09:18 2009 @@ -0,0 +1,2 @@ +*.spec +*.bz2 Added: trunk/isns/package/yast2-isns.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/package/yast2-isns.changes?rev=57845&view=auto ============================================================================== --- trunk/isns/package/yast2-isns.changes (added) +++ trunk/isns/package/yast2-isns.changes Thu Jul 2 14:09:18 2009 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Fri Jun 26 15:57:05 2009 - mzugec@novell.com + +- initial version Added: trunk/isns/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/Makefile.am?rev=57845&view=auto ============================================================================== --- trunk/isns/src/Makefile.am (added) +++ trunk/isns/src/Makefile.am Thu Jul 2 14:09:18 2009 @@ -0,0 +1,30 @@ +# Makefile.am for isns/src + +yncludedir = @yncludedir@/isns + +client_DATA = \ + isns.ycp \ + isns_auto.ycp \ + isns_proposal.ycp \ + isns_finish.ycp + +ynclude_DATA = \ + helps.ycp \ + wizards.ycp \ + dialogs.ycp \ + complex.ycp + +desktop_DATA = \ + isns.desktop + +module_DATA = \ + IsnsServer.ycp + +# create a symlink for local build, #145327 +isns: + ln -sf . $@ +ycpchook = isns + +EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) + +include $(top_srcdir)/Makefile.am.common Added: trunk/isns/src/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/_cvsignore?rev=57845&view=auto ============================================================================== --- trunk/isns/src/_cvsignore (added) +++ trunk/isns/src/_cvsignore Thu Jul 2 14:09:18 2009 @@ -0,0 +1,4 @@ +Makefile +Makefile.in +*.ybc +.dep Added: trunk/isns/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/complex.ycp?rev=57845&view=auto ============================================================================== --- trunk/isns/src/complex.ycp (added) +++ trunk/isns/src/complex.ycp Thu Jul 2 14:09:18 2009 @@ -0,0 +1,63 @@ +/** + * File: include/isns-server/complex.ycp + * Package: Configuration of isns-server + * Summary: Dialogs definitions + * Authors: Michal Zugec <mzugec@suse.cz> + * + * $Id: complex.ycp 27936 2006-02-13 20:01:14Z olh $ + */ + +{ + +textdomain "isns"; + +import "Label"; +import "Popup"; +import "Wizard"; +import "Wizard_hw"; +import "IsnsServer"; + +include "isns/helps.ycp"; + +/** + * Return a modification status + * @return true if data was modified + */ +boolean Modified() { + return IsnsServer::Modified(); +} + +boolean ReallyAbort() { + return !IsnsServer::Modified() || Popup::ReallyAbort(true); +} + +boolean PollAbort() { + return UI::PollInput() == `abort; +} + +/** + * Read settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol ReadDialog() { + Wizard::RestoreHelp(HELPS["read"]:""); + // IsnsServer::AbortFunction = PollAbort; + boolean ret = IsnsServer::Read(); + return ret ? `next : `abort; +} + +/** + * Write settings dialog + * @return `abort if aborted and `next otherwise + */ +symbol WriteDialog() { + Wizard::RestoreHelp(HELPS["write"]:""); + // IsnsServer::AbortFunction = PollAbort; + boolean ret = IsnsServer::Write(); + return ret ? `next : `abort; +} + + + +/* EOF */ +} Added: trunk/isns/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/dialogs.ycp?rev=57845&view=auto ============================================================================== --- trunk/isns/src/dialogs.ycp (added) +++ trunk/isns/src/dialogs.ycp Thu Jul 2 14:09:18 2009 @@ -0,0 +1,303 @@ +/** + * File: include/isns-server/dialogs.ycp + * Package: Configuration of isns-server + * Summary: Dialogs definitions + * Authors: Michal Zugec <mzugec@suse.cz> + * + * $Id: dialogs.ycp 35355 2007-01-15 15:06:49Z mzugec $ + */ + +{ + +textdomain "isns"; + +import "Label"; +import "Wizard"; +import "IsnsServer"; +import "CWMTab"; +import "CWM"; +import "CWMServiceStart"; +import "CWMFirewallInterfaces"; +import "TablePopup"; + +include "isns/helps.ycp"; +include "isns/widgets.ycp"; + +// store current here +string current_tab = "service"; + +map tabs_descr = $[ +// first tab - service status and firewall + "service":$[ + "header" : _("Service"), + "contents" : + `VBox( + `VStretch(), + `HBox( + `HStretch(), + `HSpacing (1), + `VBox( + "ipaddress", + `VSpacing (2), + "auto_start_up", + `VSpacing (2), + "firewall", + `VSpacing (2) + ), + `HSpacing (1), + `HStretch() + ), + `VStretch() + ), + "widget_names" : ["ipaddress", "auto_start_up", "firewall" ] + ], + +// second tab - iSCSI Nodes + "members":$[ + "header" : _("iSCSI Nodes"), + "contents" : + `VBox( + `VSpacing(1), + `HBox( + `HSpacing (5), + `VBox( + "iscsi_nodes_display" + ), + `HSpacing (5) + ), + `VSpacing(1) + ), + "widget_names" : [ "iscsi_nodes_display" ] + ], + +// third tab - Discovery Domains + "discoverydomains":$[ + "header" : _("Discovery Domains"), + "contents" : + `VBox( + `HBox( + `HStretch(), + `VBox( + "dd_display" + ), + `HStretch() + ), + `VStretch(), + `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" ] + ] + + ]; + + +map<string, map <string, any> > widgets = $[ + "auto_start_up" : CWMServiceStart::CreateAutoStartWidget ($[ + "get_service_auto_start" : IsnsServer::GetStartService, + "set_service_auto_start" : IsnsServer::SetStartService, + "start_auto_button" : _("When &Booting"), + "start_manual_button" : _("&Manually"), + "help" : sformat (CWMServiceStart::AutoStartHelpTemplate (), + _("When Booting"), + _("Manually") + ), + ]), + + "ipaddress" : $[ + "widget" : `custom, + "custom_widget" : + `VBox( + `HBox( + `TextEntry(`id(`isnsaddress),_("Address of iSNS Server")) + ) + ), + "init" : initAddress, + "handle" : handleAddress, + "help" : HELPS["ipaddress"]:"" + ], + + + "firewall" : CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ + "services" : [ "isns-server" ], + "display_details" : true, + ]), + + "iscsi_nodes_display" : $[ + "widget" : `custom, + "custom_widget" : + `VBox( + `Heading (_("iSCSI Nodes")), + `Table(`id(`members_table), + `header(_("iSCSI Node Name"),_("Node Type")), + + []), + `Left( + `HBox( + `PushButton(`id(`delete), _("Delete")) + ) + ) + ), + "init" : initISCSI, + "handle" : handleISCSI, + "help" : HELPS["iscsi_display"]:"" + ], + + "dd_display" : $[ + "widget" : `custom, + "custom_widget" : + `VBox( + `Heading (_("Discovery Domains")), + `HBox( + `VSpacing(5), + `Table(`id(`dd_table),`opt(`notify,`immediate), + `header(_("Discovery Domain Name")), + []) + ), + `Left( + `HBox( + `PushButton(`id(`add), _("Create Discovery Domain")), + `PushButton(`id(`delete), _("Delete")), + `HSpacing(25) + ) + ) + ), + "init" : initDiscoveryDomain, + "handle" : handleDiscoveryDomain, + "help" : HELPS["dd_display"]:"" + ], + + "dd_display_members" : $[ + "widget" : `custom, + "custom_widget" : + `VBox( + `Heading (_("Discovery Domain Members")), + `HBox( + `VSpacing(10), + `Table(`id(`dd_members_table), + `header(_("iSCSI Node Name"),_("Node Type")), + []) + ), + `Left( + `HBox( + `PushButton(`id(`addiscsinode), _("Add Existing iSCSI Node")), + `PushButton(`id(`createmember), _("Create iSCSI Node Member")), + `PushButton(`id(`remove), _("Remove")) + ) + ) + ), + "init" : initDDISCSIMembers, + "handle" : handleDiscoveryDomainMembers, + "help" : 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" : initDiscoveryDomainSet, + "handle" : handleDiscoveryDomainSet, + "help" : 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" : initDiscoveryDomainSetMembers, + "handle" : handleDiscoveryDomainSetMembers, + "help" : HELPS["dds_display_members"]:"" + ] + + ]; + + +/** + * Summary dialog + * @return dialog result + */ +// Main dialog - tabbed +any SummaryDialog() { + string caption = _("iSNS Service"); + //curr_target = ""; + map widget_descr = $[ + "tab": CWMTab::CreateWidget($[ + "tab_order": [ "service","members", "discoverydomains", "discoverydomainsets" ], + "tabs": tabs_descr, + "widget_descr": widgets, + "initial_tab" : current_tab, + "tab_help" : _("<h1>iSNS Service</h1>"), + ]), + ]; + term contents = `VBox( "tab" ); + list<map <string, any> > w = CWM::CreateWidgets (["tab"], (map <string, map <string, any> >)widget_descr); + string help = CWM::MergeHelps(w); + contents = CWM::PrepareDialog(contents, w); + + Wizard::SetContentsButtons(caption, contents, help, Label::NextButton (), Label::FinishButton ()); + Wizard::HideBackButton(); + + symbol ret = CWM::Run(w, $[`abort:ReallyAbort ]); + return ret; +} + +/* EOF */ +} Added: trunk/isns/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/helps.ycp?rev=57845&view=auto ============================================================================== --- trunk/isns/src/helps.ycp (added) +++ trunk/isns/src/helps.ycp Thu Jul 2 14:09:18 2009 @@ -0,0 +1,69 @@ +/** + * File: include/isns-server/helps.ycp + * Package: Configuration of isns-server + * Summary: Help texts of all the dialogs + * Authors: + * + * $Id: helps.ycp 35355 2007-01-15 15:06:49Z mzugec $ + */ + +{ + +textdomain "isns"; + +/** + * All helps are here + */ +map HELPS = $[ + + /* Read dialog help 1/2 */ + "read" : _("<p><b><big>Initializing iSNS daemon configuration</big></b><br> +Please wait...<br></p> +") + + + /* Read dialog help 2/2 */ + _("<p><b><big>Aborting Initialization</big></b><br> +Safely abort the configuration utility by pressing <b>Abort</b> now.</p> +"), + + /* Write dialog help 1/2 */ + "write" : _("<p><b><big>Saving iSNS Configuration</big></b><br> +Please wait...<br></p> +") + + + /* Write dialog help 2/2 */ +_("<p><b><big>Aborting Saving:</big></b><br> +Abort the save procedure by pressing <b>Abort</b>. +An additional dialog informs whether it is safe to do so. +</p> +"), + + /* Summary dialog help 1/3 */ + "summary" : _("<p><b><big>iSNS Configuration</big></b><br> +Configure an iSNS server here.<br></p> +"), + + "ipaddress" : _("<b><big>iSNS Server location</big></b><br>The DNS name or the ip address of the iSNS service can be entered for the iSNS address. +"), + + "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>"), + + // discovery domains + "dd_display" : _( +"A list of all discovery domains are displayed. For discovery domains, it is possible to <b>Create</b> a discovery domain and <b>Delete</b> them. <p>Deleting a domain removes the members from the domain but does not delete the iSCSI node members </p>"), + + "dd_display_members" :_( +"A list of all iSCSI nodes are displayed by discovery domain. Selecting another discovery domain refreshes the list with members from that discovery domain. It is possible to <b>Add</b> an iSCSI node to a discovery domain or <b>Delete</b> thenode. <p>Deleting a node removes it from the domain but does not delete the iSCSI node</p> <p>Creating a iSCSI node allows a not yet registered node to be added as a member of the discovery domain. When the initiator or target registers this node then it becomes part of this domain</p> <p>When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains.</p> "), + + // dds table dialog + "dds_display" :_( +"At the top a list of all Discovery Domain Sets are displayed. Discovery Domains belong to Discovery Domain Sets. <p>A Discovery Domain must be a member of a Discovery Domain Set in order to be active. </p>In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members.</p>" ), + + "dds_display_members" :_( +"<p>The Discovery Domain Set Members list is refreshed whenever a different Discovery Domain Set is selected.</p>" ), + +]; + +/* EOF */ +} Added: trunk/isns/src/isns.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/isns.desktop?rev=57845&view=auto ============================================================================== --- trunk/isns/src/isns.desktop (added) +++ trunk/isns/src/isns.desktop Thu Jul 2 14:09:18 2009 @@ -0,0 +1,28 @@ +[Desktop Entry] +X-SuSE-translate=true +X-SuSE-DocTeamID=ycc_isns +X-SuSE-DocTeamID=ycc_isns +Type=Application +Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Net_advanced; + +X-KDE-ModuleType=Library +X-KDE-RootOnly=true +X-KDE-HasReadOnlyMode=true +X-KDE-Library=yast2 +X-SuSE-YaST-Call=isns + +X-SuSE-YaST-Group=Net_advanced +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true +X-SuSE-YaST-AutoInst=all +X-SuSE-YaST-Geometry= +X-SuSE-YaST-SortKey= +X-SuSE-YaST-AutoInstResource=isns + +Icon=yast-iscsi-server +Exec=/sbin/yast2 isns + +Name=iSNS Server +GenericName=Configure an iSNS server +X-KDE-SubstituteUID=true + Added: trunk/isns/src/isns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/isns.ycp?rev=57845&view=auto ============================================================================== --- trunk/isns/src/isns.ycp (added) +++ trunk/isns/src/isns.ycp Thu Jul 2 14:09:18 2009 @@ -0,0 +1,73 @@ +/** + * File: clients/isns.ycp + * Package: Configuration of isns + * Summary: Main file + * Authors: Michal Zugec <mzugec@suse.cz> + * + * $Id: isns.ycp 28597 2006-03-06 11:29:38Z mzugec $ + * + * Main file for isns configuration. Uses all other files. + */ + +{ + +/*** + * <h3>Configuration of isns</h3> + */ + +textdomain "isns"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("IsnsServer module started"); + +import "Progress"; +import "Report"; +import "Summary"; + +import "CommandLine"; +include "isns/wizards.ycp"; + +map cmdline_description = $[ + "id" : "isns", + /* Command line help text for the Xisns module */ + "help" : _("Configuration of an isns service"), + "guihandler" : IsnsServerSequence, + "initialize" : IsnsServer::Read, + "finish" : IsnsServer::Write, + "actions" : $[ + // FIXME TODO: fill the functionality description here + ], + "options" : $[ + // FIXME TODO: fill the option descriptions here + ], + "mappings" : $[ + // FIXME TODO: fill the mappings of actions and options here + ] +]; + +/* is this proposal or not? */ +boolean propose = false; +list args = WFM::Args(); +if(size(args) > 0) { + if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) { + y2milestone("Using PROPOSE mode"); + propose = true; + } +} + +/* main ui function */ +any ret = nil; + +if(propose) ret = IsnsServerAutoSequence(); +else ret = CommandLine::Run(cmdline_description); +y2debug("ret=%1", ret); + +/* Finish */ +y2milestone("IsnsServer module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: trunk/isns/src/isns_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/isns_auto.ycp?rev=57845&view=auto ============================================================================== --- trunk/isns/src/isns_auto.ycp (added) +++ trunk/isns/src/isns_auto.ycp Thu Jul 2 14:09:18 2009 @@ -0,0 +1,101 @@ +/** + * File: clients/isns_auto.ycp + * Package: Configuration of isns + * Summary: Client for autoinstallation + * Authors: Michal Zugec <mzugec@suse.cz> + * + * $Id: isns_auto.ycp 35560 2007-01-22 08:02:23Z mzugec $ + * + * This is a client for autoinstallation. It takes its arguments, + * goes through the configuration and return the setting. + * Does not do any changes to the configuration. + */ + +/** + * @param function to execute + * @param map/list of isns settings + * @return map edited settings, Summary or boolean on success depending on called function + * @example map mm = $[ "FAIL_DELAY" : "77" ]; + * @example map ret = WFM::CallFunction ("isns_auto", [ "Summary", mm ]); + */ + +{ + +textdomain "isns"; + +y2milestone("----------------------------------------"); +y2milestone("IsnsServer auto started"); + +import "IsnsServer"; +include "isns/wizards.ycp"; + +any ret = nil; +string func = ""; +map param = $[]; + +/* Check arguments */ +if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) { + func = (string)WFM::Args(0); + if(size(WFM::Args()) > 1 && is(WFM::Args(1), map)) + param = (map) WFM::Args(1); +} +y2debug("func=%1", func); +y2debug("param=%1", param); + +/* Create a summary*/ +if(func == "Summary") { + ret = select(IsnsServer::Summary(), 0, ""); +} +/* Reset configuration */ +else if (func == "Reset") { + IsnsServerscsiClient::Import($[]); + ret = $[]; +} +/* Change configuration (run AutoSequence) */ +else if (func == "Change") { + ret = IscsiClientAutoSequence(); +} +/* Import configuration */ +else if (func == "Import") { + ret = IsnsServer::Import(param); +} +/* Return actual state */ +else if (func == "Export") { + ret = IsnsServer::Export(); +} +/* Return needed packages */ +else if (func == "Packages") { + ret = IsnsServer::AutoPackages(); +} +else if (func == "GetModified") { + ret = IsnsServer::modified; +} +/* Read current state */ +else if (func == "Read") { + import "Progress"; + boolean progress_orig = Progress::set (false); + ret = IsnsServer::Read(); + Progress::set (progress_orig); +} +/* Write givven settings */ +else if (func == "Write") { + import "Progress"; + boolean progress_orig = Progress::set (false); + IsnsServer::write_only = true; + ret = IsnsServer::Write(); + Progress::set (progress_orig); +} +/* Unknown function */ +else { + y2error("Unknown function: %1", func); + ret = false; +} + +y2debug("ret=%1", ret); +y2milestone("IsnsServer auto finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} Added: trunk/isns/src/isns_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/isns_proposal.ycp?rev=57845&view=auto ============================================================================== --- trunk/isns/src/isns_proposal.ycp (added) +++ trunk/isns/src/isns_proposal.ycp Thu Jul 2 14:09:18 2009 @@ -0,0 +1,87 @@ +/** + * File: clients/isns_proposal.ycp + * Package: Configuration of isns-client + * Summary: Proposal function dispatcher. + * Authors: Michal Zugec <mzugec@suse.cz> + * + * $Id: isns_proposal.ycp 28596 2006-03-06 11:28:57Z mzugec $ + * + * Proposal function dispatcher for isns configuration. + * See source/installation/proposal/proposal-API.txt + */ + +{ + +textdomain "isns"; + +import "IsnsServer"; +import "Progress"; + +/* The main () */ +y2milestone("----------------------------------------"); +y2milestone("IsnsServer proposal started"); + +string func = (string) WFM::Args(0); +map param = (map) WFM::Args(1); +map ret = $[]; + +/* create a textual proposal */ +if(func == "MakeProposal") { + string proposal = ""; + string warning = nil; + symbol warning_level = nil; + boolean force_reset = param["force_reset"]:false; + + if(force_reset || !IsnsServer::proposal_valid) { + IsnsServer::proposal_valid = true; + boolean progress_orig = Progress::set (false); + IsnsServer::Read(); + Progress::set (progress_orig); + } + list sum = IsnsServer::Summary(); + proposal = sum[0]:""; + + ret = $[ + "preformatted_proposal" : proposal, + "warning_level" : warning_level, + "warning" : warning, + ]; +} +/* run the module */ +else if(func == "AskUser") { + map stored = IsnsServer::Export(); + symbol seq = (symbol) WFM::CallFunction("isns", [.propose]); + if(seq != `next) IsnsServer::Import(stored); + y2debug("stored=%1",stored); + y2debug("seq=%1",seq); + ret = $[ + "workflow_sequence" : seq + ]; +} +/* create titles */ +else if(func == "Description") { + ret = $[ + /* Rich text title for IsnsServer in proposals */ + "rich_text_title" : _("iSCSI Initiator"), + /* Menu title for IsnsServer in proposals */ + "menu_title" : _("&iSCSI Initiator"), + "id" : "isns", + ]; +} +/* write the proposal */ +else if(func == "Write") { + IsnsServer::Write(); +} +/* unknown function */ +else { + y2error("unknown function: %1", func); +} + +/* Finish */ +y2debug("ret=%1",ret); +y2milestone("IsnsServer proposal finished"); +y2milestone("----------------------------------------"); +return ret; + +/* EOF */ +} Added: trunk/isns/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/src/wizards.ycp?rev=57845&view=auto ============================================================================== --- trunk/isns/src/wizards.ycp (added) +++ trunk/isns/src/wizards.ycp Thu Jul 2 14:09:18 2009 @@ -0,0 +1,105 @@ +/** + * File: include/isns-server/wizards.ycp + * Package: Configuration of isns-server + * Summary: Wizards definitions + * Authors: Michal Zugec <mzugec@suse.cz> + * + * $Id: wizards.ycp 35355 2007-01-15 15:06:49Z mzugec $ + */ + +{ + +textdomain "isns"; + +import "Sequencer"; +import "Wizard"; + +include "isns/complex.ycp"; +include "isns/dialogs.ycp"; + + +/** + * Main workflow of the isns-server configuration + * @return sequence result + */ +any MainSequence() { + + /* FIXME: adapt to your needs */ + map aliases = $[ + "summary" : ``( SummaryDialog() ), + ]; + + /* FIXME: adapt to your needs */ + map sequence = $[ + "ws_start" : "summary", + "summary" : $[ + `abort : `abort, + `next : `next, + ], + ]; + + any ret = Sequencer::Run(aliases, sequence); + + return ret; +} + +/** + * Whole configuration of isns-server + * @return sequence result + */ +any IsnsServerSequence() { + + map aliases = $[ + "read" : [ ``( ReadDialog() ), true ], + "main" : ``( MainSequence() ), + "write" : [ ``( WriteDialog() ), true ] + ]; + + map sequence = $[ + "ws_start" : "read", + "read" : $[ + `abort : `abort, + `next : "main" + ], + "main" : $[ + `abort : `abort, + `next : "write" + ], + "write" : $[ + `abort : `abort, + `next : `next + ] + ]; + + Wizard::CreateDialog(); + + any ret = Sequencer::Run(aliases, sequence); + + UI::CloseDialog(); + return ret; +} + +/** + * Whole configuration of isns-server but without reading and writing. + * For use with autoinstallation. + * @return sequence result + */ +any IsnsServerAutoSequence() { + + /* Initialization dialog caption */ + string caption = _("isns daemon configuration"); + /* Initialization dialog contents */ + term contents = `Label(_("Initializing...")); + + Wizard::CreateDialog(); + Wizard::SetContentsButtons(caption, contents, "", + Label::BackButton(), Label::NextButton()); + + any ret = MainSequence(); + + UI::CloseDialog(); + return ret; +} + +/* EOF */ +} Added: trunk/isns/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/testsuite/Makefile.am?rev=57845&view=auto ============================================================================== --- trunk/isns/testsuite/Makefile.am (added) +++ trunk/isns/testsuite/Makefile.am Thu Jul 2 14:09:18 2009 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: trunk/isns/testsuite/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/testsuite/_cvsignore?rev=57845&view=auto ============================================================================== --- trunk/isns/testsuite/_cvsignore (added) +++ trunk/isns/testsuite/_cvsignore Thu Jul 2 14:09:18 2009 @@ -0,0 +1,11 @@ +Makefile +Makefile.in +site.exp +*.sum +*.log +tmp.out* +tmp.err* +tmp.log* +config +run +*.test Added: trunk/isns/testsuite/tests/Isns.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/testsuite/tests/Isns.err?rev=57845&view=auto ============================================================================== (empty) Added: trunk/isns/testsuite/tests/Isns.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/testsuite/tests/Isns.out?rev=57845&view=auto ============================================================================== --- trunk/isns/testsuite/tests/Isns.out (added) +++ trunk/isns/testsuite/tests/Isns.out Thu Jul 2 14:09:18 2009 @@ -0,0 +1,2 @@ +Dump Isns::Modified +Return false Added: trunk/isns/testsuite/tests/Isns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/testsuite/tests/Isns.ycp?rev=57845&view=auto ============================================================================== --- trunk/isns/testsuite/tests/Isns.ycp (added) +++ trunk/isns/testsuite/tests/Isns.ycp Thu Jul 2 14:09:18 2009 @@ -0,0 +1,13 @@ +{ + +// testedfiles: Isns.ycp + +include "testsuite.ycp"; +TESTSUITE_INIT([], nil); + +import "Isns"; + +DUMP("Isns::Modified"); +TEST(``(Isns::Modified()), [], nil); + +} Added: trunk/isns/testsuite/tests/_cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/testsuite/tests/_cvsignore?rev=57845&view=auto ============================================================================== (empty) Added: trunk/isns/yast2-isns.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/isns/yast2-isns.spec.in?rev=57845&view=auto ============================================================================== --- trunk/isns/yast2-isns.spec.in (added) +++ trunk/isns/yast2-isns.spec.in Thu Jul 2 14:09:18 2009 @@ -0,0 +1,31 @@ +@HEADER-COMMENT@ + +@HEADER@ +Requires: yast2 +BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite + +BuildArchitectures: noarch + +Summary: Configuration of isns + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +%dir @yncludedir@/isns +@yncludedir@/isns/* +@clientdir@/isns.ycp +@clientdir@/isns_*.ycp +@moduledir@/Isns.* +@moduledir@/Isns2.* +@desktopdir@/isns.desktop +%doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org