diff options
50 files changed, 265 insertions, 205 deletions
diff --git a/changelogs/fragments/80-reformat-files.yaml b/changelogs/fragments/80-reformat-files.yaml new file mode 100644 index 0000000..21719cc --- /dev/null +++ b/changelogs/fragments/80-reformat-files.yaml @@ -0,0 +1,3 @@ +--- +minor_changes: + - Reformatted files with latest version of Black (20.8b1). diff --git a/plugins/module_utils/network/vyos/argspec/facts/facts.py b/plugins/module_utils/network/vyos/argspec/facts/facts.py index e52b6eb..d78dd3a 100644 --- a/plugins/module_utils/network/vyos/argspec/facts/facts.py +++ b/plugins/module_utils/network/vyos/argspec/facts/facts.py @@ -10,8 +10,7 @@ __metaclass__ = type class FactsArgs(object): # pylint: disable=R0903 - """ The arg spec for the vyos facts module - """ + """The arg spec for the vyos facts module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/firewall_global/firewall_global.py b/plugins/module_utils/network/vyos/argspec/firewall_global/firewall_global.py index 4c26773..92a0255 100644 --- a/plugins/module_utils/network/vyos/argspec/firewall_global/firewall_global.py +++ b/plugins/module_utils/network/vyos/argspec/firewall_global/firewall_global.py @@ -31,8 +31,7 @@ __metaclass__ = type class Firewall_globalArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_firewall_global module - """ + """The arg spec for the vyos_firewall_global module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/firewall_interfaces/firewall_interfaces.py b/plugins/module_utils/network/vyos/argspec/firewall_interfaces/firewall_interfaces.py index f083485..16e6615 100644 --- a/plugins/module_utils/network/vyos/argspec/firewall_interfaces/firewall_interfaces.py +++ b/plugins/module_utils/network/vyos/argspec/firewall_interfaces/firewall_interfaces.py @@ -31,8 +31,7 @@ __metaclass__ = type class Firewall_interfacesArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_firewall_interfaces module - """ + """The arg spec for the vyos_firewall_interfaces module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/firewall_rules/firewall_rules.py b/plugins/module_utils/network/vyos/argspec/firewall_rules/firewall_rules.py index a018cc0..2df7758 100644 --- a/plugins/module_utils/network/vyos/argspec/firewall_rules/firewall_rules.py +++ b/plugins/module_utils/network/vyos/argspec/firewall_rules/firewall_rules.py @@ -31,8 +31,7 @@ __metaclass__ = type class Firewall_rulesArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_firewall_rules module - """ + """The arg spec for the vyos_firewall_rules module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/interfaces/interfaces.py b/plugins/module_utils/network/vyos/argspec/interfaces/interfaces.py index fd8b612..9ae4c65 100644 --- a/plugins/module_utils/network/vyos/argspec/interfaces/interfaces.py +++ b/plugins/module_utils/network/vyos/argspec/interfaces/interfaces.py @@ -29,8 +29,7 @@ __metaclass__ = type class InterfacesArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_interfaces module - """ + """The arg spec for the vyos_interfaces module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/l3_interfaces/l3_interfaces.py b/plugins/module_utils/network/vyos/argspec/l3_interfaces/l3_interfaces.py index 2f1dfe4..d6d9e29 100644 --- a/plugins/module_utils/network/vyos/argspec/l3_interfaces/l3_interfaces.py +++ b/plugins/module_utils/network/vyos/argspec/l3_interfaces/l3_interfaces.py @@ -31,8 +31,7 @@ __metaclass__ = type class L3_interfacesArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_l3_interfaces module - """ + """The arg spec for the vyos_l3_interfaces module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/lag_interfaces/lag_interfaces.py b/plugins/module_utils/network/vyos/argspec/lag_interfaces/lag_interfaces.py index cc124a9..14ac795 100644 --- a/plugins/module_utils/network/vyos/argspec/lag_interfaces/lag_interfaces.py +++ b/plugins/module_utils/network/vyos/argspec/lag_interfaces/lag_interfaces.py @@ -28,8 +28,7 @@ __metaclass__ = type class Lag_interfacesArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_lag_interfaces module - """ + """The arg spec for the vyos_lag_interfaces module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/lldp_global/lldp_global.py b/plugins/module_utils/network/vyos/argspec/lldp_global/lldp_global.py index fa41127..635322b 100644 --- a/plugins/module_utils/network/vyos/argspec/lldp_global/lldp_global.py +++ b/plugins/module_utils/network/vyos/argspec/lldp_global/lldp_global.py @@ -28,8 +28,7 @@ __metaclass__ = type class Lldp_globalArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_lldp_global module - """ + """The arg spec for the vyos_lldp_global module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py b/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py index 109ea43..b641aeb 100644 --- a/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py +++ b/plugins/module_utils/network/vyos/argspec/lldp_interfaces/lldp_interfaces.py @@ -31,8 +31,7 @@ __metaclass__ = type class Lldp_interfacesArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_lldp_interfaces module - """ + """The arg spec for the vyos_lldp_interfaces module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/ospfv2/ospfv2.py b/plugins/module_utils/network/vyos/argspec/ospfv2/ospfv2.py index b113035..b8e915c 100644 --- a/plugins/module_utils/network/vyos/argspec/ospfv2/ospfv2.py +++ b/plugins/module_utils/network/vyos/argspec/ospfv2/ospfv2.py @@ -31,8 +31,7 @@ The arg spec for the vyos_ospfv2 module class Ospfv2Args(object): # pylint: disable=R0903 - """The arg spec for the vyos_ospfv2 module - """ + """The arg spec for the vyos_ospfv2 module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/ospfv3/ospfv3.py b/plugins/module_utils/network/vyos/argspec/ospfv3/ospfv3.py index 25f979c..7fac36c 100644 --- a/plugins/module_utils/network/vyos/argspec/ospfv3/ospfv3.py +++ b/plugins/module_utils/network/vyos/argspec/ospfv3/ospfv3.py @@ -31,8 +31,7 @@ The arg spec for the vyos_ospfv3 module class Ospfv3Args(object): # pylint: disable=R0903 - """The arg spec for the vyos_ospfv3 module - """ + """The arg spec for the vyos_ospfv3 module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/argspec/static_routes/static_routes.py b/plugins/module_utils/network/vyos/argspec/static_routes/static_routes.py index 8ecd955..f8602e3 100644 --- a/plugins/module_utils/network/vyos/argspec/static_routes/static_routes.py +++ b/plugins/module_utils/network/vyos/argspec/static_routes/static_routes.py @@ -31,8 +31,7 @@ __metaclass__ = type class Static_routesArgs(object): # pylint: disable=R0903 - """The arg spec for the vyos_static_routes module - """ + """The arg spec for the vyos_static_routes module""" def __init__(self, **kwargs): pass diff --git a/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py b/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py index f035641..08b724a 100644 --- a/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py +++ b/plugins/module_utils/network/vyos/config/firewall_global/firewall_global.py @@ -49,7 +49,7 @@ class Firewall_global(ConfigBase): super(Firewall_global, self).__init__(module) def get_firewall_global_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -65,7 +65,7 @@ class Firewall_global(ConfigBase): return firewall_global_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -117,7 +117,7 @@ class Firewall_global(ConfigBase): return result def set_config(self, existing_firewall_global_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -130,7 +130,7 @@ class Firewall_global(ConfigBase): return to_list(resp) def set_state(self, w, h): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -155,11 +155,11 @@ class Firewall_global(ConfigBase): return commands def _state_replaced(self, w, h): - """ The command generator when state is replaced - :rtype: A list - :returns: the commands necessary to migrate the current configuration - to the desired configuration - """ + """The command generator when state is replaced + :rtype: A list + :returns: the commands necessary to migrate the current configuration + to the desired configuration + """ commands = [] if h: commands.extend(self._state_deleted(h, w)) @@ -167,7 +167,7 @@ class Firewall_global(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -178,7 +178,7 @@ class Firewall_global(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/firewall_interfaces/firewall_interfaces.py b/plugins/module_utils/network/vyos/config/firewall_interfaces/firewall_interfaces.py index bd2fbab..45842f1 100644 --- a/plugins/module_utils/network/vyos/config/firewall_interfaces/firewall_interfaces.py +++ b/plugins/module_utils/network/vyos/config/firewall_interfaces/firewall_interfaces.py @@ -46,7 +46,7 @@ class Firewall_interfaces(ConfigBase): super(Firewall_interfaces, self).__init__(module) def get_firewall_interfaces_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -62,7 +62,7 @@ class Firewall_interfaces(ConfigBase): return firewall_interfaces_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -120,7 +120,7 @@ class Firewall_interfaces(ConfigBase): return result def set_config(self, existing_firewall_interfaces_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -133,7 +133,7 @@ class Firewall_interfaces(ConfigBase): return to_list(resp) def set_state(self, w, h): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -163,7 +163,7 @@ class Firewall_interfaces(ConfigBase): return commands def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -178,7 +178,7 @@ class Firewall_interfaces(ConfigBase): return commands def _state_overridden(self, want, have): - """ The command generator when state is overridden + """The command generator when state is overridden :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -238,7 +238,7 @@ class Firewall_interfaces(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -251,7 +251,7 @@ class Firewall_interfaces(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/firewall_rules/firewall_rules.py b/plugins/module_utils/network/vyos/config/firewall_rules/firewall_rules.py index 5e38cee..ffc642f 100644 --- a/plugins/module_utils/network/vyos/config/firewall_rules/firewall_rules.py +++ b/plugins/module_utils/network/vyos/config/firewall_rules/firewall_rules.py @@ -49,7 +49,7 @@ class Firewall_rules(ConfigBase): super(Firewall_rules, self).__init__(module) def get_firewall_rules_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -65,7 +65,7 @@ class Firewall_rules(ConfigBase): return firewall_rules_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -117,7 +117,7 @@ class Firewall_rules(ConfigBase): return result def set_config(self, existing_firewall_rules_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -130,7 +130,7 @@ class Firewall_rules(ConfigBase): return to_list(resp) def set_state(self, w, h): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -160,11 +160,11 @@ class Firewall_rules(ConfigBase): return commands def _state_replaced(self, want, have): - """ The command generator when state is replaced - :rtype: A list - :returns: the commands necessary to migrate the current configuration - to the desired configuration - """ + """The command generator when state is replaced + :rtype: A list + :returns: the commands necessary to migrate the current configuration + to the desired configuration + """ commands = [] if have: for h in have: @@ -178,7 +178,7 @@ class Firewall_rules(ConfigBase): return commands def _state_overridden(self, want, have): - """ The command generator when state is overridden + """The command generator when state is overridden :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -204,7 +204,7 @@ class Firewall_rules(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -219,7 +219,7 @@ class Firewall_rules(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/interfaces/interfaces.py b/plugins/module_utils/network/vyos/config/interfaces/interfaces.py index 51bf98e..86008e8 100644 --- a/plugins/module_utils/network/vyos/config/interfaces/interfaces.py +++ b/plugins/module_utils/network/vyos/config/interfaces/interfaces.py @@ -49,7 +49,7 @@ class Interfaces(ConfigBase): super(Interfaces, self).__init__(module) def get_interfaces_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -63,7 +63,7 @@ class Interfaces(ConfigBase): return interfaces_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution """ @@ -112,7 +112,7 @@ class Interfaces(ConfigBase): return result def set_config(self, existing_interfaces_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -125,7 +125,7 @@ class Interfaces(ConfigBase): return to_list(resp) def set_state(self, want, have): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -175,7 +175,7 @@ class Interfaces(ConfigBase): return commands def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -190,7 +190,7 @@ class Interfaces(ConfigBase): return commands def _state_overridden(self, want, have): - """ The command generator when state is overridden + """The command generator when state is overridden :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -212,7 +212,7 @@ class Interfaces(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -261,7 +261,7 @@ class Interfaces(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/l3_interfaces/l3_interfaces.py b/plugins/module_utils/network/vyos/config/l3_interfaces/l3_interfaces.py index 122cc1e..6f143be 100644 --- a/plugins/module_utils/network/vyos/config/l3_interfaces/l3_interfaces.py +++ b/plugins/module_utils/network/vyos/config/l3_interfaces/l3_interfaces.py @@ -53,7 +53,7 @@ class L3_interfaces(ConfigBase): super(L3_interfaces, self).__init__(module) def get_l3_interfaces_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -69,7 +69,7 @@ class L3_interfaces(ConfigBase): return l3_interfaces_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -121,7 +121,7 @@ class L3_interfaces(ConfigBase): return result def set_config(self, existing_l3_interfaces_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -134,7 +134,7 @@ class L3_interfaces(ConfigBase): return to_list(resp) def set_state(self, want, have): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -185,7 +185,7 @@ class L3_interfaces(ConfigBase): return commands def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -200,7 +200,7 @@ class L3_interfaces(ConfigBase): return commands def _state_overridden(self, want, have): - """ The command generator when state is overridden + """The command generator when state is overridden :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -222,7 +222,7 @@ class L3_interfaces(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -265,7 +265,7 @@ class L3_interfaces(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/lag_interfaces/lag_interfaces.py b/plugins/module_utils/network/vyos/config/lag_interfaces/lag_interfaces.py index 452670f..7e7b39a 100644 --- a/plugins/module_utils/network/vyos/config/lag_interfaces/lag_interfaces.py +++ b/plugins/module_utils/network/vyos/config/lag_interfaces/lag_interfaces.py @@ -57,7 +57,7 @@ class Lag_interfaces(ConfigBase): super(Lag_interfaces, self).__init__(module) def get_lag_interfaces_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -73,7 +73,7 @@ class Lag_interfaces(ConfigBase): return lag_interfaces_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -125,7 +125,7 @@ class Lag_interfaces(ConfigBase): return result def set_config(self, existing_lag_interfaces_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -138,7 +138,7 @@ class Lag_interfaces(ConfigBase): return to_list(resp) def set_state(self, want, have): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -180,7 +180,7 @@ class Lag_interfaces(ConfigBase): return commands def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -193,7 +193,7 @@ class Lag_interfaces(ConfigBase): return commands def _state_overridden(self, want, have): - """ The command generator when state is overridden + """The command generator when state is overridden :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -213,7 +213,7 @@ class Lag_interfaces(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -227,7 +227,7 @@ class Lag_interfaces(ConfigBase): return commands def _state_deleted(self, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/lldp_global/lldp_global.py b/plugins/module_utils/network/vyos/config/lldp_global/lldp_global.py index c70d27f..d66e9c6 100644 --- a/plugins/module_utils/network/vyos/config/lldp_global/lldp_global.py +++ b/plugins/module_utils/network/vyos/config/lldp_global/lldp_global.py @@ -48,7 +48,7 @@ class Lldp_global(ConfigBase): super(Lldp_global, self).__init__(module) def get_lldp_global_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -64,7 +64,7 @@ class Lldp_global(ConfigBase): return lldp_global_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -114,7 +114,7 @@ class Lldp_global(ConfigBase): return result def set_config(self, existing_lldp_global_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -127,7 +127,7 @@ class Lldp_global(ConfigBase): return to_list(resp) def set_state(self, want, have): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -151,7 +151,7 @@ class Lldp_global(ConfigBase): return commands def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -164,7 +164,7 @@ class Lldp_global(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -175,7 +175,7 @@ class Lldp_global(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py b/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py index 94e39c3..f1f299f 100644 --- a/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py +++ b/plugins/module_utils/network/vyos/config/lldp_interfaces/lldp_interfaces.py @@ -54,7 +54,7 @@ class Lldp_interfaces(ConfigBase): super(Lldp_interfaces, self).__init__(module) def get_lldp_interfaces_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -70,7 +70,7 @@ class Lldp_interfaces(ConfigBase): return lldp_interfaces_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -122,7 +122,7 @@ class Lldp_interfaces(ConfigBase): return result def set_config(self, existing_lldp_interfaces_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -135,7 +135,7 @@ class Lldp_interfaces(ConfigBase): return to_list(resp) def set_state(self, want, have): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -183,7 +183,7 @@ class Lldp_interfaces(ConfigBase): return commands def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -196,7 +196,7 @@ class Lldp_interfaces(ConfigBase): return commands def _state_overridden(self, want, have): - """ The command generator when state is overridden + """The command generator when state is overridden :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -218,7 +218,7 @@ class Lldp_interfaces(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -232,7 +232,7 @@ class Lldp_interfaces(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/ospfv2/ospfv2.py b/plugins/module_utils/network/vyos/config/ospfv2/ospfv2.py index c0a4c78..059b92d 100644 --- a/plugins/module_utils/network/vyos/config/ospfv2/ospfv2.py +++ b/plugins/module_utils/network/vyos/config/ospfv2/ospfv2.py @@ -49,7 +49,7 @@ class Ospfv2(ConfigBase): super(Ospfv2, self).__init__(module) def get_ospfv2_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -62,7 +62,7 @@ class Ospfv2(ConfigBase): return ospfv2_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -113,7 +113,7 @@ class Ospfv2(ConfigBase): return result def set_config(self, existing_ospfv2_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -127,7 +127,7 @@ class Ospfv2(ConfigBase): return to_list(resp) def set_state(self, w, h): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -171,7 +171,7 @@ class Ospfv2(ConfigBase): return None def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -185,7 +185,7 @@ class Ospfv2(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -197,7 +197,7 @@ class Ospfv2(ConfigBase): return commands def _state_deleted(self, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/ospfv3/ospfv3.py b/plugins/module_utils/network/vyos/config/ospfv3/ospfv3.py index 09b9200..c43dfe7 100644 --- a/plugins/module_utils/network/vyos/config/ospfv3/ospfv3.py +++ b/plugins/module_utils/network/vyos/config/ospfv3/ospfv3.py @@ -53,7 +53,7 @@ class Ospfv3(ConfigBase): super(Ospfv3, self).__init__(module) def get_ospfv3_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -65,7 +65,7 @@ class Ospfv3(ConfigBase): return ospfv3_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -115,7 +115,7 @@ class Ospfv3(ConfigBase): return result def set_config(self, existing_ospfv3_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -128,7 +128,7 @@ class Ospfv3(ConfigBase): return to_list(resp) def set_state(self, w, h): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -155,7 +155,7 @@ class Ospfv3(ConfigBase): return commands def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -168,7 +168,7 @@ class Ospfv3(ConfigBase): return commands def _state_merged(self, want, have): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -179,7 +179,7 @@ class Ospfv3(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/config/static_routes/static_routes.py b/plugins/module_utils/network/vyos/config/static_routes/static_routes.py index b359dbb..f1d4f38 100644 --- a/plugins/module_utils/network/vyos/config/static_routes/static_routes.py +++ b/plugins/module_utils/network/vyos/config/static_routes/static_routes.py @@ -53,7 +53,7 @@ class Static_routes(ConfigBase): super(Static_routes, self).__init__(module) def get_static_routes_facts(self, data=None): - """ Get the 'facts' (the current configuration) + """Get the 'facts' (the current configuration) :rtype: A dictionary :returns: The current configuration as a dictionary @@ -69,7 +69,7 @@ class Static_routes(ConfigBase): return static_routes_facts def execute_module(self): - """ Execute the module + """Execute the module :rtype: A dictionary :returns: The result from module execution @@ -121,7 +121,7 @@ class Static_routes(ConfigBase): return result def set_config(self, existing_static_routes_facts): - """ Collect the configuration from the args passed to the module, + """Collect the configuration from the args passed to the module, collect the current configuration (as a dict from facts) :rtype: A list @@ -134,7 +134,7 @@ class Static_routes(ConfigBase): return to_list(resp) def set_state(self, want, have): - """ Select the appropriate function based on the state provided + """Select the appropriate function based on the state provided :param want: the desired configuration as a dictionary :param have: the current configuration as a dictionary @@ -181,7 +181,7 @@ class Static_routes(ConfigBase): return None def _state_replaced(self, want, have): - """ The command generator when state is replaced + """The command generator when state is replaced :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -201,7 +201,7 @@ class Static_routes(ConfigBase): return commands def _state_overridden(self, want, have): - """ The command generator when state is overridden + """The command generator when state is overridden :rtype: A list :returns: the commands necessary to migrate the current configuration @@ -220,7 +220,7 @@ class Static_routes(ConfigBase): return commands def _state_merged(self, want, have, opr=True): - """ The command generator when state is merged + """The command generator when state is merged :rtype: A list :returns: the commands necessary to merge the provided into @@ -234,7 +234,7 @@ class Static_routes(ConfigBase): return commands def _state_deleted(self, want, have): - """ The command generator when state is deleted + """The command generator when state is deleted :rtype: A list :returns: the commands necessary to remove the current configuration diff --git a/plugins/module_utils/network/vyos/facts/facts.py b/plugins/module_utils/network/vyos/facts/facts.py index 4c7b340..caea5fe 100644 --- a/plugins/module_utils/network/vyos/facts/facts.py +++ b/plugins/module_utils/network/vyos/facts/facts.py @@ -70,8 +70,7 @@ FACT_RESOURCE_SUBSETS = dict( class Facts(FactsBase): - """ The fact class for vyos - """ + """The fact class for vyos""" VALID_LEGACY_GATHER_SUBSETS = frozenset(FACT_LEGACY_SUBSETS.keys()) VALID_RESOURCE_SUBSETS = frozenset(FACT_RESOURCE_SUBSETS.keys()) @@ -82,7 +81,7 @@ class Facts(FactsBase): def get_facts( self, legacy_facts_type=None, resource_facts_type=None, data=None ): - """ Collect the facts for vyos + """Collect the facts for vyos :param legacy_facts_type: List of legacy facts types :param resource_facts_type: List of resource fact types :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py b/plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py index 0823259..e6e42d7 100644 --- a/plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py +++ b/plugins/module_utils/network/vyos/facts/firewall_global/firewall_global.py @@ -24,8 +24,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.fir class Firewall_globalFacts(object): - """ The vyos firewall_global fact class - """ + """The vyos firewall_global fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -45,7 +44,7 @@ class Firewall_globalFacts(object): return connection.get_config() def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for firewall_global + """Populate the facts for firewall_global :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/firewall_interfaces/firewall_interfaces.py b/plugins/module_utils/network/vyos/facts/firewall_interfaces/firewall_interfaces.py index 4640748..d0cfb53 100644 --- a/plugins/module_utils/network/vyos/facts/firewall_interfaces/firewall_interfaces.py +++ b/plugins/module_utils/network/vyos/facts/firewall_interfaces/firewall_interfaces.py @@ -24,8 +24,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.fir class Firewall_interfacesFacts(object): - """ The vyos firewall_interfaces fact class - """ + """The vyos firewall_interfaces fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -45,7 +44,7 @@ class Firewall_interfacesFacts(object): return connection.get_config() def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for firewall_interfaces + """Populate the facts for firewall_interfaces :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py b/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py index 971ea6f..4424292 100644 --- a/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py +++ b/plugins/module_utils/network/vyos/facts/firewall_rules/firewall_rules.py @@ -24,8 +24,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.fir class Firewall_rulesFacts(object): - """ The vyos firewall_rules fact class - """ + """The vyos firewall_rules fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -45,7 +44,7 @@ class Firewall_rulesFacts(object): return connection.get_config() def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for firewall_rules + """Populate the facts for firewall_rules :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/interfaces/interfaces.py b/plugins/module_utils/network/vyos/facts/interfaces/interfaces.py index 4b24803..358dd9d 100644 --- a/plugins/module_utils/network/vyos/facts/interfaces/interfaces.py +++ b/plugins/module_utils/network/vyos/facts/interfaces/interfaces.py @@ -26,8 +26,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.int class InterfacesFacts(object): - """ The vyos interfaces fact class - """ + """The vyos interfaces fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -44,7 +43,7 @@ class InterfacesFacts(object): self.generated_spec = utils.generate_dict(facts_argument_spec) def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for interfaces + """Populate the facts for interfaces :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/l3_interfaces/l3_interfaces.py b/plugins/module_utils/network/vyos/facts/l3_interfaces/l3_interfaces.py index eac8467..09ab994 100644 --- a/plugins/module_utils/network/vyos/facts/l3_interfaces/l3_interfaces.py +++ b/plugins/module_utils/network/vyos/facts/l3_interfaces/l3_interfaces.py @@ -30,8 +30,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.l3_ class L3_interfacesFacts(object): - """ The vyos l3_interfaces fact class - """ + """The vyos l3_interfaces fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -48,7 +47,7 @@ class L3_interfacesFacts(object): self.generated_spec = utils.generate_dict(facts_argument_spec) def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for l3_interfaces + """Populate the facts for l3_interfaces :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py b/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py index 9056294..ff02cb0 100644 --- a/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py +++ b/plugins/module_utils/network/vyos/facts/lag_interfaces/lag_interfaces.py @@ -25,8 +25,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.lag class Lag_interfacesFacts(object): - """ The vyos lag_interfaces fact class - """ + """The vyos lag_interfaces fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -43,7 +42,7 @@ class Lag_interfacesFacts(object): self.generated_spec = utils.generate_dict(facts_argument_spec) def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for lag_interfaces + """Populate the facts for lag_interfaces :param module: the module instance :param connection: the device connection :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/lldp_global/lldp_global.py b/plugins/module_utils/network/vyos/facts/lldp_global/lldp_global.py index 3c7e2f9..22b6bc8 100644 --- a/plugins/module_utils/network/vyos/facts/lldp_global/lldp_global.py +++ b/plugins/module_utils/network/vyos/facts/lldp_global/lldp_global.py @@ -25,8 +25,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.lld class Lldp_globalFacts(object): - """ The vyos lldp_global fact class - """ + """The vyos lldp_global fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -43,7 +42,7 @@ class Lldp_globalFacts(object): self.generated_spec = utils.generate_dict(facts_argument_spec) def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for lldp_global + """Populate the facts for lldp_global :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf @@ -78,13 +77,13 @@ class Lldp_globalFacts(object): def render_config(self, conf): """ - Render config as dictionary structure and delete keys - from spec for null values - :param spec: The facts tree, generated from the argspec - :param conf: The configuration - :rtype: dictionary - :returns: The generated config - """ + Render config as dictionary structure and delete keys + from spec for null values + :param spec: The facts tree, generated from the argspec + :param conf: The configuration + :rtype: dictionary + :returns: The generated config + """ protocol_conf = "\n".join( filter(lambda x: ("legacy-protocols" in x), conf) ) diff --git a/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py b/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py index dcfbc6e..64d6a79 100644 --- a/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py +++ b/plugins/module_utils/network/vyos/facts/lldp_interfaces/lldp_interfaces.py @@ -27,8 +27,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.lld class Lldp_interfacesFacts(object): - """ The vyos lldp_interfaces fact class - """ + """The vyos lldp_interfaces fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -45,7 +44,7 @@ class Lldp_interfacesFacts(object): self.generated_spec = utils.generate_dict(facts_argument_spec) def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for lldp_interfaces + """Populate the facts for lldp_interfaces :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/ospfv2/ospfv2.py b/plugins/module_utils/network/vyos/facts/ospfv2/ospfv2.py index d62fa9a..b0c9df2 100644 --- a/plugins/module_utils/network/vyos/facts/ospfv2/ospfv2.py +++ b/plugins/module_utils/network/vyos/facts/ospfv2/ospfv2.py @@ -26,11 +26,13 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.osp class Ospfv2Facts(object): - """ The vyos ospfv2 fact class - """ + """The vyos ospfv2 fact class""" def __init__( - self, module, subspec="config", options="options", + self, + module, + subspec="config", + options="options", ): self._module = module @@ -50,7 +52,7 @@ class Ospfv2Facts(object): return connection.get_config() def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for ospfv2 + """Populate the facts for ospfv2 :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py b/plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py index 457a963..414c65e 100644 --- a/plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py +++ b/plugins/module_utils/network/vyos/facts/ospfv3/ospfv3.py @@ -24,8 +24,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.argspec.osp class Ospfv3Facts(object): - """ The vyos ospfv3 fact class - """ + """The vyos ospfv3 fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -45,7 +44,7 @@ class Ospfv3Facts(object): return connection.get_config() def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for ospfv3 + """Populate the facts for ospfv3 :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/facts/static_routes/static_routes.py b/plugins/module_utils/network/vyos/facts/static_routes/static_routes.py index 0004947..bce2731 100644 --- a/plugins/module_utils/network/vyos/facts/static_routes/static_routes.py +++ b/plugins/module_utils/network/vyos/facts/static_routes/static_routes.py @@ -27,8 +27,7 @@ from ansible_collections.vyos.vyos.plugins.module_utils.network.vyos.utils.utils class Static_routesFacts(object): - """ The vyos static_routes fact class - """ + """The vyos static_routes fact class""" def __init__(self, module, subspec="config", options="options"): self._module = module @@ -48,7 +47,7 @@ class Static_routesFacts(object): return connection.get_config() def populate_facts(self, connection, ansible_facts, data=None): - """ Populate the facts for static_routes + """Populate the facts for static_routes :param connection: the device connection :param ansible_facts: Facts dictionary :param data: previously collected conf diff --git a/plugins/module_utils/network/vyos/utils/utils.py b/plugins/module_utils/network/vyos/utils/utils.py index 7e0f3cc..bcf6fc2 100644 --- a/plugins/module_utils/network/vyos/utils/utils.py +++ b/plugins/module_utils/network/vyos/utils/utils.py @@ -22,8 +22,7 @@ def search_obj_in_list(name, lst, key="name"): def get_interface_type(interface): - """Gets the type of interface - """ + """Gets the type of interface""" if interface.startswith("eth"): return "ethernet" elif interface.startswith("bond"): diff --git a/plugins/modules/vyos_banner.py b/plugins/modules/vyos_banner.py index 8d1e5ff..9fcaf87 100644 --- a/plugins/modules/vyos_banner.py +++ b/plugins/modules/vyos_banner.py @@ -157,8 +157,7 @@ def map_params_to_obj(module): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" argument_spec = dict( banner=dict(required=True, choices=["pre-login", "post-login"]), text=dict(), diff --git a/plugins/modules/vyos_interface.py b/plugins/modules/vyos_interface.py index 21b0dc2..04fd85d 100644 --- a/plugins/modules/vyos_interface.py +++ b/plugins/modules/vyos_interface.py @@ -479,8 +479,7 @@ def check_declarative_intent_params(module, want, result): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" neighbors_spec = dict(host=dict(), port=dict()) element_spec = dict( diff --git a/plugins/modules/vyos_l3_interface.py b/plugins/modules/vyos_l3_interface.py index 25f24a6..88b5a91 100644 --- a/plugins/modules/vyos_l3_interface.py +++ b/plugins/modules/vyos_l3_interface.py @@ -302,8 +302,7 @@ def map_params_to_obj(module): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" element_spec = dict( name=dict(), ipv4=dict(), diff --git a/plugins/modules/vyos_linkagg.py b/plugins/modules/vyos_linkagg.py index 766a584..4320dd3 100644 --- a/plugins/modules/vyos_linkagg.py +++ b/plugins/modules/vyos_linkagg.py @@ -294,8 +294,7 @@ def map_params_to_obj(module): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" element_spec = dict( name=dict(), mode=dict( diff --git a/plugins/modules/vyos_lldp.py b/plugins/modules/vyos_lldp.py index feaf841..c1aaf5d 100644 --- a/plugins/modules/vyos_lldp.py +++ b/plugins/modules/vyos_lldp.py @@ -98,8 +98,7 @@ def has_lldp(module): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" argument_spec = dict( interfaces=dict(type="list", elements="str"), state=dict( diff --git a/plugins/modules/vyos_lldp_interface.py b/plugins/modules/vyos_lldp_interface.py index 911add0..b8bf91c 100644 --- a/plugins/modules/vyos_lldp_interface.py +++ b/plugins/modules/vyos_lldp_interface.py @@ -223,8 +223,7 @@ def map_params_to_obj(module): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" element_spec = dict( name=dict(), state=dict( diff --git a/plugins/modules/vyos_logging.py b/plugins/modules/vyos_logging.py index fa2f4c1..c7780d8 100644 --- a/plugins/modules/vyos_logging.py +++ b/plugins/modules/vyos_logging.py @@ -277,8 +277,7 @@ def map_params_to_obj(module, required_if=None): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" element_spec = dict( dest=dict( type="str", choices=["console", "file", "global", "host", "user"] diff --git a/plugins/modules/vyos_ping.py b/plugins/modules/vyos_ping.py index 0582c1f..64509fb 100644 --- a/plugins/modules/vyos_ping.py +++ b/plugins/modules/vyos_ping.py @@ -145,8 +145,7 @@ import re def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" argument_spec = dict( count=dict(type="int", default=5), dest=dict(type="str", required=True), diff --git a/plugins/modules/vyos_static_route.py b/plugins/modules/vyos_static_route.py index 44d8f6b..3a96997 100644 --- a/plugins/modules/vyos_static_route.py +++ b/plugins/modules/vyos_static_route.py @@ -273,8 +273,7 @@ def map_params_to_obj(module, required_together=None): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" element_spec = dict( prefix=dict(type="str"), mask=dict(type="str"), diff --git a/plugins/modules/vyos_user.py b/plugins/modules/vyos_user.py index e20f146..4f67529 100644 --- a/plugins/modules/vyos_user.py +++ b/plugins/modules/vyos_user.py @@ -339,8 +339,7 @@ def update_objects(want, have): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" element_spec = dict( name=dict(), full_name=dict(), diff --git a/plugins/modules/vyos_vlan.py b/plugins/modules/vyos_vlan.py index 81f4de1..c04ac93 100644 --- a/plugins/modules/vyos_vlan.py +++ b/plugins/modules/vyos_vlan.py @@ -347,8 +347,7 @@ def check_declarative_intent_params(want, module, result): def main(): - """ main entry point for module execution - """ + """main entry point for module execution""" element_spec = dict( vlan_id=dict(type="int"), name=dict(), diff --git a/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py b/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py index 8d59e19..7219443 100644 --- a/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py +++ b/tests/unit/modules/network/vyos/test_vyos_firewall_rules.py @@ -824,8 +824,14 @@ class TestVyosFirewallRulesModule(TestVyosModule): dict( afi="ipv6", rule_sets=[ - dict(name="V6-INGRESS", default_action="accept",), - dict(name="V6-EGRESS", default_action="reject",), + dict( + name="V6-INGRESS", + default_action="accept", + ), + dict( + name="V6-EGRESS", + default_action="reject", + ), ], ), ], @@ -862,14 +868,23 @@ class TestVyosFirewallRulesModule(TestVyosModule): ) ], ), - dict(name="V4-EGRESS", default_action="reject",), + dict( + name="V4-EGRESS", + default_action="reject", + ), ], ), dict( afi="ipv6", rule_sets=[ - dict(name="V6-INGRESS", default_action="accept",), - dict(name="V6-EGRESS", default_action="reject",), + dict( + name="V6-INGRESS", + default_action="accept", + ), + dict( + name="V6-EGRESS", + default_action="reject", + ), ], ), ], @@ -902,14 +917,23 @@ class TestVyosFirewallRulesModule(TestVyosModule): ) ], ), - dict(name="V4-EGRESS", default_action="reject",), + dict( + name="V4-EGRESS", + default_action="reject", + ), ], ), dict( afi="ipv6", rule_sets=[ - dict(name="V6-INGRESS", default_action="accept",), - dict(name="V6-EGRESS", default_action="reject",), + dict( + name="V6-INGRESS", + default_action="accept", + ), + dict( + name="V6-EGRESS", + default_action="reject", + ), ], ), ], @@ -1020,14 +1044,23 @@ class TestVyosFirewallRulesModule(TestVyosModule): ) ], ), - dict(name="V4-EGRESS", default_action="reject",), + dict( + name="V4-EGRESS", + default_action="reject", + ), ], ), dict( afi="ipv6", rule_sets=[ - dict(name="V6-INGRESS", default_action="accept",), - dict(name="V6-EGRESS", default_action="reject",), + dict( + name="V6-INGRESS", + default_action="accept", + ), + dict( + name="V6-EGRESS", + default_action="reject", + ), ], ), ], diff --git a/tests/unit/modules/network/vyos/test_vyos_interface.py b/tests/unit/modules/network/vyos/test_vyos_interface.py index 96bc9f6..1194e3b 100644 --- a/tests/unit/modules/network/vyos/test_vyos_interface.py +++ b/tests/unit/modules/network/vyos/test_vyos_interface.py @@ -120,7 +120,12 @@ class TestVyosInterfaceModule(TestVyosModule): def test_vyos_setup_required_params(self): set_module_args( - dict(name="eth1", enabled=True, state="present", speed="100",) + dict( + name="eth1", + enabled=True, + state="present", + speed="100", + ) ) result = self.execute_module(failed=True) self.assertIn( @@ -128,11 +133,22 @@ class TestVyosInterfaceModule(TestVyosModule): ) def test_vyos_setup_int_idempotent(self): - set_module_args(dict(name="eth1", enabled=True, state="present",)) + set_module_args( + dict( + name="eth1", + enabled=True, + state="present", + ) + ) self.execute_module(changed=False, commands=[]) def test_vyos_disable_int(self): - set_module_args(dict(name="eth1", state="absent",)) + set_module_args( + dict( + name="eth1", + state="absent", + ) + ) commands = ["delete interfaces ethernet eth1"] self.execute_module(changed=True, commands=commands) @@ -173,8 +189,14 @@ class TestVyosInterfaceModule(TestVyosModule): set_module_args( dict( aggregate=[ - dict(name="eth1", state="absent",), - dict(name="eth2", state="absent",), + dict( + name="eth1", + state="absent", + ), + dict( + name="eth2", + state="absent", + ), ] ) ) @@ -188,8 +210,14 @@ class TestVyosInterfaceModule(TestVyosModule): set_module_args( dict( aggregate=[ - dict(name="eth1", enabled=False,), - dict(name="eth2", enabled=False,), + dict( + name="eth1", + enabled=False, + ), + dict( + name="eth2", + enabled=False, + ), ] ) ) @@ -213,7 +241,16 @@ class TestVyosInterfaceModule(TestVyosModule): ) def test_vyos_intent_neighbor_fail(self): - set_module_args(dict(name="eth0", neighbors=[dict(port="eth0",)])) + set_module_args( + dict( + name="eth0", + neighbors=[ + dict( + port="eth0", + ) + ], + ) + ) result = self.execute_module(failed=True) self.assertIn( "One or more conditional statements have not been satisfied", @@ -221,11 +258,31 @@ class TestVyosInterfaceModule(TestVyosModule): ) def test_vyos_intent_neighbor(self): - set_module_args(dict(name="eth1", neighbors=[dict(port="eth0",)])) + set_module_args( + dict( + name="eth1", + neighbors=[ + dict( + port="eth0", + ) + ], + ) + ) self.execute_module(failed=False) def test_vyos_intent_neighbor_aggregate(self): set_module_args( - dict(aggregate=[dict(name="eth1", neighbors=[dict(port="eth0",)])]) + dict( + aggregate=[ + dict( + name="eth1", + neighbors=[ + dict( + port="eth0", + ) + ], + ) + ] + ) ) self.execute_module(failed=False) |