Merge branch 'devel'

README.md

@@ -109,7 +109,7 @@ being included in this project.
 [repoinstall]: https://docs.ansible.com/ansible/latest/user_guide/collections_using.html#installing-a-collection-from-a-git-repository
 [imperative_collection]: https://galaxy.ansible.com/f5networks/f5_modules
 [dailybuild]: https://f5-ansible.s3.amazonaws.com/collections/f5networks-f5_bigip-devel.tar.gz
-[License]: https://github.com/f5devcentral/f5-ansible-bigip/blob/master/COPYING
+[License]: https://www.gnu.org/licenses/gpl-3.0.txt
 [execenv]: https://docs.ansible.com/automation-controller/latest/html/userguide/execution_environments.html
 [f5execenv]: http://clouddocs.f5.com/products/orchestration/ansible/devel/usage/exec-env.html
 [F5 Contributor License Agreement]: http://clouddocs.f5.com/products/orchestration/ansible/devel/usage/contributor.html

ansible_collections/f5networks/f5_bigip/CHANGELOG.rst

@@ -4,6 +4,9 @@ F5Networks F5\_BIGIP Collection Release Notes
 
 .. contents:: Topics
 
+v3.8.0
+======
+
 v3.7.0
 ======
 

ansible_collections/f5networks/f5_bigip/README.md

@@ -109,7 +109,7 @@ being included in this project.
 [repoinstall]: https://docs.ansible.com/ansible/latest/user_guide/collections_using.html#installing-a-collection-from-a-git-repository
 [imperative_collection]: https://galaxy.ansible.com/f5networks/f5_modules
 [dailybuild]: https://f5-ansible.s3.amazonaws.com/collections/f5networks-f5_bigip-devel.tar.gz
-[License]: https://github.com/f5devcentral/f5-ansible-bigip/blob/master/COPYING
+[License]: https://www.gnu.org/licenses/gpl-3.0.txt
 [execenv]: https://docs.ansible.com/automation-controller/latest/html/userguide/execution_environments.html
 [f5execenv]: http://clouddocs.f5.com/products/orchestration/ansible/devel/usage/exec-env.html
 [F5 Contributor License Agreement]: http://clouddocs.f5.com/products/orchestration/ansible/devel/usage/contributor.html

ansible_collections/f5networks/f5_bigip/changelogs/changelog.yaml

@@ -621,3 +621,5 @@ releases:
     release_date: '2024-08-01'
   3.7.0:
     release_date: '2024-09-10'
+  3.8.0:
+    release_date: '2024-10-24'

ansible_collections/f5networks/f5_bigip/galaxy.yml

@@ -30,4 +30,4 @@ tags:
   - networking
   - bigip
   - bigiq
-version: 3.7.0
+version: 3.8.0

ansible_collections/f5networks/f5_bigip/plugins/module_utils/compare.py

@@ -135,7 +135,7 @@ def nested_diff(want, have, invalid):
         if k not in have:
             return True
         else:
-            if type(want[k]) is dict:
+            if isinstance(want[k], dict):
                 if nested_diff(want[k], have[k], invalid):
                     return True
             else:

ansible_collections/f5networks/f5_bigip/plugins/module_utils/sslo_templates/sslo_service_http.py

@@ -91,8 +91,8 @@
                     "create": false
                 },
                 "existingBlockId": ""
