[FIX] Updated unit test case by replacing called_once_with to assert_…

…called_once_with for python3.12

.github/workflows/ansible-test.yml

@@ -13,15 +13,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ansible-version: [stable-2.14]
+        ansible-version: [stable-2.15]
     steps:
       - name: Check out code
         uses: actions/checkout@v2
 
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v1
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Install ansible (${{ matrix.ansible-version }})
         run: pip install pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz --disable-pip-version-check
@@ -66,7 +66,7 @@ jobs:
 
     steps:
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -93,8 +93,8 @@ jobs:
 
       - name: Generate coverage report
         run: |
-          if [ "${{ matrix.ansible-version }}" == "stable-2.16" ]; then 
-            pip install coverage==7.3.2;
+          if [ "${{ matrix.ansible-version }}" == "devel" ]; then 
+            pip install coverage==7.5.3;
           elif [ "${{ matrix.ansible-version }}" == "stable-2.15" ]; then
             pip install coverage==6.5.0;
           fi
@@ -131,7 +131,7 @@ jobs:
             python-version: '3.12'
     steps:
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -189,12 +189,12 @@ jobs:
         ansible-version: [stable-2.15, stable-2.16, stable-2.17, devel]
 
     steps:
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v1
+      - name: Set up Python 3.11
+        uses: actions/setup-python@v2
         with:
           # it is just required to run that once as "ansible-test sanity" in the docker image
           # will run on all python versions it supports.
-          python-version: '3.10'
+          python-version: 3.11
 
       - name: Install ansible (${{ matrix.ansible-version }}) version
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-version }}.tar.gz --disable-pip-version-check

plugins/lookup/nios_next_ip.py

@@ -53,8 +53,8 @@
 
 - name: return the next 3 available IP addresses for network 192.168.10.0/24
   ansible.builtin.set_fact:
-    ipaddr: "{{ lookup('infoblox.nios_modules.nios_next_ip', '192.168.10.0/24', num=3,
-                provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+    ipaddr: "{{ lookup('infoblox.nios_modules.nios_next_ip', '192.168.10.0/24', num=3, \
+                       provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
 
 - name: return the next 3 available IP addresses for network 192.168.10.0/24 excluding ip addresses - ['192.168.10.1', '192.168.10.2']
   ansible.builtin.set_fact:

tests/unit/plugins/module_utils/test_api.py

@@ -79,11 +79,11 @@ def test_wapi_no_change(self):
     def test_wapi_change(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'default',
                               'comment': 'updated comment', 'extattrs': None}
-
+        ref = "networkview/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "networkview/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "default",
                 "extattrs": {}
             }
@@ -99,16 +99,16 @@ def test_wapi_change(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
-        wapi.update_object.assert_called_once_with(test_object)
+        wapi.update_object.assert_called_once_with(ref, {'comment': 'updated comment', 'name': 'default'})
 
     def test_wapi_change_false(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'default',
                               'comment': 'updated comment', 'extattrs': None, 'fqdn': 'foo'}
-
+        ref = "networkview/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "networkview/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "default",
                 "extattrs": {}
             }
@@ -125,7 +125,9 @@ def test_wapi_change_false(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
-        wapi.update_object.assert_called_once_with(test_object)
+        wapi.update_object.assert_called_once_with(
+            ref, {'comment': 'updated comment', 'name': 'default'}
+        )
 
     def test_wapi_extattrs_change(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'default',
@@ -161,9 +163,10 @@ def test_wapi_extattrs_nochange(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'default',
                               'comment': 'test comment', 'extattrs': {'Site': 'test'}}
 
+        ref = "networkview/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [{
             "comment": "test comment",
-            "_ref": "networkview/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+            "_ref": ref,
             "name": "default",
             "extattrs": {'Site': {'value': 'test'}}
         }]
