kwargs --> patch && itest --> test

Author: zancas

f5/bigip/resource.py

@@ -438,31 +438,31 @@ def __init__(self, container):
         """
         super(ResourceBase, self).__init__(container)
 
-    def _modify(self, **kwargs):
+    def _modify(self, **patch):
         """Wrapped with modify, override in a subclass to customize."""
 
         requests_params, patch_uri, session, read_only = \
-            self._prepare_put_or_patch(kwargs)
-        self._check_for_boolean_pair_reduction(kwargs)
+            self._prepare_put_or_patch(patch)
+        self._check_for_boolean_pair_reduction(patch)
 
         read_only_mutations = []
         for attr in read_only:
-            if attr in kwargs:
+            if attr in patch:
                 read_only_mutations.append(attr)
         if read_only_mutations:
             msg = 'Attempted to mutate read-only attribute(s): %s' \
                 % read_only_mutations
             raise AttemptedMutationOfReadOnly(msg)
 
-        response = session.patch(patch_uri, json=kwargs, **requests_params)
+        response = session.patch(patch_uri, json=patch, **requests_params)
         self._local_update(response.json())
 
-    def modify(self, **kwargs):
-        """Modify the configuration of the resource on device based on kwargs
+    def modify(self, **patch):
+        """Modify the configuration of the resource on device based on patch
 
         """
 
-        self._modify(**kwargs)
+        self._modify(**patch)
 
     def _check_for_boolean_pair_reduction(self, kwargs):
         """Check if boolean pairs should be reduced in this resource."""

f5/bigip/test/test_resource.py

@@ -59,7 +59,8 @@ def fake_rsrc():
     r._meta_data['uri'] = 'URI'
     r._meta_data['read_only_attributes'] = [u"READONLY"]
     attrs = {'put.return_value': MockResponse({u"generation": 0}),
-             'get.return_value': MockResponse({u"generation": 0})}
+             'get.return_value': MockResponse({u"generation": 0}),
+             'patch.return_value': MockResponse({u"generation": 0})}
     mock_session = mock.MagicMock(**attrs)
     r._meta_data['bigip']._meta_data = {'icr_session': mock_session}
     return r
@@ -364,28 +365,28 @@ def test_read_only_validate(self):
             r.modify(READONLY=True)
         assert "READONLY" in AMOROEIO.value.message
 
-    def itest_reduce_boolean_removes_enabled(self, fake_rsrc):
+    def test_reduce_boolean_removes_enabled(self, fake_rsrc):
         fake_rsrc.modify(enabled=False)
         pos, kwargs = fake_rsrc._meta_data['bigip'].\
             _meta_data['icr_session'].patch.call_args
         assert kwargs['json']['disabled'] is True
         assert 'enabled' not in kwargs['json']
 
-    def itest_reduce_boolean_removes_disabled(self, fake_rsrc):
+    def test_reduce_boolean_removes_disabled(self, fake_rsrc):
         fake_rsrc.modify(disabled=False)
         pos, kwargs = fake_rsrc._meta_data['bigip'].\
             _meta_data['icr_session'].patch.call_args
         assert kwargs['json']['enabled'] is True
         assert 'disabled' not in kwargs['json']
 
-    def itest_reduce_boolean_removes_nothing(self, fake_rsrc):
+    def test_reduce_boolean_removes_nothing(self, fake_rsrc):
         fake_rsrc.modify(partition='Common', name='test_create', enabled=True)
         pos, kwargs = fake_rsrc._meta_data['bigip'].\
             _meta_data['icr_session'].patch.call_args
         assert kwargs['json']['enabled'] is True
         assert 'disabled' not in kwargs['json']
 
-    def itest_reduce_boolean_same_value(self, fake_rsrc):
+    def test_reduce_boolean_same_value(self, fake_rsrc):
         with pytest.raises(BooleansToReduceHaveSameValue) as ex:
             fake_rsrc.modify(
                 partition='Common',