[anaconda][master/rhel7-branch][PATCH 2/2] Add dialog box for adding DASDs. (#1070115)
Vratislav Podzimek
vpodzime at redhat.com
Fri Aug 29 07:06:44 UTC 2014
On Thu, 2014-08-28 at 15:18 -0400, Samantha N. Bueno wrote:
> This is the dialog box which pops up prompting for info so more (ECKD)
> DASDs can be added.
>
> Upon a successful add, users are returned to the filter. Due to the fact
> that DASDs are detected as local storage, newly-added DASDs here are not
> going to show up in the Search or System Z Devices tab. They do appear
> under "Local Standard Disks" back in the main storage spoke though.
>
> Resolves: rhbz#1070115
> ---
> pyanaconda/ui/gui/spokes/advstorage/dasd.glade | 362 +++++++++++++++++++++++++
> pyanaconda/ui/gui/spokes/advstorage/dasd.py | 141 ++++++++++
> 2 files changed, 503 insertions(+)
> create mode 100644 pyanaconda/ui/gui/spokes/advstorage/dasd.glade
> create mode 100644 pyanaconda/ui/gui/spokes/advstorage/dasd.py
>
> diff --git a/pyanaconda/ui/gui/spokes/advstorage/dasd.glade b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade
> new file mode 100644
> index 0000000..bd16e7f
> --- /dev/null
> +++ b/pyanaconda/ui/gui/spokes/advstorage/dasd.glade
> @@ -0,0 +1,362 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!-- Generated with glade 3.16.1 -->
> +<interface>
> + <requires lib="gtk+" version="3.0"/>
> + <object class="GtkDialog" id="dasdDialog">
> + <property name="can_focus">False</property>
> + <property name="border_width">5</property>
> + <property name="modal">True</property>
> + <property name="type_hint">dialog</property>
> + <property name="decorated">False</property>
> + <child internal-child="vbox">
> + <object class="GtkBox" id="dialog-vbox1">
> + <property name="can_focus">False</property>
> + <property name="orientation">vertical</property>
> + <property name="spacing">2</property>
> + <child internal-child="action_area">
> + <object class="GtkButtonBox" id="dialog-action_area1">
> + <property name="can_focus">False</property>
> + <property name="layout_style">end</property>
> + <child>
> + <object class="GtkButton" id="cancelButton">
> + <property name="label">gtk-cancel</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">True</property>
> + <property name="use_stock">True</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkButton" id="okButton">
> + <property name="label">gtk-ok</property>
> + <property name="visible">True</property>
> + <property name="sensitive">False</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">True</property>
> + <property name="use_stock">True</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="pack_type">end</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkBox" id="box1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="orientation">vertical</property>
> + <property name="spacing">6</property>
> + <child>
> + <object class="GtkLabel" id="label1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="label" translatable="yes">ADD DASD STORAGE TARGET</property>
> + <attributes>
> + <attribute name="weight" value="bold"/>
> + </attributes>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkNotebook" id="dasdNotebook">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="show_tabs">False</property>
> + <property name="show_border">False</property>
> + <child>
> + <object class="GtkGrid" id="configureGrid">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
> + <child>
> + <object class="GtkLabel" id="label5">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="margin_bottom">6</property>
> + <property name="xalign">0</property>
> + <property name="label" translatable="yes">To use DASD disks, you must provide the device number.</property>
> + <property name="wrap">True</property>
> + </object>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="top_attach">0</property>
> + <property name="width">3</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkEntry" id="deviceEntry">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="hexpand">True</property>
> + <property name="invisible_char">?</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="top_attach">1</property>
> + <property name="width">2</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="label6">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="label" translatable="yes">_Device number:</property>
> + <property name="use_underline">True</property>
> + <property name="mnemonic_widget">deviceEntry</property>
> + </object>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="top_attach">1</property>
> + <property name="width">1</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkNotebook" id="conditionNotebook">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="valign">center</property>
> + <property name="show_tabs">False</property>
> + <property name="show_border">False</property>
> + <child>
> + <object class="GtkButton" id="startButton">
> + <property name="label" translatable="yes">_Start Discovery</property>
> + <property name="visible">True</property>
> + <property name="sensitive">False</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">True</property>
> + <property name="halign">center</property>
> + <property name="valign">center</property>
> + <property name="vexpand">True</property>
> + <property name="use_underline">True</property>
> + <signal name="clicked" handler="on_start_clicked" swapped="no"/>
> + </object>
> + </child>
> + <child type="tab">
> + <placeholder/>
> + </child>
> + <child>
> + <object class="GtkBox" id="waitBox">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="halign">center</property>
> + <property name="spacing">5</property>
> + <child>
> + <object class="GtkSpinner" id="waitSpinner">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="active">True</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="label13">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="label" translatable="yes">Discovering DASD devices. This may take a moment...</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + <child type="tab">
> + <placeholder/>
> + </child>
> + <child>
> + <object class="GtkGrid" id="errorBox">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="halign">center</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
> + <child>
> + <object class="GtkImage" id="image3">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">1</property>
> + <property name="stock">gtk-dialog-error</property>
> + </object>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="top_attach">0</property>
> + <property name="width">1</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="label14">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="label" translatable="yes">Device discovery failed.</property>
> + <attributes>
> + <attribute name="weight" value="bold"/>
> + </attributes>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="top_attach">0</property>
> + <property name="width">1</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="label22">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="label" translatable="yes">The following error occurred discovering DASD devices. Please double check your configuration information and try again.</property>
> + <property name="wrap">True</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="top_attach">1</property>
> + <property name="width">1</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="deviceErrorLabel">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="label">Error message goes here.</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="top_attach">2</property>
> + <property name="width">1</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkButton" id="retryButton">
> + <property name="label" translatable="yes">_Retry Discovery</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">True</property>
> + <property name="halign">center</property>
> + <property name="valign">center</property>
> + <property name="use_underline">True</property>
> + <signal name="clicked" handler="on_start_clicked" swapped="no"/>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="top_attach">3</property>
> + <property name="width">1</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + <child>
> + <placeholder/>
> + </child>
> + <child>
> + <placeholder/>
> + </child>
> + <child>
> + <placeholder/>
> + </child>
> + </object>
> + <packing>
> + <property name="position">2</property>
> + </packing>
> + </child>
> + <child type="tab">
> + <placeholder/>
> + </child>
> + </object>
> + <packing>
> + <property name="left_attach">0</property>
> + <property name="top_attach">2</property>
> + <property name="width">3</property>
> + <property name="height">1</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + <child type="tab">
> + <placeholder/>
> + </child>
> + <child>
> + <placeholder/>
> + </child>
> + <child type="tab">
> + <placeholder/>
> + </child>
> + <child>
> + <placeholder/>
> + </child>
> + <child type="tab">
> + <placeholder/>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + <action-widgets>
> + <action-widget response="0">cancelButton</action-widget>
> + <action-widget response="1">okButton</action-widget>
> + </action-widgets>
> + </object>
> + <object class="GtkListStore" id="nodeStore">
> + <columns>
> + <!-- column-name nodeSelected -->
> + <column type="gboolean"/>
> + <!-- column-name nodeNotLoggedIn -->
> + <column type="gboolean"/>
> + <!-- column-name nodeName -->
> + <column type="gchararray"/>
> + <!-- column-name nodeIface -->
> + <column type="gchararray"/>
> + </columns>
> + </object>
> + <object class="GtkTreeModelFilter" id="nodeStoreFiltered">
> + <property name="child_model">nodeStore</property>
> + </object>
> +</interface>
> diff --git a/pyanaconda/ui/gui/spokes/advstorage/dasd.py b/pyanaconda/ui/gui/spokes/advstorage/dasd.py
> new file mode 100644
> index 0000000..aec1dc7
> --- /dev/null
> +++ b/pyanaconda/ui/gui/spokes/advstorage/dasd.py
> @@ -0,0 +1,141 @@
> +# DASD configuration dialog
> +#
> +# Copyright (C) 2014 Red Hat, Inc.
> +#
> +# This copyrighted material is made available to anyone wishing to use,
> +# modify, copy, or redistribute it subject to the terms and conditions of
> +# the GNU General Public License v.2, or (at your option) any later version.
> +# This program is distributed in the hope that it will be useful, but WITHOUT
> +# ANY WARRANTY expressed or implied, including the implied warranties of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
> +# Public License for more details. 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., 51 Franklin Street, Fifth Floor, Boston, MA
> +# 02110-1301, USA. Any Red Hat trademarks that are incorporated in the
> +# source code or documentation are not subject to the GNU General Public
> +# License and may only be used or replicated with the express permission of
> +# Red Hat, Inc.
> +#
> +# Red Hat Author(s): Samantha N. Bueno <sbueno at redhat.com>
> +#
> +
> +from pyanaconda.ui.gui import GUIObject
> +from pyanaconda.ui.gui.utils import gtk_action_nowait
> +
> +from blivet.devicelibs.dasd import sanitize_dasd_dev_input, online_dasd
> +
> +__all__ = ["DASDDialog"]
> +
> +class DASDDialog(GUIObject):
> + """ Gtk dialog which allows users to manually add DASD devices without
> + having previously specified them in a parm file.
> + """
> + builderObjects = ["dasdDialog"]
> + mainWidgetName = "dasdDialog"
> + uiFile = "spokes/advstorage/dasd.glade"
> +
> + def __init__(self, data, storage):
> + GUIObject.__init__(self, data)
> + self.storage = storage
> + self.dasd = self.storage.dasd
> +
> + self._discoveryError = None
> +
> + self._update_devicetree = False
> +
> + # grab all of the ui objects
> + self._dasdNotebook = self.builder.get_object("dasdNotebook")
> +
> + self._configureGrid = self.builder.get_object("configureGrid")
> + self._conditionNotebook = self.builder.get_object("conditionNotebook")
> +
> + self._startButton = self.builder.get_object("startButton")
> + self._okButton = self.builder.get_object("okButton")
> + self._cancelButton = self.builder.get_object("cancelButton")
> +
> + self._deviceEntry = self.builder.get_object("deviceEntry")
> +
> + def refresh(self):
> + self._deviceEntry.set_text("")
> + self._deviceEntry.set_sensitive(True)
> + self._startButton.set_sensitive(True)
> +
> + def run(self):
> + rc = self.window.run()
> + self.window.destroy()
> + # We need to call this to get the device nodes to show up
> + # in our devicetree.
> + if self._update_devicetree:
> + self.storage.devicetree.populate()
> + return rc
> +
> + def _set_configure_sensitive(self, sensitivity):
> + """ Set entries to a given sensitivity. """
> + for child in self._configureGrid.get_children():
> + child.set_sensitive(sensitivity)
You can set_sensitive the whole grid instead of every child.
> +
> + def on_start_clicked(self, *args):
> + """ Go through the process of validating entry contents and then
> + attempt to add the device.
> + """
> + # First update widgets
> + self._startButton.hide()
> + self._cancelButton.set_sensitive(False)
> + self._okButton.set_sensitive(False)
> +
> + self._conditionNotebook.set_current_page(1)
> + self._set_configure_sensitive(False)
> + self._deviceEntry.set_sensitive(False)
> +
> + self._conditionNotebook.set_current_page(1)
> + try:
> + device = sanitize_dasd_dev_input(self._deviceEntry.get_text())
> + except ValueError as e:
> + _config_error = str(e)
> + self.builder.get_object("deviceErrorLabel").set_text(_config_error)
> + self._conditionNotebook.set_current_page(2)
> + self._set_configure_sensitive(True)
> + return
> +
> + spinner = self.builder.get_object("waitSpinner")
What about adding 'self._spinner = self.builder...' to __init__?
> + spinner.start()
> +
> + self._discover(device)
> + self._check_discover()
> +
> + @gtk_action_nowait
> + def _check_discover(self, *args):
> + """ After the DASD discover thread runs, check to see whether a valid
> + device was discovered. Display an error message if not.
> + """
> +
> + spinner = self.builder.get_object("waitSpinner")
> + spinner.stop()
> +
> + if self._discoveryError:
> + # Failure, display a message and leave the user on the dialog so
> + # they can try again (or cancel)
> + self.builder.get_object("deviceErrorLabel").set_text(self._discoveryError)
> + self._discoveryError = None
> + self._conditionNotebook.set_current_page(2)
> + self._set_configure_sensitive(True)
> + else:
> + # Great success. Just return to the advanced storage window and let the
> + # UI update with the newly-added device
> + self.window.response(1)
> + return True
> +
> + self._cancelButton.set_sensitive(True)
> + return False
> +
> + def _discover(self, *args):
Same question as Brian here.
--
Vratislav Podzimek
Anaconda Rider | RHCE | Red Hat, Inc. | Brno - Czech Republic
More information about the anaconda-patches
mailing list