Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
urohit011 committed Sep 10, 2024
2 parents a234708 + 3786c6e commit dca5f68
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ansible_collections/f5networks/f5_bigip/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ F5Networks F5\_BIGIP Collection Release Notes

.. contents:: Topics

v3.7.0
======

v3.6.2
======

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion ansible_collections/f5networks/f5_bigip/galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ tags:
- networking
- bigip
- bigiq
version: 3.6.2
version: 3.7.0
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down

0 comments on commit dca5f68

Please sign in to comment.