diff options
| -rw-r--r-- | dispatch.py | 1 | ||||
| -rwxr-xr-x | gui.py | 1 | ||||
| -rw-r--r-- | installclass.py | 5 | ||||
| -rw-r--r-- | iw/iscsi_gui.py | 70 | ||||
| -rw-r--r-- | text.py | 1 | ||||
| -rw-r--r-- | textw/iscsi_text.py | 83 |
6 files changed, 0 insertions, 161 deletions
diff --git a/dispatch.py b/dispatch.py index 5967fe38b..a41ca1a54 100644 --- a/dispatch.py +++ b/dispatch.py @@ -64,7 +64,6 @@ installSteps = [ ("keyboard", ), ("findrootparts", findRootParts, ), ("findinstall", ), - ("iscsi", ), ("zfcpconfig", ), ("partitionobjinit", partitionObjectsInitialize, ), ("parttype", ), @@ -58,7 +58,6 @@ stepToClass = { "keyboard" : ("kbd_gui", "KeyboardWindow"), "mouse" : ("mouse_gui", "MouseWindow"), "welcome" : ("welcome_gui", "WelcomeWindow"), - "iscsi" : ("iscsi_gui", "iscsiWindow"), "zfcpconfig" : ("zfcp_gui", "ZFCPWindow"), "partitionmethod" : ("partmethod_gui", "PartitionMethodWindow"), "partition" : ("partition_gui", "PartitionWindow"), diff --git a/installclass.py b/installclass.py index 2d8c73b1e..38a49af20 100644 --- a/installclass.py +++ b/installclass.py @@ -115,7 +115,6 @@ class BaseInstallClass: "findrootparts", "betanag", "installtype", - "iscsi", "zfcpconfig", "partitionobjinit", "parttype", @@ -174,10 +173,6 @@ class BaseInstallClass: if flags.cmdline.has_key("upgrade"): dispatch.skipStep("findrootparts", skip = 0) - # Ask for iscsi configuration only when specifically requested - if not flags.iscsi: - dispatch.skipStep("iscsi", skip = 1) - # if there's only one install class, it doesn't make much sense # to show it if len(availableClasses()) < 2: diff --git a/iw/iscsi_gui.py b/iw/iscsi_gui.py deleted file mode 100644 index e147c234c..000000000 --- a/iw/iscsi_gui.py +++ /dev/null @@ -1,70 +0,0 @@ -# -# iscsi_gui.py: gui interface for configuration of iscsi -# -# Copyright 2005, 2006 IBM, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# general public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -import gtk -import gobject -import gui -import iutil -import network -from rhpl.translate import _, N_ -from iw_gui import * - -class iscsiWindow(InstallWindow): - def __init__(self, ics): - InstallWindow.__init__(self, ics) - ics.setTitle(_("iSCSI Configuration")) - ics.setNextEnabled(True) - - def getNext(self): - try: - network.sanityCheckIPString(self.ip_widget.get_text()) - self.iscsi.ipaddr = self.ip_widget.get_text() - except network.IPMissing, msg: - self.intf.messageWindow(_("Error with Data"), - _("No IP address entered, skipping iSCSI setup")) - except network.IPError, msg: - self.intf.messageWindow(_("Error with Data"), _("%s") % (msg,)) - raise gui.StayOnScreen - - self.iscsi.port = self.port.get_text() - self.iscsi.initiator = self.initiator.get_text() - - return None - - def getScreen(self, anaconda): - self.intf = anaconda.intf - self.iscsi = anaconda.id.iscsi - - (self.xml, widget) = gui.getGladeWidget("iscsi-config.glade", "iscsiRows") - self.ip_table = self.xml.get_widget("iscsiTable") - self.ip_widget = gtk.Entry() - self.ip_widget.set_text(self.iscsi.ipaddr) - - self.port = self.xml.get_widget("iscsiPort") - if self.iscsi.port: - self.port.set_text(self.iscsi.port) - - self.initiator = self.xml.get_widget("iscsiInitiator") - if self.iscsi.initiator: - self.initiator.set_text(self.iscsi.initiator) - - # put the IP address widget in the right (1, 2) upper (0, 1) - # corner of our 3 rows by 2 columns table. - - # XXX there is too much space around the IP address. Using this - # variant had no affect: - # self.ip_table.attach(self.ip_widget, 1, 2, 0, 1, gtk.FILL|gtk.EXPAND) - self.ip_table.attach(self.ip_widget, 1, 2, 0, 1) - return widget - -# vim:tw=78:ts=4:et:sw=4 @@ -42,7 +42,6 @@ stepToClasses = { "keyboard" : ("keyboard_text", "KeyboardWindow"), "mouse" : ("mouse_text", ("MouseWindow", "MouseDeviceWindow")), "welcome" : ("welcome_text", "WelcomeWindow"), - "iscsi" : ("iscsi_text", "iscsiWindow"), "parttype" : ("partition_text", "PartitionTypeWindow"), "custom-upgrade" : ("upgrade_text", "UpgradeExamineWindow"), "addswap" : ("upgrade_text", "UpgradeSwapWindow"), diff --git a/textw/iscsi_text.py b/textw/iscsi_text.py deleted file mode 100644 index 260dd04ae..000000000 --- a/textw/iscsi_text.py +++ /dev/null @@ -1,83 +0,0 @@ -# -# iscs_text.py: iscsi text dialog -# -# Copyright 2006 IBM, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# general public license. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -import isys -from network import sanityCheckIPString -from snack import * -from constants import * -from constants_text import * -from rhpl.translate import _ - -class iscsiWindow: - def __call__(self, screen, anaconda): - self.iscsi = anaconda.id.iscsi - - # We have 3 values of interest: target IP address, port and - # initiator name. - # - # Create a Grid that is 2 columns (label and value) by 3 rows in - # size. - grid = Grid(2, 3) - - row = 0 - self.ip_entry = Entry (16) - self.ip_entry.set(self.iscsi.ipaddr) - grid.setField(Label(_("Target IP address:")), 0, row, anchorLeft = 1) - grid.setField(self.ip_entry, 1, row, anchorLeft = 1, - padding = (1, 0, 0, 0)) - - row += 1 - self.port_entry = Entry(16) - self.port_entry.set(self.iscsi.port) - grid.setField(Label(_("Port Number:")), 0, row, anchorLeft = 1) - grid.setField(self.port_entry, 1, row, anchorLeft = 1, - padding = (1, 0, 0, 0)) - - row +=1 - self.initiator_entry = Entry(32) - self.initiator_entry.set(self.iscsi.initiator) - grid.setField(Label(_("iSCSI Initiator Name:")), 0, row, anchorLeft = 1) - grid.setField(self.initiator_entry, 1, row, anchorLeft = 1, - padding = (1, 0, 0, 0)) - - bb = ButtonBar(screen, (TEXT_OK_BUTTON, TEXT_BACK_BUTTON)) - - toplevel = GridFormHelp(screen, _("iSCSI Configuration"), "iSCSI", 1, 5) - toplevel.add(grid, 0, 1, (0, 0, 0, 1), anchorLeft = 1) - toplevel.add(bb, 0, 3, growx = 1) - - while 1: - result = toplevel.run() - rc = bb.buttonPressed (result) - if rc == TEXT_BACK_CHECK: - screen.popWindow() - return INSTALL_BACK - self.iscsi.ipaddr = self.ip_entry.value() - if not self.iscsi.ipaddr: - # XXX warn no iscsi configuration ... - break - if sanityCheckIPString(self.iscsi.ipaddr) is None: - ButtonChoiceWindow(screen, _("Invalid IP string"), - _("The entered IP '%s' is not a valid IP.") - %(self.iscsi.ipaddr), - buttons = [ _("OK") ]) - continue - self.iscsi.port = self.port_entry.value() - self.iscsi.initiator = self.initiator_entry.value() - break - - screen.popWindow() - self.iscsi.startup() - return INSTALL_OK - -# vim:tw=78:ts=4:et:sw=4 |