Skip to content

Commit 1cea2a2

Browse files
committed
move _check_load_parameters
1 parent 8d6efeb commit 1cea2a2

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

f5/bigip/resource.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -212,18 +212,6 @@ def _set_meta_data_uri(self):
212212
self._meta_data['container']._meta_data['uri'] + endpoint + '/'
213213
self._meta_data['uri'] = final_uri
214214

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-
227215
def _check_create_parameters(self, **kwargs):
228216
"""Params given to create should satisfy required params.
229217
@@ -885,6 +873,18 @@ def create(self, **kwargs):
885873
"""
886874
return self._create(**kwargs)
887875

876+
def _check_load_parameters(self, **kwargs):
877+
"""Params given to load should at least satisfy required params.
878+
879+
:params: kwargs
880+
:raises: MissingRequiredReadParameter
881+
"""
882+
rset = self._meta_data['required_load_parameters']
883+
check = self._missing_required_parameters(rset, **kwargs)
884+
if check:
885+
error_message = 'Missing required params: %s' % check
886+
raise MissingRequiredReadParameter(error_message)
887+
888888
def _load(self, **kwargs):
889889
"""wrapped with load, override that in a subclass to customize"""
890890
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)