Merge branch 'devel'

ansible_collections/f5networks/f5_modules/CHANGELOG.rst

@@ -4,6 +4,14 @@ F5Networks F5\_Modules Collection Release Notes
 
 .. contents:: Topics
 
+v1.30.0
+=======
+
+Minor Changes
+-------------
+
+- bigip_ucs - Fix for bigip_ucs module to restore UCS file on BIG-IP devices.
+
 v1.29.0
 =======
 

ansible_collections/f5networks/f5_modules/changelogs/changelog.yaml

@@ -1132,6 +1132,13 @@ releases:
       name: bigip_ssl_csr
       namespace: ''
     release_date: '2020-04-22'
+  1.30.0:
+    changes:
+      minor_changes:
+      - bigip_ucs - Fix for bigip_ucs module to restore UCS file on BIG-IP devices.
+    fragments:
+    - bigip-ucs-restore-fix.yaml
+    release_date: '2024-08-01'
   1.4.0:
     changes:
       bugfixes:

ansible_collections/f5networks/f5_modules/galaxy.yml

@@ -19,4 +19,4 @@ tags:
   - networking
   - bigip
   - bigiq
-version: 1.29.0
+version: 1.30.0

ansible_collections/f5networks/f5_modules/plugins/module_utils/version.py

@@ -4,4 +4,4 @@
 # GNU General Public License v3.0 (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 # This collection version needs to be updated at each release
-CURRENT_COLL_VERSION = "1.29.0"
+CURRENT_COLL_VERSION = "1.30.0"

ansible_collections/f5networks/f5_modules/plugins/modules/bigip_ucs.py

@@ -652,6 +652,13 @@ def install_on_device(self):
             elif 'remoteSender' in str(ex):
                 # catching some edge cases where API becomes unstable after installation
                 pass
+            elif 'Proxy Error' in str(ex):
+                # catching some edge cases where API becomes unstable after installation
+                pass
+            elif 'object has no attribute' in str(ex):
+                pass
+            elif 'Expecting value' in str(ex):
+                pass
             else:
                 raise F5ModuleError(str(ex))
         self.wait_for_rest_api_restart()