Support validating nested list of dictionary as input, make base clas… #7
Conversation
…s as Abstract class with validate function, make the required changes in template_intent module based on DnacBase class and remove redundant code, with supported states as well
| @@ -43,10 +44,17 @@ def __init__(self, module): | |||
| self.get_diff_state_apply = {'merged': self.get_diff_merged, | |||
There was a problem hiding this comment.
Can we also write for other states?
"merged" : self.get_diff_merged
"replaced" : self.get_diff_replaced
and all..
Also write member functions for all the states..
| self.result = {"changed": False, "diff": [], "response": [], "warnings": []} | ||
|
|
||
| @abstractmethod |
There was a problem hiding this comment.
Do we need to write function body for abstractmethod? What is the use of it? Anyhow we are going to override it in base class..
plugins/module_utils/dnac.py
Outdated
| @@ -57,7 +65,7 @@ def log(self, message, frameIncrement=0): | |||
| def check_return_status(self): | |||
| """API to check the return status value and exit/fail the module""" | |||
|
|
|||
| self.log("status: {0}, msg:{1}".format(self.status, self.msg), frameIncrement=1) | |||
| log("status: {0}, msg:{1}".format(self.status, self.msg), frameIncrement=1) | |||
There was a problem hiding this comment.
Any reason for changing this into self.log? Because if dnac.log is true, then only we call log API to print.
plugins/module_utils/dnac.py
Outdated
| @@ -88,7 +96,7 @@ def get_task_details(self, task_id): | |||
| params={"task_id": task_id}, | |||
| ) | |||
|
|
|||
| self.log(str(response)) | |||
| log(str(response)) | |||
There was a problem hiding this comment.
Any reason for changing this into self.log? Because if dnac.log is true, then only we call log API to print.
| @@ -202,6 +210,83 @@ def dnac_argument_spec(): | |||
| ) | |||
| return argument_spec | |||
|
|
|||
| def validate_str(item, param_spec, param_name, invalid_params): | |||
| item = validation.check_type_str(item) | |||
There was a problem hiding this comment.
Can we write Doc string for this new API ?
| return validation.check_type_bool(item) | ||
|
|
||
| def validate_list(item, param_spec, param_name, invalid_params): | ||
| try: |
plugins/module_utils/dnac.py
Outdated
| def validate_list(item, param_spec, param_name, invalid_params): | ||
| try: | ||
| if param_spec.get("type") == type(item).__name__: | ||
| if param_spec: |
There was a problem hiding this comment.
No need of this check.. If param_spec is already there and get the type before we check it..
As we have lot more statements in this if block, we can check with not equal and return in the beginning itself.
plugins/module_utils/dnac.py
Outdated
| keys_list.append(dict_key) | ||
| if len(keys_list) == 1: | ||
| return validation.check_type_list(item) | ||
| else: |
There was a problem hiding this comment.
as we are returning from if block unconditional, do we need else here?
plugins/module_utils/dnac.py
Outdated
| if type(element).__name__ != get_spec_element: | ||
| invalid_params.append( | ||
| "{0} is not of the same datatype as expected which is {1}".format( | ||
| element, get_spec_element |
There was a problem hiding this comment.
can we close the braces in the same line itself becuase adding multiple new lines only for braces looks little messier ?
| return item | ||
|
|
||
| def validate_dict(item, param_spec, param_name, invalid_params): | ||
| if param_spec.get("type") != type(item).__name__: |
There was a problem hiding this comment.
Doc String for this new API
…s, defining docstring etc.
bug fix for when dnac_log_level not specified in the playbook
Support validating nested list of dictionary as input, make base class as Abstract class with validate function, make the required changes in template_intent module based on DnacBase class and remove redundant code, with supported states as well.