-             }{% if params.devices_from is defined and params.devices_to.vlan is not defined -%},{% endif %}{% endif %}
-             {% if params.devices_from is defined and params.devices_to.vlan is not defined -%}
+             }{% if params.devices_from is defined and params.devices_from.vlan is not defined -%},{% endif %}{% endif %}
+             {% if params.devices_from is defined and params.devices_from.vlan is not defined -%}
                 {
                     "name": "{{ params.devices_from.name }}",
                     "partition": "Common",
@@ -225,6 +225,8 @@
                 "ipFamily": "{{ params.ip_family }}",
                 "isAutoManage": {{ params.auto_manage | tojson }},
                 "portRemap": {% if params.port_remap is defined %}true{% else %}false{% endif %},
+                "serviceEntrySSLProfile": "",
+                "serviceReturnSSLProfile": "",
                 "httpPortRemapValue": {% if params.port_remap is defined -%}{{ params.port_remap }},{% else %}80,
                 {% endif %}
                 "serviceDownAction": "{{ params.service_down_action }}",

ansible_collections/f5networks/f5_bigip/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 = "3.7.0"
+CURRENT_COLL_VERSION = "3.8.0"

ansible_collections/f5networks/f5_bigip/plugins/modules/bigiq_as3_deploy.py

@@ -218,7 +218,7 @@ def _get_errors_from_response(self, messages):
                 results += messages['errors']
         else:
             for message in messages['results']:
-                if 'message' in message and message['message'] in ['declaration failed', 'declaration is invalid']:
+                if any(error in message['message'].lower() for error in ['failed', 'invalid']):
                     results.append(message['message'])
                 if 'errors' in message:
                     results += message['errors']

ansible_collections/f5networks/f5_bigip/tests/compat/mock.py

@@ -64,8 +64,7 @@ def _iterate_read_data(read_data):
             # newline that our naive format() added
             data_as_list[-1] = data_as_list[-1][:-1]
 
-        for line in data_as_list:
-            yield line
+        yield from data_as_list
 
     def mock_open(mock=None, read_data=''):
         """
@@ -93,8 +92,7 @@ def _readline_side_effect():
             if handle.readline.return_value is not None:
                 while True:
                     yield handle.readline.return_value
-            for line in _data:
-                yield line
+            yield from _data
 
         global file_spec
         if file_spec is None:

ansible_collections/f5networks/f5_bigip/tests/mock/loader.py

@@ -30,7 +30,7 @@ class DictDataLoader(DataLoader):
 
     def __init__(self, file_mapping=None):
         file_mapping = {} if file_mapping is None else file_mapping
-        assert type(file_mapping) is dict
+        assert isinstance(file_mapping, dict)
 
         super(DictDataLoader, self).__init__()
 

ansible_collections/f5networks/f5_bigip/tests/modules/network/f5/fixtures/sslo_http_create_generated.json

@@ -1,3 +1,4 @@
+
 {
     "name": "sslo_obj_SERVICE_CREATE_ssloS_proxy1a",
     "inputProperties": [
@@ -16,7 +17,39 @@
         {
             "id": "f5-ssl-orchestrator-network",
             "type": "JSON",
-            "value": []
+            "value": [
+                {
+                    "name": "ssloN_proxy1a_out",
+                    "partition": "Common",
+                    "strictness": false,
+                    "vlan": {
+                        "name": "ssloN_proxy1a_out",
+                        "path": "/Common/ssloN_proxy1a_out.app/ssloN_proxy1a_out",
+                        "create": true,
+                        "modify": false,
+                        "networkError": false,
+                        "interface": [
+                            "1.1"
+                        ],
+                        "networkInterface": "1.1",
+                        "tag": 50,
+                        "networkTag": 50
+                    },
+                    "selfIpConfig": {
+                        "create": true,
+                        "modify": false,
+                        "selfIp": "198.19.96.245",
+                        "netmask": "255.255.255.128",
+                        "floating": false,
+                        "HAstaticIpMap": []
+                    },
+                    "routeDomain": {
+                        "id": 0,
+                        "create": false
+                    },
+                    "existingBlockId": ""
+                }
+            ]
         },
         {
             "id": "f5-ssl-orchestrator-service",
@@ -109,6 +142,8 @@
                     "ipFamily": "ipv4",
                     "isAutoManage": true,
                     "portRemap": true,
+                    "serviceEntrySSLProfile": "",
+                    "serviceReturnSSLProfile": "",
                     "httpPortRemapValue": 8080,
                     "serviceDownAction": "reset",
                     "iRuleList": [],

ansible_collections/f5networks/f5_bigip/tests/modules/network/f5/fixtures/sslo_http_modify_generated.json

@@ -110,6 +110,8 @@
                     "ipFamily": "ipv4",
                     "isAutoManage": true,
                     "portRemap": true,
+                    "serviceEntrySSLProfile": "",
+                    "serviceReturnSSLProfile": "",    
                     "httpPortRemapValue": 80,
                     "serviceDownAction": "reset",
                     "iRuleList": null,

ansible_collections/f5networks/f5_bigip/tests/sanity/ignore-2.17.txt

@@ -0,0 +1,2 @@
+plugins/action/bigip.py action-plugin-docs # undocumented action plugin to fix, existed before sanity test was added
+plugins/action/bigiq.py action-plugin-docs # undocumented action plugin to fix, existed before sanity test was added

ansible_collections/f5networks/f5_bigip/tests/utils/common.py

@@ -20,7 +20,7 @@ def connection_response(response, status=200, headers=None):
     if headers is None:
         headers = BASE_HEADERS
     response_mock.getheaders.return_value = headers.items()
-    response_text = json.dumps(response) if type(response) is dict else response
+    response_text = json.dumps(response) if isinstance(response, dict) else response
     response_data = BytesIO(response_text.encode() if response_text else ''.encode())
     return response_mock, response_data