[node-patches] Change in ovirt-node[master]: revert to network page when cancelling ping test

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: revert to network page when cancelling ping test
......................................................................

revert to network page when cancelling ping test

rhbz#890283

Change-Id: I612ec1f42f94a9b2d065ff391601fb472cd7334e
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M scripts/ovirt-config-setup.py
1 file changed, 20 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/38/10638/1

diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py
index 0949367..6d691f0 100755
--- a/scripts/ovirt-config-setup.py
+++ b/scripts/ovirt-config-setup.py
@@ -2166,24 +2166,28 @@
                                         self.__current_page = (
                                              NETWORK_DETAILS_PAGE)
                                 else:
-                                    warn = None
-                                    self._create_warn_screen()
-                                    title = "Confirm NIC Configuration"
-                                    message = ("Unsaved network changes " +
-                                      "detected, save and continue to " +
-                                      "NIC configuration?")
-                                    warn = ButtonChoiceWindow(self.screen,
-                                           title, message)
-                                    if warn == "ok":
-                                        # apply and continue
-                                        self.process_network_config()
+                                    if pressed == PING_BUTTON:
                                         self.__current_page = (
-                                            NETWORK_DETAILS_PAGE)
-                                        self.preset_network_config = None
+                                             NETWORK_PAGE)
                                     else:
-                                        # Do not apply, return
-                                        self.preset_network_config = (
-                                            current_network_config)
+                                        warn = None
+                                        self._create_warn_screen()
+                                        title = "Confirm NIC Configuration"
+                                        message = ("Unsaved network changes " +
+                                          "detected, save and continue to " +
+                                          "NIC configuration?")
+                                        warn = ButtonChoiceWindow(self.screen,
+                                               title, message)
+                                        if warn == "ok":
+                                            # apply and continue
+                                            self.process_network_config()
+                                            self.__current_page = (
+                                                NETWORK_DETAILS_PAGE)
+                                            self.preset_network_config = None
+                                        else:
+                                            # Do not apply, return
+                                            self.preset_network_config = (
+                                                current_network_config)
                         else:
                             self.__current_page = menu_choice
                         if self.net_apply_config == 1:


--
To view, visit http://gerrit.ovirt.org/10638
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I612ec1f42f94a9b2d065ff391601fb472cd7334e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>