From 1edd030a4c0ee1bed16ee343f312847aefa02f09 Mon Sep 17 00:00:00 2001 From: wypior Date: Thu, 1 Aug 2024 23:30:54 +0000 Subject: [PATCH 1/4] Merging devel changes - 2024-08-01T23:30:43Z --- ansible_collections/f5networks/f5_bigip/galaxy.yml | 2 +- .../f5networks/f5_bigip/plugins/module_utils/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible_collections/f5networks/f5_bigip/galaxy.yml b/ansible_collections/f5networks/f5_bigip/galaxy.yml index 56da69f..b2685e4 100644 --- a/ansible_collections/f5networks/f5_bigip/galaxy.yml +++ b/ansible_collections/f5networks/f5_bigip/galaxy.yml @@ -30,4 +30,4 @@ tags: - networking - bigip - bigiq -version: 3.6.2 +version: 3.7.0-devel diff --git a/ansible_collections/f5networks/f5_bigip/plugins/module_utils/version.py b/ansible_collections/f5networks/f5_bigip/plugins/module_utils/version.py index 9e2c393..ac0aeee 100644 --- a/ansible_collections/f5networks/f5_bigip/plugins/module_utils/version.py +++ b/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.6.2" +CURRENT_COLL_VERSION = "3.7.0-devel" From d0b3de913b73809c52755180979212171e7ca3a1 Mon Sep 17 00:00:00 2001 From: rupadhyay Date: Fri, 6 Sep 2024 23:30:53 +0000 Subject: [PATCH 2/4] Merging devel changes - 2024-09-06T23:30:42Z --- .../f5networks/f5_bigip/plugins/httpapi/bigip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/f5networks/f5_bigip/plugins/httpapi/bigip.py b/ansible_collections/f5networks/f5_bigip/plugins/httpapi/bigip.py index 5da9036..1a8174a 100644 --- a/ansible_collections/f5networks/f5_bigip/plugins/httpapi/bigip.py +++ b/ansible_collections/f5networks/f5_bigip/plugins/httpapi/bigip.py @@ -142,7 +142,7 @@ def send_request(self, **kwargs): body = kwargs.pop('payload', None) method = kwargs.pop('method', None) # allow for empty json to be passed as payload, useful for some endpoints - data = json.dumps(body) if body or body == {} else None + data = json.dumps(body, ensure_ascii=False) if body or body == {} else None try: self._display_request(method, url, body) response, response_data = self.connection.send(url, data, method=method, **kwargs) From 71c27793c288e9ca55e71c81c577c4096eea696e Mon Sep 17 00:00:00 2001 From: rupadhyay Date: Mon, 9 Sep 2024 23:30:57 +0000 Subject: [PATCH 3/4] Merging devel changes - 2024-09-09T23:30:45Z --- .../f5_bigip/plugins/modules/bigip_sslo_service_http.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible_collections/f5networks/f5_bigip/plugins/modules/bigip_sslo_service_http.py b/ansible_collections/f5networks/f5_bigip/plugins/modules/bigip_sslo_service_http.py index f3ecfa4..d219809 100644 --- a/ansible_collections/f5networks/f5_bigip/plugins/modules/bigip_sslo_service_http.py +++ b/ansible_collections/f5networks/f5_bigip/plugins/modules/bigip_sslo_service_http.py @@ -503,6 +503,9 @@ def devices_to(self): result['self_ip'] = self._values['customService']['managedNetwork'][ipfamily]['toServiceSelfIp'] result['netmask'] = self._values['customService']['managedNetwork'][ipfamily]['toServiceMask'] result['network'] = self._values['customService']['managedNetwork'][ipfamily]['toServiceNetwork'] + if not self._values['customService']['isAutoManage']: + result['self_ip'] = self._values['customService']['connectionInformation']['fromBigipNetwork']['selfIpConfig']['selfIp'].split('/')[0] + result['netmask'] = self._values['customService']['connectionInformation']['fromBigipNetwork']['selfIpConfig']['netmask'] if self._values['fromVlanNetworkObj']['create'] and 'networkInterface' in self._values['fromVlanNetworkObj']: if isinstance(self._values['fromVlanNetworkObj']['networkInterface'], list): result['interface'] = self._values['fromVlanNetworkObj']['networkInterface'][0] @@ -530,6 +533,9 @@ def devices_from(self): result['self_ip'] = self._values['customService']['managedNetwork'][ipfamily]['fromServiceSelfIp'] result['netmask'] = self._values['customService']['managedNetwork'][ipfamily]['fromServiceMask'] result['network'] = self._values['customService']['managedNetwork'][ipfamily]['fromServiceNetwork'] + if not self._values['customService']['isAutoManage']: + result['self_ip'] = self._values['customService']['connectionInformation']['toBigipNetwork']['selfIpConfig']['selfIp'].split('/')[0] + result['netmask'] = self._values['customService']['connectionInformation']['toBigipNetwork']['selfIpConfig']['netmask'] if self._values['toVlanNetworkObj']['create'] and 'networkInterface' in self._values['toVlanNetworkObj']: if isinstance(self._values['toVlanNetworkObj']['networkInterface'], list): result['interface'] = self._values['toVlanNetworkObj']['networkInterface'][0] From 3786c6eb46d2bcc01c8940943d416df8d7a309de Mon Sep 17 00:00:00 2001 From: rupadhyay Date: Tue, 10 Sep 2024 10:03:55 +0000 Subject: [PATCH 4/4] Version 3.7.0 release --- ansible_collections/f5networks/f5_bigip/CHANGELOG.rst | 3 +++ .../f5networks/f5_bigip/changelogs/changelog.yaml | 2 ++ ansible_collections/f5networks/f5_bigip/galaxy.yml | 2 +- .../f5networks/f5_bigip/plugins/module_utils/version.py | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ansible_collections/f5networks/f5_bigip/CHANGELOG.rst b/ansible_collections/f5networks/f5_bigip/CHANGELOG.rst index 602228b..5925893 100644 --- a/ansible_collections/f5networks/f5_bigip/CHANGELOG.rst +++ b/ansible_collections/f5networks/f5_bigip/CHANGELOG.rst @@ -4,6 +4,9 @@ F5Networks F5\_BIGIP Collection Release Notes .. contents:: Topics +v3.7.0 +====== + v3.6.2 ====== diff --git a/ansible_collections/f5networks/f5_bigip/changelogs/changelog.yaml b/ansible_collections/f5networks/f5_bigip/changelogs/changelog.yaml index b75778e..6b20685 100644 --- a/ansible_collections/f5networks/f5_bigip/changelogs/changelog.yaml +++ b/ansible_collections/f5networks/f5_bigip/changelogs/changelog.yaml @@ -619,3 +619,5 @@ releases: release_date: '2024-08-01' 3.6.2: release_date: '2024-08-01' + 3.7.0: + release_date: '2024-09-10' diff --git a/ansible_collections/f5networks/f5_bigip/galaxy.yml b/ansible_collections/f5networks/f5_bigip/galaxy.yml index b2685e4..49264b1 100644 --- a/ansible_collections/f5networks/f5_bigip/galaxy.yml +++ b/ansible_collections/f5networks/f5_bigip/galaxy.yml @@ -30,4 +30,4 @@ tags: - networking - bigip - bigiq -version: 3.7.0-devel +version: 3.7.0 diff --git a/ansible_collections/f5networks/f5_bigip/plugins/module_utils/version.py b/ansible_collections/f5networks/f5_bigip/plugins/module_utils/version.py index ac0aeee..b2737c5 100644 --- a/ansible_collections/f5networks/f5_bigip/plugins/module_utils/version.py +++ b/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-devel" +CURRENT_COLL_VERSION = "3.7.0"