Skip to content

Commit 8abb28b

Browse files
author
pjbreaux
authored
Merge pull request #619 from zancas/feature.test_client_ssl_modification_564
Add modify tests to all profiles.
2 parents d4bf6ed + 8edbfd7 commit 8abb28b

3 files changed

Lines changed: 159 additions & 127 deletions

File tree

f5/bigip/resource.py

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17+
1718
"""This module provides classes that specify how RESTful resources are handled.
1819
1920
THE MOST IMPORTANT THING TO KNOW ABOUT THIS API IS THAT YOU CAN DIRECTLY INFER
@@ -212,18 +213,6 @@ def _set_meta_data_uri(self):
212213
self._meta_data['container']._meta_data['uri'] + endpoint + '/'
213214
self._meta_data['uri'] = final_uri
214215

215-
def _check_load_parameters(self, **kwargs):
216-
"""Params given to load should at least satisfy required params.
217-
218-
:params: kwargs
219-
:raises: MissingRequiredReadParameter
220-
"""
221-
rset = self._meta_data['required_load_parameters']
222-
check = self._missing_required_parameters(rset, **kwargs)
223-
if check:
224-
error_message = 'Missing required params: %s' % check
225-
raise MissingRequiredReadParameter(error_message)
226-
227216
def _check_create_parameters(self, **kwargs):
228217
"""Params given to create should satisfy required params.
229218
@@ -885,6 +874,18 @@ def create(self, **kwargs):
885874
"""
886875
return self._create(**kwargs)
887876

877+
def _check_load_parameters(self, **kwargs):
878+
"""Params given to load should at least satisfy required params.
879+
880+
:params: kwargs
881+
:raises: MissingRequiredReadParameter
882+
"""
883+
rset = self._meta_data['required_load_parameters']
884+
check = self._missing_required_parameters(rset, **kwargs)
885+
if check:
886+
error_message = 'Missing required params: %s' % check
887+
raise MissingRequiredReadParameter(error_message)
888+
888889
def _load(self, **kwargs):
889890
"""wrapped with load, override that in a subclass to customize"""
890891
if 'uri' in self._meta_data:

f5/bigip/test/test_resource.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ def test_missing_req_param_false(self):
684684
assert not mrq
685685

686686
def test_check_load_parameters_fail(self):
687-
p = PathElement(mock.MagicMock())
687+
p = Resource(mock.MagicMock())
688688
p._meta_data['required_load_parameters'] = set(['FAKELOAD'])
689689
with pytest.raises(MissingRequiredReadParameter) as RLPEIO:
690690
p._check_load_parameters(FOOLOAD='FOOVAL')

0 commit comments

Comments
 (0)