@@ -178,6 +181,7 @@ def test_wapi_extattrs_nochange(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertFalse(res['changed'])
+        wapi.update_object.assert_not_called()
 
     def test_wapi_create(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'ansible',

tests/unit/plugins/modules/test_nios_a_record.py

@@ -53,7 +53,7 @@ def _get_wapi(self, test_object):
         wapi = api.WapiModule(self.module)
         wapi.get_object = Mock(name='get_object', return_value=test_object)
         wapi.create_object = Mock(name='create_object')
-        wapi.update_object = Mock(name='update_object')
+        wapi.update_object = Mock(name='update_object', )
         wapi.delete_object = Mock(name='delete_object')
         return wapi
 
@@ -86,10 +86,11 @@ def test_nios_a_record_update_comment(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'a.ansible.com', 'ipv4': '192.168.10.1',
                               'comment': 'updated comment', 'extattrs': None}
 
+        ref = "arecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "arecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "a.ansible.com",
                 "ipv4": "192.168.10.1",
                 "extattrs": {}
@@ -105,8 +106,10 @@ def test_nios_a_record_update_comment(self):
 
         wapi = self._get_wapi(test_object)
         res = wapi.run('testobject', test_spec)
-
         self.assertTrue(res['changed'])
+        wapi.update_object.assert_called_once_with(
+            ref, {'comment': 'updated comment', 'ipv4': '192.168.10.1', 'name': 'a.ansible.com'}
+        )
 
     def test_nios_a_record_remove(self):
         self.module.params = {'provider': None, 'state': 'absent', 'name': 'a.ansible.com', 'ipv4': '192.168.10.1',
@@ -139,12 +142,12 @@ def test_nios_a_record_update_record_name(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': {'new_name': 'a_new.ansible.com', 'old_name': 'a.ansible.com'},
                               'comment': 'comment', 'extattrs': None}
 
+        ref = "arecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "arecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
-                "name": "a_new.ansible.com",
-                "old_name": "a.ansible.com",
+                "_ref": ref,
+                "name": "a.ansible.com",
                 "extattrs": {}
             }
         ]
@@ -159,4 +162,4 @@ def test_nios_a_record_update_record_name(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
-        wapi.update_object.assert_called_once_with(test_object)
+        wapi.update_object.assert_called_once_with(ref, {'name': 'a_new.ansible.com', 'comment': 'comment'})

tests/unit/plugins/modules/test_nios_aaaa_record.py

@@ -86,10 +86,11 @@ def test_nios_aaaa_record_update_comment(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'aaaa.ansible.com',
                               'ipv6': '2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'comment': 'updated comment', 'extattrs': None}
 
+        ref = "aaaarecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "aaaarecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "aaaa.ansible.com",
                 "ipv6": "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
                 "extattrs": {}
@@ -107,6 +108,10 @@ def test_nios_aaaa_record_update_comment(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
+        wapi.update_object.assert_called_once_with(
+            ref,
+            {'comment': 'updated comment', 'ipv6': '2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'name': 'aaaa.ansible.com'}
+        )
 
     def test_nios_aaaa_record_remove(self):
         self.module.params = {'provider': None, 'state': 'absent', 'name': 'aaaa.ansible.com',
@@ -138,13 +143,12 @@ def test_nios_aaaa_record_remove(self):
     def test_nios_aaaa_record_update_record_name(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': {'new_name': 'aaaa_new.ansible.com', 'old_name': 'aaaa.ansible.com'},
                               'comment': 'comment', 'extattrs': None}
-
+        ref = "aaaarecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "aaaarecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
-                "name": "aaaa_new.ansible.com",
-                "old_name": "aaaa.ansible.com",
+                "_ref": ref,
+                "name": "aaaa.ansible.com",
                 "extattrs": {}
             }
         ]
@@ -159,4 +163,7 @@ def test_nios_aaaa_record_update_record_name(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
-        wapi.update_object.assert_called_once_with(test_object)
+        wapi.update_object.assert_called_once_with(
+            ref,
+            {'comment': 'comment', 'name': 'aaaa_new.ansible.com'}
+        )

tests/unit/plugins/modules/test_nios_cname_record.py

@@ -85,11 +85,11 @@ def test_nios_cname_record_create(self):
     def test_nios_cname_record_update_comment(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'cname.ansible.com',
                               'canonical': 'realhost.ansible.com', 'comment': 'updated comment', 'extattrs': None}
-
+        ref = "cnamerecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "cnamerecord/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "cname.ansible.com",
                 "canonical": "realhost.ansible.com",
                 "extattrs": {}
@@ -107,6 +107,10 @@ def test_nios_cname_record_update_comment(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
+        wapi.update_object.assert_called_once_with(
+            ref,
+            {'comment': 'updated comment', 'name': 'cname.ansible.com', 'canonical': 'realhost.ansible.com'}
+        )
 
     def test_nios_cname_record_remove(self):
         self.module.params = {'provider': None, 'state': 'absent', 'name': 'cname.ansible.com',

tests/unit/plugins/modules/test_nios_dns_view.py

@@ -58,6 +58,9 @@ def _get_wapi(self, test_object):
         return wapi
 
     def load_fixtures(self, commands=None):
+        """
+        Load fixtures for the module
+        """
         self.exec_command.return_value = (0, load_fixture('nios_result.txt').strip(), None)
         self.load_config.return_value = dict(diff=None, session='session')
 
@@ -84,10 +87,11 @@ def test_nios_dns_view_update_comment(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'ansible-dns',
                               'comment': 'updated comment', 'extattrs': None}
 
+        ref = "dnsview/ZG5zLm5ldHdvcmtfdmlldyQw:ansible/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "dnsview/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "ansible-dns",
                 "extattrs": {}
             }
@@ -103,6 +107,7 @@ def test_nios_dns_view_update_comment(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
+        wapi.update_object.assert_called_once_with(ref, {'comment': 'updated comment', 'name': 'ansible-dns'})
 
     def test_nios_dns_view_remove(self):
         self.module.params = {'provider': None, 'state': 'absent', 'name': 'ansible-dns',

tests/unit/plugins/modules/test_nios_dtc_monitor_http.py

@@ -84,10 +84,11 @@ def test_nios_dtc_monitor_http_update_comment(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'https_monitor',
                               'comment': 'updated comment', 'extattrs': None}
 
+        ref = "dtc:monitor:http/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "dtc:monitor:http/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "https_monitor",
                 "port": 443,
                 "secure": True,
@@ -105,6 +106,7 @@ def test_nios_dtc_monitor_http_update_comment(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
+        wapi.update_object.assert_called_once_with(ref, {'comment': 'updated comment', 'name': 'https_monitor'})
 
     def test_nios_dtc_monitor_http_remove(self):
         self.module.params = {'provider': None, 'state': 'absent', 'name': 'https_monitor',

tests/unit/plugins/modules/test_nios_dtc_monitor_icmp.py

@@ -81,10 +81,11 @@ def test_nios_dtc_monitor_icmp_update_comment(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'icmp_monitor',
                               'comment': 'updated comment', 'extattrs': None}
 
+        ref = "dtc:monitor:icmp/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "dtc:monitor:icmp/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "icmp_monitor",
                 "extattrs": {}
             }
@@ -100,6 +101,7 @@ def test_nios_dtc_monitor_icmp_update_comment(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
+        wapi.update_object.assert_called_once_with(ref, {'comment': 'updated comment', 'name': 'icmp_monitor'})
 
     def test_nios_dtc_monitor_icmp_remove(self):
         self.module.params = {'provider': None, 'state': 'absent', 'name': 'icmp_monitor',

tests/unit/plugins/modules/test_nios_dtc_monitor_pdp.py

@@ -81,10 +81,11 @@ def test_nios_dtc_monitor_pdp_update_comment(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'pdp_monitor',
                               'comment': 'updated comment', 'extattrs': None}
 
+        ref = "dtc:monitor:pdp/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "dtc:monitor:pdp/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "pdp_monitor",
                 "port": 2123,
                 "extattrs": {}
@@ -101,6 +102,7 @@ def test_nios_dtc_monitor_pdp_update_comment(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
+        wapi.update_object.assert_called_once_with(ref, {'comment': 'updated comment', 'name': 'pdp_monitor'})
 
     def test_nios_dtc_monitor_pdp_remove(self):
         self.module.params = {'provider': None, 'state': 'absent', 'name': 'pdp_monitor',

tests/unit/plugins/modules/test_nios_dtc_monitor_sip.py

@@ -80,11 +80,11 @@ def test_nios_dtc_monitor_sip_create(self):
     def test_nios_dtc_monitor_sip_update_comment(self):
         self.module.params = {'provider': None, 'state': 'present', 'name': 'sip_monitor',
                               'comment': 'updated comment', 'extattrs': None}
-
+        ref = "dtc:monitor:sip/ZG5zLm5ldHdvcmtfdmlldyQw:default/true"
         test_object = [
             {
                 "comment": "test comment",
-                "_ref": "dtc:monitor:sip/ZG5zLm5ldHdvcmtfdmlldyQw:default/true",
+                "_ref": ref,
                 "name": "sip_monitor",
                 "extattrs": {}
             }
@@ -100,6 +100,7 @@ def test_nios_dtc_monitor_sip_update_comment(self):
         res = wapi.run('testobject', test_spec)
 
         self.assertTrue(res['changed'])
+        wapi.update_object.assert_called_once_with(ref, {'comment': 'updated comment', 'name': 'sip_monitor'})
 
     def test_nios_dtc_monitor_sip_remove(self):
         self.module.params = {'provider': None, 'state': 'absent', 'name': 'sip_monitor',