Move issu_detail.refresh() out of inner for loops

CiscoDevNet · Feb 25, 2024 · 0e32d52 · 0e32d52
1 parent 17b81bd
commit 0e32d52
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/plugins/module_utils/image_upgrade/image_stage.py b/plugins/module_utils/image_upgrade/image_stage.py
@@ -194,7 +194,6 @@ def commit(self):
             self.result_current = {"changed": False, "success": True}
             return
 
-        # self.issu_detail.refresh()
         self.prune_serial_numbers()
         self.validate_serial_numbers()
         self._wait_for_current_actions_to_complete()
@@ -267,13 +266,13 @@ def _wait_for_current_actions_to_complete(self):
         while self.serial_numbers_done != serial_numbers_todo and timeout > 0:
             sleep(self.check_interval)
             timeout -= self.check_interval
+            self.issu_detail.refresh()
 
             for serial_number in self.serial_numbers:
                 if serial_number in self.serial_numbers_done:
                     continue
 
                 self.issu_detail.filter = serial_number
-                self.issu_detail.refresh()
 
                 if self.issu_detail.actions_in_progress is False:
                     self.serial_numbers_done.add(serial_number)
@@ -300,13 +299,13 @@ def _wait_for_image_stage_to_complete(self):
         while self.serial_numbers_done != serial_numbers_todo and timeout > 0:
             sleep(self.check_interval)
             timeout -= self.check_interval
+            self.issu_detail.refresh()
 
             for serial_number in self.serial_numbers:
                 if serial_number in self.serial_numbers_done:
                     continue
 
                 self.issu_detail.filter = serial_number
-                self.issu_detail.refresh()
                 ip_address = self.issu_detail.ip_address
                 device_name = self.issu_detail.device_name
                 staged_percent = self.issu_detail.image_staged_percent

diff --git a/plugins/module_utils/image_upgrade/image_upgrade.py b/plugins/module_utils/image_upgrade/image_upgrade.py
@@ -207,9 +207,9 @@ def _validate_devices(self) -> None:
             msg += "call instance.devices before calling commit."
             self.module.fail_json(msg, **self.failed_result)
 
+        self.issu_detail.refresh()
         for device in self.devices:
             self.issu_detail.filter = device.get("ip_address")
-            self.issu_detail.refresh()
 
             # Any device validation from issu_detail would go here.
             # We used to fail_json if upgrade == "Failed" but that

diff --git a/plugins/module_utils/image_upgrade/image_validate.py b/plugins/module_utils/image_upgrade/image_validate.py
@@ -130,9 +130,9 @@ def validate_serial_numbers(self) -> None:
         """
         self.method_name = inspect.stack()[0][3]
 
+        self.issu_detail.refresh()
         for serial_number in self.serial_numbers:
             self.issu_detail.filter = serial_number
-            self.issu_detail.refresh()
             if self.issu_detail.validated == "Failed":
                 msg = f"{self.class_name}.{self.method_name}: "
                 msg += "image validation is failing for the following switch: "
@@ -243,13 +243,13 @@ def _wait_for_current_actions_to_complete(self) -> None:
         while self.serial_numbers_done != serial_numbers_todo and timeout > 0:
             sleep(self.check_interval)
             timeout -= self.check_interval
+            self.issu_detail.refresh()
 
             for serial_number in self.serial_numbers:
                 if serial_number in self.serial_numbers_done:
                     continue
 
                 self.issu_detail.filter = serial_number
-                self.issu_detail.refresh()
 
                 if self.issu_detail.actions_in_progress is False:
                     self.serial_numbers_done.add(serial_number)
@@ -276,13 +276,13 @@ def _wait_for_image_validate_to_complete(self) -> None:
         while self.serial_numbers_done != serial_numbers_todo and timeout > 0:
             sleep(self.check_interval)
             timeout -= self.check_interval
+            self.issu_detail.refresh()
 
             for serial_number in self.serial_numbers:
                 if serial_number in self.serial_numbers_done:
                     continue
 
                 self.issu_detail.filter = serial_number
-                self.issu_detail.refresh()
 
                 ip_address = self.issu_detail.ip_address
                 device_name = self.issu_detail.device_name