[Ovirt-devel] [PATCH] remove network page loop when selecting other pages

[Joey Boggs]

rhbz#725412

Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
 scripts/ovirt-config-setup.py |    5 ++---
 scripts/ovirtfunctions.py     |    4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/ovirt-config-setup.py b/scripts/ovirt-config-setup.py
index a83e7e8..4bd46d5 100755
--- a/scripts/ovirt-config-setup.py
+++ b/scripts/ovirt-config-setup.py
@@ -1570,13 +1570,12 @@ class NodeConfigScreen():
                                 self.__current_page = menu_choice
                             if self.net_apply_config == 1:
                                 self.net_apply_config = 0
-                                self.__current_page = NETWORK_PAGE
                         elif self.__current_page == NETWORK_DETAILS_PAGE:
                             if pressed == BACK_BUTTON:
                                 self.__current_page = NETWORK_PAGE
                             elif self.net_apply_config == 1:
                                 self.__current_page = NETWORK_PAGE
-                            elif is_managed(OVIRT_VARS["OVIRT_BOOTPARAMS"]):
+                            elif is_managed():
                                 dev_interface,dev_bootproto,dev_vendor,dev_address,dev_driver,dev_conf_status = self.nic_dict[self.nic_lb.current()].split(",", 5)
                                 if self.configured_nics >= 1 and dev_conf_status != "Configured" :
                                     ButtonChoiceWindow(self.screen, "Network", "Hypervisor is already managed, unable to configure additional nics", buttons = ['Ok'])
@@ -1584,7 +1583,7 @@ class NodeConfigScreen():
                             elif self.__nic_config_failed == 1:
                                 self.__current_page = NETWORK_DETAILS_PAGE
                             else:
-                               self.__current_page = NETWORK_PAGE
+                               self.__current_page = menu_choice
                         elif self.__current_page == SUPPORT_PAGE:
                            log("pressed: " + str(pressed))
                            if pressed == SHELL_BUTTON:
diff --git a/scripts/ovirtfunctions.py b/scripts/ovirtfunctions.py
index ae3c013..14c7b44 100644
--- a/scripts/ovirtfunctions.py
+++ b/scripts/ovirtfunctions.py
@@ -142,8 +142,8 @@ def augtool_get(key):
     return value
 # return 1 if oVirt Node is running in standalone mode
 # return 0 if oVirt Node is managed by the oVirt Server
-def is_managed(bootparams):
-    if "ovirt_standalone" in bootparams:
+def is_managed():
+    if "ovirt_standalone" in OVIRT_VARS["OVIRT_BOOTPARAMS"]:
         return False
     else:
         return True
-- 
1.7.6