Skip to content

Commit a23fb41

Browse files
committed
move _check_load_parameters into Resource
1 parent 8abb28b commit a23fb41

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
@@ -213,18 +213,6 @@ def _set_meta_data_uri(self):
213213
self._meta_data['container']._meta_data['uri'] + endpoint + '/'
214214
self._meta_data['uri'] = final_uri
215215

216-
def _check_create_parameters(self, **kwargs):
217-
"""Params given to create should satisfy required params.
218-
219-
:params: kwargs
220-
:raises: MissingRequiredCreateParameter
221-
"""
222-
rset = self._meta_data['required_creation_parameters']
223-
check = self._missing_required_parameters(rset, **kwargs)
224-
if check:
225-
error_message = 'Missing required params: %s' % check
226-
raise MissingRequiredCreationParameter(error_message)
227-
228216
def _check_command_parameters(self, **kwargs):
229217
"""Params given to exec_cmd should satisfy required params.
230218
@@ -819,6 +807,18 @@ def _activate_URI(self, selfLinkuri):
819807
'creation_uri_frag': frag,
820808
'allowed_lazy_attributes': attrs})
821809

810+
def _check_create_parameters(self, **kwargs):
811+
"""Params given to create should satisfy required params.
812+
813+
:params: kwargs
814+
:raises: MissingRequiredCreateParameter
815+
"""
816+
rset = self._meta_data['required_creation_parameters']
817+
check = self._missing_required_parameters(rset, **kwargs)
818+
if check:
819+
error_message = 'Missing required params: %s' % check
820+
raise MissingRequiredCreationParameter(error_message)
821+
822822
def _create(self, **kwargs):
823823
"""wrapped by `create` override that in subclasses to customize"""
824824
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
@@ -691,7 +691,7 @@ def test_check_load_parameters_fail(self):
691691
assert "['FAKELOAD']" in RLPEIO.value.message
692692

693693
def test_check_create_parameters_fail(self):
694-
p = PathElement(mock.MagicMock())
694+
p = Resource(mock.MagicMock())
695695
p._meta_data['required_creation_parameters'] = set(['FAKECREATE'])
696696
with pytest.raises(MissingRequiredCreationParameter) as RCPEIO:
697697
p._check_create_parameters(FOOCREATE='FOOVAL')

0 commit comments

Comments
 (0)