Fixes bugs in the bigip_software modules (ansible#45577)

This patch makes hotfix code work, where before, only base images were working (cherry picked from commit e266a24)
chanvoyage · Sep 12, 2018 · 25349b8 · 25349b8
1 parent 186f4ef
commit 25349b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/lib/ansible/modules/network/f5/bigip_software_image.py b/lib/ansible/modules/network/f5/bigip_software_image.py
@@ -285,7 +285,7 @@ def present(self):
             return self.create()
 
     def exists(self):
-        if self.image_exists() or self.image_exists():
+        if self.image_exists() or self.hotfix_exists():
             return True
         return False
 
@@ -408,7 +408,7 @@ def read_iso_from_device(self, type):
         except ValueError as ex:
             raise F5ModuleError(str(ex))
 
-        if 'code' in response and response['code'] == 400:
+        if 'code' in response and response['code'] in [400, 404]:
             if 'message' in response:
                 raise F5ModuleError(response['message'])
             else:
@@ -438,7 +438,7 @@ def remove_iso_from_device(self, type):
         response = self.client.api.delete(uri)
         if response.status == 200:
             return True
-        if 'code' in response and response['code'] == 400:
+        if 'code' in response and response['code'] in [400, 404]:
             if 'message' in response:
                 raise F5ModuleError(response['message'])
             else:

diff --git a/lib/ansible/modules/network/f5/bigip_software_install.py b/lib/ansible/modules/network/f5/bigip_software_install.py
@@ -188,7 +188,7 @@ def read_image(self):
         image = self.read_image_from_device(type='image')
         if image:
             return image
-        image = self.read_hotfix_from_device(type='hotfix')
+        image = self.read_image_from_device(type='hotfix')
         if image:
             return image
         return None
@@ -206,11 +206,8 @@ def read_image_from_device(self, type):
         except ValueError:
             return None
 
-        if 'code' in response and response['code'] == 400:
-            if 'message' in response:
-                return None
-            else:
-                return None
+        if 'code' in response and response['code'] in [400, 404]:
+            return None
         return response