From 775d1e21a3f4b22eaabe98966778553d5e347338 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Thu, 9 May 2024 00:11:08 +0530
Subject: [PATCH 01/10] fix ios_service issues

---
 changelogs/fragments/ios_service_fix.yml      |   4 +
 .../network/ios/argspec/service/service.py    |   6 +-
 .../network/ios/config/service/service.py     |  10 +-
 .../network/ios/facts/service/service.py      |  10 +-
 .../network/ios/rm_templates/service.py       | 171 ++++++++++++------
 plugins/modules/ios_service.py                |  25 ++-
 .../modules/network/ios/test_ios_service.py   |  33 ++--
 7 files changed, 175 insertions(+), 84 deletions(-)
 create mode 100644 changelogs/fragments/ios_service_fix.yml

diff --git a/changelogs/fragments/ios_service_fix.yml b/changelogs/fragments/ios_service_fix.yml
new file mode 100644
index 000000000..3ec24d6a9
--- /dev/null
+++ b/changelogs/fragments/ios_service_fix.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - ios_service - Fix timestamps attribute, to generate right configuration.
+  - ios_service - Add tcp_small_servers and udp_small_servers attributes, to generate configuration.
diff --git a/plugins/module_utils/network/ios/argspec/service/service.py b/plugins/module_utils/network/ios/argspec/service/service.py
index 238fc64a2..647eeb3d2 100644
--- a/plugins/module_utils/network/ios/argspec/service/service.py
+++ b/plugins/module_utils/network/ios/argspec/service/service.py
@@ -68,7 +68,8 @@ class ServiceArgs(object):  # pylint: disable=R0903
                 "tcp_small_servers": {
                     "options": {
                         "enable": {"type": "bool"},
-                        "max_servers": {"type": "str"},
+                        "max_servers": {"type": "int"},
+                        "no_limit": {"type": "bool"},
                     },
                     "type": "dict",
                 },
@@ -97,7 +98,8 @@ class ServiceArgs(object):  # pylint: disable=R0903
                 "udp_small_servers": {
                     "options": {
                         "enable": {"type": "bool"},
-                        "max_servers": {"type": "str"},
+                        "max_servers": {"type": "int"},
+                        "no_limit": {"type": "bool"},
                     },
                     "type": "dict",
                 },
diff --git a/plugins/module_utils/network/ios/config/service/service.py b/plugins/module_utils/network/ios/config/service/service.py
index 6a4c8a1ff..b5c707ba0 100644
--- a/plugins/module_utils/network/ios/config/service/service.py
+++ b/plugins/module_utils/network/ios/config/service/service.py
@@ -25,7 +25,9 @@
     dict_merge,
 )
 
-from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.facts import Facts
+from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.facts import (
+    Facts,
+)
 from ansible_collections.cisco.ios.plugins.module_utils.network.ios.rm_templates.service import (
     ServiceTemplate,
 )
@@ -75,7 +77,9 @@ def __init__(self, module):
             "slave_log",
             "tcp_keepalives_in",
             "tcp_keepalives_out",
+            "tcp_small_servers",
             "telnet_zeroidle",
+            "udp_small_servers",
             "unsupported_transceiver",
         ]
 
@@ -138,9 +142,9 @@ def _compare_lists_attrs(self, want, have):
         for key, wanting in iteritems(i_want):
             haveing = i_have.pop(key, {})
             if wanting != haveing:
-                self.addcmd(wanting, "timestamps")
+                self.addcmd(wanting, key + "_timestamps", False)
         for key, haveing in iteritems(i_have):
-            self.addcmd(haveing, "timestamps", negate=True)
+            self.addcmd(haveing, key + "_timestamps", negate=True)
 
     def _service_list_to_dict(self, data):
         """Convert all list of dicts to dicts of dicts"""
diff --git a/plugins/module_utils/network/ios/facts/service/service.py b/plugins/module_utils/network/ios/facts/service/service.py
index df2dcf993..814555132 100644
--- a/plugins/module_utils/network/ios/facts/service/service.py
+++ b/plugins/module_utils/network/ios/facts/service/service.py
@@ -15,7 +15,9 @@
 based on the configuration.
 """
 
-from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import utils
+from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import (
+    utils,
+)
 
 from ansible_collections.cisco.ios.plugins.module_utils.network.ios.argspec.service.service import (
     ServiceArgs,
@@ -33,7 +35,7 @@ def __init__(self, module, subspec="config", options="options"):
         self.argument_spec = ServiceArgs.argument_spec
 
     def get_service_data(self, connection):
-        return connection.get("show running-config all | section ^service ")
+        return connection.get("show running-config all | section ^service")
 
     def populate_facts(self, connection, ansible_facts, data=None):
         """Populate the facts for Service network resource
@@ -59,7 +61,9 @@ def populate_facts(self, connection, ansible_facts, data=None):
         ansible_facts["ansible_network_resources"].pop("service", None)
 
         params = utils.remove_empties(
-            service_parser.validate_config(self.argument_spec, {"config": objs}, redact=True),
+            service_parser.validate_config(
+                self.argument_spec, {"config": objs}, redact=True
+            ),
         )
 
         facts["service"] = params.get("config", {})
diff --git a/plugins/module_utils/network/ios/rm_templates/service.py b/plugins/module_utils/network/ios/rm_templates/service.py
index 992892db8..66a03d105 100644
--- a/plugins/module_utils/network/ios/rm_templates/service.py
+++ b/plugins/module_utils/network/ios/rm_templates/service.py
@@ -32,36 +32,36 @@ def __init__(self, lines=None, module=None):
             "name": "call_home",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<call_home>call-home)
+                ^service\scall-home
                 """, re.VERBOSE,
             ),
             "setval": "service call-home",
             "result": {
-                "call_home": "{{ not not call_home }}",
+                "call_home": True,
             },
         },
         {
             "name": "compress_config",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<compress_config>compress-config)
+                ^service\scompress-config
                 """, re.VERBOSE,
             ),
             "setval": "service compress-config",
             "result": {
-                "compress_config": "{{ not not compress_config }}",
+                "compress_config": True,
             },
         },
         {
             "name": "config",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<config>config)
+                ^service\sconfig
                 """, re.VERBOSE,
             ),
             "setval": "service config",
             "result": {
-                "config": "{{ not not config }}",
+                "config": True,
             },
         },
         {
@@ -92,120 +92,120 @@ def __init__(self, lines=None, module=None):
             "name": "disable_ip_fast_frag",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<disable_ip_fast_frag>disable-ip-fast-frag)
+                ^service\sdisable-ip-fast-frag
                 """, re.VERBOSE,
             ),
             "setval": "service disable-ip-fast-frag",
             "result": {
-                "disable_ip_fast_frag": "{{ not not disable_ip_fast_frag }}",
+                "disable_ip_fast_frag": True,
             },
         },
         {
             "name": "exec_callback",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<exec_callback>exec-callback)
+                ^service\sexec-callback
                 """, re.VERBOSE,
             ),
             "setval": "service exec-callback",
             "result": {
-                "exec_callback": "{{ not not exec_callback }}",
+                "exec_callback": True,
             },
         },
         {
             "name": "exec_wait",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<exec_wait>exec-wait)
+                ^service\sexec-wait
                 """, re.VERBOSE,
             ),
             "setval": "service exec-wait",
             "return": {
-                "exec_wait": "{{ not not exec_wait }}",
+                "exec_wait": True,
             },
         },
         {
             "name": "hide_telnet_addresses",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<hide_telnet_addresses>hide-telnet-addresses)
+                ^service\shide-telnet-addresses
                 """, re.VERBOSE,
             ),
             "setval": "service hide-telnet-addresses",
             "result": {
-                "hide_telnet_addresses": "{{ not not hide_telnet_addresses }}",
+                "hide_telnet_addresses": True,
             },
         },
         {
             "name": "internal",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<internal>internal)
+                ^service\sinternal
                 """, re.VERBOSE,
             ),
             "setval": "service internal",
             "result": {
-                "internal": "{{ not not internal }}",
+                "internal": True,
             },
         },
         {
             "name": "linenumber",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<linenumber>linenumber)
+                ^service\slinenumber
                 """, re.VERBOSE,
             ),
             "setval": "service linenumber",
             "result": {
-                "linenumber": "{{ not not linenumber }}",
+                "linenumber": True,
             },
         },
         {
             "name": "log",
             "getval": re.compile(
                 r"""
-                ^service\slog(\s(?P<backtrace>backtrace))?
+                ^service\slog\sbacktrace?
                 """, re.VERBOSE,
             ),
             "setval": "service log backtrace",
             "result": {
-                "log": "{{ not not backtrace }}",
+                "log": True,
             },
         },
         {
             "name": "log_hidden",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<log_hidden>log-hidden)
+                ^service\slog-hidden
                 """, re.VERBOSE,
             ),
             "setval": "service log-hidden",
             "result": {
-                "log_hidden": "{{ not not log_hidden }}",
+                "log_hidden": True,
             },
         },
         {
             "name": "nagle",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<nagle>nagle)
+                ^service\snagle
                 """, re.VERBOSE,
             ),
             "setval": "service nagle",
             "result": {
-                "nagle": "{{ not not nagle }}",
+                "nagle": True,
             },
         },
         {
             "name": "old_slip_prompts",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<old_slip_prompts>old-slip-prompts)
+                ^service\sold-slip-prompts
                 """, re.VERBOSE,
             ),
             "setval": "service old-slip-prompts",
             "result": {
-                "old_slip_prompts": "{{ not not old_slip_prompts }}",
+                "old_slip_prompts": True,
             },
         },
         {
@@ -260,12 +260,12 @@ def __init__(self, lines=None, module=None):
             "name": "password_encryption",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<password_encryption>password-encryption)
+                ^service\spassword-encryption
                 """, re.VERBOSE,
             ),
             "setval": "service password-encryption",
             "result": {
-                "password_encryption": "{{ not not password_encryption }}",
+                "password_encryption": True,
             },
         },
         {
@@ -309,48 +309,48 @@ def __init__(self, lines=None, module=None):
             "name": "pt_vty_logging",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<pt_vty_logging>pt-vty-logging)
+                ^service\spt-vty-logging
                 """, re.VERBOSE,
             ),
             "setval": "service pt-vty-logging",
             "result": {
-                "pt_vty_logging": "{{ not not pt_vty_logging }}",
+                "pt_vty_logging": True,
             },
         },
         {
             "name": "scripting",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<scripting>scripting)
+                ^service\sscripting
                 """, re.VERBOSE,
             ),
             "setval": "service scripting",
             "result": {
-                "scripting": "{{ not not scripting }}",
+                "scripting": True,
             },
         },
         {
             "name": "sequence_numbers",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<sequence_numbers>sequence-numbers)
+                ^service\ssequence-numbers
                 """, re.VERBOSE,
             ),
             "setval": "service sequence-numbers",
             "result": {
-                "sequence_numbers": "{{ not not sequence_numbers }}",
+                "sequence_numbers": True,
             },
         },
         {
             "name": "slave_coredump",
             "getval": re.compile(
                 r"""
-                ^service\s(?P<slave_coredump>slave-coredump)
+                ^service\sslave-coredump
                 """, re.VERBOSE,
             ),
             "setval": "service slave-coredump",
             "result": {
-                "slave_coredump": "{{ not not slave_coredump }}",
+                "slave_coredump": True,
             },
         },
         {
@@ -389,6 +389,46 @@ def __init__(self, lines=None, module=None):
                 "tcp_keepalives_out": True,
             },
         },
+        {
+            "name": "tcp_small_servers",
+            "getval": re.compile(
+                r"""
+                ^service\stcp-small-servers
+                (\s(?P<max_servers>\d+))?
+                (\s(?P<no_limit>no-limit))?
+                """, re.VERBOSE,
+            ),
+            "setval": "service tcp-small-servers"
+            "{{ (' ' + tcp_small_servers.max_servers|string) if tcp_small_servers.max_servers is defined else '' }}"
+            "{{ (' no-limit') if tcp_small_servers.no_limit|d(False) else '' }}",
+            "result": {
+                "tcp_small_servers": {
+                    "enable": True,
+                    "max_servers": "{{ max_servers }}",
+                    "no_limit": "{{ not not no_limit }}",
+                },
+            },
+        },
+        {
+            "name": "udp_small_servers",
+            "getval": re.compile(
+                r"""
+                ^service\sudp-small-servers
+                (\s(?P<max_servers>\d+))?
+                (\s(?P<no_limit>no-limit))?
+                """, re.VERBOSE,
+            ),
+            "setval": "{{ ('service udp-small-servers') if udp_small_servers.enable|d(False) else '' }}"
+            "{{ (' ' + udp_small_servers.max_servers|string) if udp_small_servers.max_servers is defined else '' }}"
+            "{{ (' no-limit') if udp_small_servers.no_limit|d(False) else '' }}",
+            "result": {
+                "udp_small_servers": {
+                    "enable": True,
+                    "max_servers": "{{ max_servers }}",
+                    "no_limit": "{{ not not no_limit }}",
+                },
+            },
+        },
         {
             "name": "telnet_zeroidle",
             "getval": re.compile(
@@ -402,11 +442,45 @@ def __init__(self, lines=None, module=None):
             },
         },
         {
-            "name": "timestamps",
+            "name": "log_timestamps",
+            "getval": re.compile(
+                r"""
+                ^service\stimestamps\slog
+                (\s(?P<timestamp>\S+))?
+                (\s(?P<msec>msec))?
+                (\s(?P<localtime>localtime))?
+                (\s(?P<show_timezone>show-timezone))?
+                (\s(?P<year>year))?
+                """, re.VERBOSE,
+            ),
+            "remval": "service timestamps log",
+            "setval": "service timestamps log"
+                      "{{ (' ' + timestamp) if timestamp is defined else '' }}"
+                      "{{ ' msec' if datetime_options.msec is defined else '' }}"
+                      "{{ ' localtime' if datetime_options.localtime is defined else '' }}"
+                      "{{ ' show-timezone' if datetime_options.show_timezone is defined else '' }}"
+                      "{{ ' year' if datetime_options.year is defined else '' }}"
+                      "",
+            "result": {
+                "timestamps": [
+                    {
+                        "msg": "log",
+                        "timestamp": "{{ timestamp if timestamp is defined else 'uptime' }}",
+                        "datetime_options": {
+                            "msec": "{{ True if msec else False}}",
+                            "localtime": "{{ True if localtime else False }}",
+                            "show_timezone": "{{ True if show_timezone else False }}",
+                            "year": "{{ True if year else False }}",
+                        },
+                    },
+                ],
+            },
+        },
+        {
+            "name": "debug_timestamps",
             "getval": re.compile(
                 r"""
-                ^service\stimestamps
-                (\s(?P<msg>\S+))?
+                ^service\stimestamps\sdebug
                 (\s(?P<timestamp>\S+))?
                 (\s(?P<msec>msec))?
                 (\s(?P<localtime>localtime))?
@@ -414,23 +488,18 @@ def __init__(self, lines=None, module=None):
                 (\s(?P<year>year))?
                 """, re.VERBOSE,
             ),
-            "remval": "service timestamps{{ (' ' + msg) if msg is defined else '' }}",
-            "setval": "service timestamps"
-                      "{{ (' ' + msg) if msg is defined else '' }}"
-                      "{% if msg is defined %}"
+            "remval": "service timestamps debug",
+            "setval": "service timestamps debug"
                       "{{ (' ' + timestamp) if timestamp is defined else '' }}"
-                      "{% if timestamp == 'datetime' and datetime_options is defined %}"
-                      "{{ ' msec' if datetime_options.msec else '' }}"
-                      "{{ ' localtime' if datetime_options.localtime else '' }}"
-                      "{{ ' show-timezone' if datetime_options.show_timezone else '' }}"
-                      "{{ ' year' if datetime_options.year else '' }}"
-                      "{% endif %}"
-                      "{% endif %}"
+                      "{{ ' msec' if datetime_options is defined else '' }}"
+                      "{{ ' localtime' if datetime_options is defined else '' }}"
+                      "{{ ' show-timezone' if datetime_options is defined else '' }}"
+                      "{{ ' year' if datetime_options is defined else '' }}"
                       "",
             "result": {
                 "timestamps": [
                     {
-                        "msg": "{{ msg if msg is defined else 'debug' }}",
+                        "msg": "debug",
                         "timestamp": "{{ timestamp if timestamp is defined else 'uptime' }}",
                         "datetime_options": {
                             "msec": "{{ True if msec else False}}",
diff --git a/plugins/modules/ios_service.py b/plugins/modules/ios_service.py
index 46c456569..ebe0e7881 100644
--- a/plugins/modules/ios_service.py
+++ b/plugins/modules/ios_service.py
@@ -22,13 +22,14 @@
 version_added: 4.6.0
 author:
   - Ambroise Rosset (@earendilfr)
+  - Sagar Paul (@KB-perByte)
 notes:
-  - Tested against Cisco IOSXE Version 16.9
+  - Tested against Cisco IOSXE Version 17.9.1a on CML.
   - This module works with connection C(network_cli).
     See U(https://docs.ansible.com/ansible/latest/network/user_guide/platform_ios.html)
 options:
   config:
-    description: A dictionnary of service configuration
+    description: A dictionary of service configuration
     suboptions:
       call_home:
         description: Cisco call-home service
@@ -128,7 +129,7 @@
         type: bool
       tcp_small_servers:
         description:
-          - TCP and UDP small servers are servers (daemons, in Unix parlance) that run in the
+          - TCP small servers are servers (daemons, in Unix parlance) that run in the
             router which are useful for diagnostics.
         suboptions:
           enable:
@@ -137,8 +138,11 @@
           max_servers:
             description:
               - Set number of allowable TCP small servers
-              - 1 to 2147483647 or no-limit
-            type: str
+              - 1 to 2147483647
+            type: int
+          no_limit:
+            description: No limit on number of allowable TCP small servers
+            type: bool
         type: dict
       telnet_zeroidle:
         description: Set TCP window 0 when connection is idle
@@ -181,7 +185,7 @@
         type: list
       udp_small_servers:
         description:
-          - TCP and UDP small servers are servers (daemons, in Unix parlance) that run in the
+          - UDP small servers are servers (daemons, in Unix parlance) that run in the
             router which are useful for diagnostics.
         suboptions:
           enable:
@@ -189,9 +193,12 @@
             type: bool
           max_servers:
             description:
-              - Set number of allowable TCP small servers
-              - 1 to 2147483647 or no-limit
-            type: str
+              - Set number of allowable UDP small servers
+              - 1 to 2147483647
+            type: int
+          no_limit:
+            description: No limit on number of allowable UDP small servers
+            type: bool
         type: dict
       unsupported_transceiver:
         description: enable support for third-party transceivers
diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index fa92efcdc..e0d1593a1 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,7 +26,9 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
+        self.get_resource_connection_facts = (
+            self.mock_get_resource_connection_facts.start()
+        )
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."
@@ -128,14 +130,13 @@ def test_ios_service_merged(self):
             },
         }
         merged = [
-            "service timestamps debug uptime",
-            "service timestamps log datetime msec localtime show-timezone year",
             "service password-encryption",
+            "service timestamps debug uptime msec localtime show-timezone year",
+            "service timestamps log datetime msec localtime show-timezone year",
         ]
         playbook["state"] = "merged"
         set_module_args(playbook)
         result = self.execute_module(changed=True)
-
         self.assertEqual(sorted(result["commands"]), sorted(merged))
 
     def test_ios_snm_server_deleted(self):
@@ -224,7 +225,7 @@ def test_ios_service_overridden(self):
         playbook["state"] = "overridden"
         set_module_args(playbook)
         result = self.execute_module(changed=True)
-
+        print(result["commands"])
         self.assertEqual(sorted(result["commands"]), sorted(overridden))
 
     def test_ios_service_replaced(self):
@@ -269,18 +270,18 @@ def test_ios_service_replaced(self):
         replaced = [
             "no service call-home",
             "no service config",
-            "no service pad",
             "service counters max age 5",
+            "no service pad",
             "service password-encryption",
             "service tcp-keepalives-in",
             "service tcp-keepalives-out",
-            "service timestamps debug datetime",
             "service timestamps log datetime msec localtime show-timezone year",
+            "service timestamps debug datetime",
         ]
         playbook["state"] = "replaced"
         set_module_args(playbook)
         result = self.execute_module(changed=True)
-
+        print(result["commands"])
         self.assertEqual(sorted(result["commands"]), sorted(replaced))
 
     def test_ios_service_replaced_idempotent(self):
@@ -426,36 +427,36 @@ def test_ios_service_gathered(self):
             service timestamps log datetime msec localtime show-timezone year
             service timestamps debug uptime
             service call-home
+            service udp-small-servers
+            service tcp-small-servers no-limit
             """,
         )
         set_module_args(dict(state="gathered"))
         gathered = {
             "timestamps": [
-                {
-                    "msg": "debug",
-                    "timestamp": "uptime",
-                },
                 {
                     "msg": "log",
                     "timestamp": "datetime",
                     "datetime_options": {
-                        "localtime": True,
                         "msec": True,
+                        "localtime": True,
                         "show_timezone": True,
                         "year": True,
                     },
                 },
+                {"msg": "debug", "timestamp": "uptime"},
             ],
             "call_home": True,
-            "dhcp": True,
+            "udp_small_servers": {"enable": True},
+            "tcp_small_servers": {"enable": True, "no_limit": True},
             "counters": 0,
+            "dhcp": True,
             "password_recovery": True,
             "prompt": True,
             "slave_log": True,
         }
         result = self.execute_module(changed=False)
         self.maxDiff = None
-
         self.assertEqual(sorted(result["gathered"]), sorted(gathered))
 
     def test_ios_service_rendered(self):
@@ -502,5 +503,5 @@ def test_ios_service_rendered(self):
         ]
         result = self.execute_module(changed=False)
         self.maxDiff = None
-
+        print(result["rendered"])
         self.assertEqual(sorted(result["rendered"]), sorted(rendered))

From f98b54f5d983ee5e165f1a2de8567ff625cb993b Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 18:42:34 +0000
Subject: [PATCH 02/10] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 docs/cisco.ios.ios_service_module.rst         | 61 ++++++++++++++++---
 .../network/ios/config/service/service.py     |  4 +-
 .../network/ios/facts/service/service.py      |  8 +--
 .../modules/network/ios/test_ios_service.py   |  4 +-
 4 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/docs/cisco.ios.ios_service_module.rst b/docs/cisco.ios.ios_service_module.rst
index ed859129d..a2d5eef38 100644
--- a/docs/cisco.ios.ios_service_module.rst
+++ b/docs/cisco.ios.ios_service_module.rst
@@ -45,7 +45,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>A dictionnary of service configuration</div>
+                        <div>A dictionary of service configuration</div>
                 </td>
             </tr>
                                 <tr>
@@ -658,7 +658,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>TCP and UDP small servers are servers (daemons, in Unix parlance) that run in the router which are useful for diagnostics.</div>
+                        <div>TCP small servers are servers (daemons, in Unix parlance) that run in the router which are useful for diagnostics.</div>
                 </td>
             </tr>
                                 <tr>
@@ -690,14 +690,35 @@ Parameters
                     <b>max_servers</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">string</span>
+                        <span style="color: purple">integer</span>
                     </div>
                 </td>
                 <td>
                 </td>
                 <td>
                         <div>Set number of allowable TCP small servers</div>
-                        <div>1 to 2147483647 or no-limit</div>
+                        <div>1 to 2147483647</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_limit</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>no</li>
+                                    <li>yes</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>No limit on number of allowable TCP small servers</div>
                 </td>
             </tr>
 
@@ -921,7 +942,7 @@ Parameters
                 <td>
                 </td>
                 <td>
-                        <div>TCP and UDP small servers are servers (daemons, in Unix parlance) that run in the router which are useful for diagnostics.</div>
+                        <div>UDP small servers are servers (daemons, in Unix parlance) that run in the router which are useful for diagnostics.</div>
                 </td>
             </tr>
                                 <tr>
@@ -953,14 +974,35 @@ Parameters
                     <b>max_servers</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
-                        <span style="color: purple">string</span>
+                        <span style="color: purple">integer</span>
                     </div>
                 </td>
                 <td>
                 </td>
                 <td>
-                        <div>Set number of allowable TCP small servers</div>
-                        <div>1 to 2147483647 or no-limit</div>
+                        <div>Set number of allowable UDP small servers</div>
+                        <div>1 to 2147483647</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>no_limit</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">boolean</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li>no</li>
+                                    <li>yes</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>No limit on number of allowable UDP small servers</div>
                 </td>
             </tr>
 
@@ -1036,7 +1078,7 @@ Notes
 -----
 
 .. note::
-   - Tested against Cisco IOSXE Version 16.9
+   - Tested against Cisco IOSXE Version 17.9.1a on CML.
    - This module works with connection ``network_cli``. See https://docs.ansible.com/ansible/latest/network/user_guide/platform_ios.html
 
 
@@ -1556,3 +1598,4 @@ Authors
 ~~~~~~~
 
 - Ambroise Rosset (@earendilfr)
+- Sagar Paul (@KB-perByte)
diff --git a/plugins/module_utils/network/ios/config/service/service.py b/plugins/module_utils/network/ios/config/service/service.py
index b5c707ba0..603e1060b 100644
--- a/plugins/module_utils/network/ios/config/service/service.py
+++ b/plugins/module_utils/network/ios/config/service/service.py
@@ -25,9 +25,7 @@
     dict_merge,
 )
 
-from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.facts import (
-    Facts,
-)
+from ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.facts import Facts
 from ansible_collections.cisco.ios.plugins.module_utils.network.ios.rm_templates.service import (
     ServiceTemplate,
 )
diff --git a/plugins/module_utils/network/ios/facts/service/service.py b/plugins/module_utils/network/ios/facts/service/service.py
index 814555132..6ada10748 100644
--- a/plugins/module_utils/network/ios/facts/service/service.py
+++ b/plugins/module_utils/network/ios/facts/service/service.py
@@ -15,9 +15,7 @@
 based on the configuration.
 """
 
-from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import (
-    utils,
-)
+from ansible_collections.ansible.netcommon.plugins.module_utils.network.common import utils
 
 from ansible_collections.cisco.ios.plugins.module_utils.network.ios.argspec.service.service import (
     ServiceArgs,
@@ -62,7 +60,9 @@ def populate_facts(self, connection, ansible_facts, data=None):
 
         params = utils.remove_empties(
             service_parser.validate_config(
-                self.argument_spec, {"config": objs}, redact=True
+                self.argument_spec,
+                {"config": objs},
+                redact=True,
             ),
         )
 
diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index e0d1593a1..b8b40b819 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,9 +26,7 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = (
-            self.mock_get_resource_connection_facts.start()
-        )
+        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."

From 88955c224923711b34c69f937cce74375f969528 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Thu, 9 May 2024 00:20:06 +0530
Subject: [PATCH 03/10] clean debug

---
 tests/unit/modules/network/ios/test_ios_service.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index b8b40b819..266ffaf68 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,7 +26,9 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
+        self.get_resource_connection_facts = (
+            self.mock_get_resource_connection_facts.start()
+        )
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."
@@ -223,7 +225,6 @@ def test_ios_service_overridden(self):
         playbook["state"] = "overridden"
         set_module_args(playbook)
         result = self.execute_module(changed=True)
-        print(result["commands"])
         self.assertEqual(sorted(result["commands"]), sorted(overridden))
 
     def test_ios_service_replaced(self):
@@ -279,7 +280,6 @@ def test_ios_service_replaced(self):
         playbook["state"] = "replaced"
         set_module_args(playbook)
         result = self.execute_module(changed=True)
-        print(result["commands"])
         self.assertEqual(sorted(result["commands"]), sorted(replaced))
 
     def test_ios_service_replaced_idempotent(self):
@@ -501,5 +501,4 @@ def test_ios_service_rendered(self):
         ]
         result = self.execute_module(changed=False)
         self.maxDiff = None
-        print(result["rendered"])
         self.assertEqual(sorted(result["rendered"]), sorted(rendered))

From e5fd882f2d2e6bfa6561f9277f72ae8262da123e Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 8 May 2024 18:50:42 +0000
Subject: [PATCH 04/10] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/unit/modules/network/ios/test_ios_service.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index 266ffaf68..b1c7b079a 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,9 +26,7 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = (
-            self.mock_get_resource_connection_facts.start()
-        )
+        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."

From f638432933454838b9ebf56de70a9570acf0b961 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Thu, 9 May 2024 15:01:23 +0530
Subject: [PATCH 05/10] fix tests

---
 .../network/ios/rm_templates/service.py        | 16 ++++++++--------
 .../modules/network/ios/test_ios_service.py    | 18 +++++++++++++-----
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/plugins/module_utils/network/ios/rm_templates/service.py b/plugins/module_utils/network/ios/rm_templates/service.py
index 66a03d105..8d92aebbd 100644
--- a/plugins/module_utils/network/ios/rm_templates/service.py
+++ b/plugins/module_utils/network/ios/rm_templates/service.py
@@ -456,10 +456,10 @@ def __init__(self, lines=None, module=None):
             "remval": "service timestamps log",
             "setval": "service timestamps log"
                       "{{ (' ' + timestamp) if timestamp is defined else '' }}"
-                      "{{ ' msec' if datetime_options.msec is defined else '' }}"
-                      "{{ ' localtime' if datetime_options.localtime is defined else '' }}"
-                      "{{ ' show-timezone' if datetime_options.show_timezone is defined else '' }}"
-                      "{{ ' year' if datetime_options.year is defined else '' }}"
+                      "{{ ' msec' if datetime_options and datetime_options.msec is defined else '' }}"
+                      "{{ ' localtime' if datetime_options and datetime_options.localtime is defined else '' }}"
+                      "{{ ' show-timezone' if datetime_options and datetime_options.show_timezone is defined else '' }}"
+                      "{{ ' year' if datetime_options and datetime_options.year is defined else '' }}"
                       "",
             "result": {
                 "timestamps": [
@@ -491,10 +491,10 @@ def __init__(self, lines=None, module=None):
             "remval": "service timestamps debug",
             "setval": "service timestamps debug"
                       "{{ (' ' + timestamp) if timestamp is defined else '' }}"
-                      "{{ ' msec' if datetime_options is defined else '' }}"
-                      "{{ ' localtime' if datetime_options is defined else '' }}"
-                      "{{ ' show-timezone' if datetime_options is defined else '' }}"
-                      "{{ ' year' if datetime_options is defined else '' }}"
+                      "{{ (' msec') if datetime_options and datetime_options.msec is defined else '' }}"
+                      "{{ (' localtime') if datetime_options and datetime_options.localtime is defined else '' }}"
+                      "{{ (' show-timezone') if datetime_options and datetime_options.show_timezone is defined else '' }}"
+                      "{{ (' year') if datetime_options and datetime_options.year is defined else '' }}"
                       "",
             "result": {
                 "timestamps": [
diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index b1c7b079a..715860831 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,7 +26,9 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
+        self.get_resource_connection_facts = (
+            self.mock_get_resource_connection_facts.start()
+        )
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."
@@ -129,7 +131,7 @@ def test_ios_service_merged(self):
         }
         merged = [
             "service password-encryption",
-            "service timestamps debug uptime msec localtime show-timezone year",
+            "service timestamps debug uptime msec",
             "service timestamps log datetime msec localtime show-timezone year",
         ]
         playbook["state"] = "merged"
@@ -217,7 +219,6 @@ def test_ios_service_overridden(self):
             "service password-encryption",
             "service tcp-keepalives-in",
             "service tcp-keepalives-out",
-            "service timestamps debug datetime",
             "service timestamps log datetime msec localtime show-timezone year",
         ]
         playbook["state"] = "overridden"
@@ -256,6 +257,10 @@ def test_ios_service_replaced(self):
                     {
                         "msg": "debug",
                         "timestamp": "datetime",
+                        "datetime_options": {
+                            "localtime": True,
+                            "msec": True,
+                        },
                     },
                 ],
                 "tcp_keepalives_in": True,
@@ -273,7 +278,7 @@ def test_ios_service_replaced(self):
             "service tcp-keepalives-in",
             "service tcp-keepalives-out",
             "service timestamps log datetime msec localtime show-timezone year",
-            "service timestamps debug datetime",
+            "service timestamps debug datetime msec localtime",
         ]
         playbook["state"] = "replaced"
         set_module_args(playbook)
@@ -469,6 +474,9 @@ def test_ios_service_rendered(self):
                         {
                             "msg": "debug",
                             "timestamp": "uptime",
+                            "datetime_options": {
+                                "localtime": True,
+                            },
                         },
                         {
                             "msg": "log",
@@ -494,7 +502,7 @@ def test_ios_service_rendered(self):
             "service slave-log",
             "service tcp-keepalives-in",
             "service tcp-keepalives-out",
-            "service timestamps debug uptime",
+            "service timestamps debug uptime localtime",
             "service timestamps log datetime msec localtime show-timezone year",
         ]
         result = self.execute_module(changed=False)

From e307d5ce613e8930ec8c0e4684103c13f7f30fdc Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 09:32:00 +0000
Subject: [PATCH 06/10] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/unit/modules/network/ios/test_ios_service.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index 715860831..99f973e2e 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,9 +26,7 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = (
-            self.mock_get_resource_connection_facts.start()
-        )
+        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."

From 06be132ccd936c5c28a01d5f0fdae080cc626601 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 13 May 2024 13:22:15 +0530
Subject: [PATCH 07/10] Update

---
 .../network/ios/rm_templates/service.py          | 16 ++++++++--------
 .../unit/modules/network/ios/test_ios_service.py |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/module_utils/network/ios/rm_templates/service.py b/plugins/module_utils/network/ios/rm_templates/service.py
index 8d92aebbd..6c7f236d8 100644
--- a/plugins/module_utils/network/ios/rm_templates/service.py
+++ b/plugins/module_utils/network/ios/rm_templates/service.py
@@ -456,10 +456,10 @@ def __init__(self, lines=None, module=None):
             "remval": "service timestamps log",
             "setval": "service timestamps log"
                       "{{ (' ' + timestamp) if timestamp is defined else '' }}"
-                      "{{ ' msec' if datetime_options and datetime_options.msec is defined else '' }}"
-                      "{{ ' localtime' if datetime_options and datetime_options.localtime is defined else '' }}"
-                      "{{ ' show-timezone' if datetime_options and datetime_options.show_timezone is defined else '' }}"
-                      "{{ ' year' if datetime_options and datetime_options.year is defined else '' }}"
+                      "{{ ' msec' if datetime_options and datetime_options.msec|d(False) is defined else '' }}"
+                      "{{ ' localtime' if datetime_options and datetime_options.localtime|d(False) is defined else '' }}"
+                      "{{ ' show-timezone' if datetime_options and datetime_options.show_timezone|d(False) is defined else '' }}"
+                      "{{ ' year' if datetime_options and datetime_options.year|d(False) is defined else '' }}"
                       "",
             "result": {
                 "timestamps": [
@@ -491,10 +491,10 @@ def __init__(self, lines=None, module=None):
             "remval": "service timestamps debug",
             "setval": "service timestamps debug"
                       "{{ (' ' + timestamp) if timestamp is defined else '' }}"
-                      "{{ (' msec') if datetime_options and datetime_options.msec is defined else '' }}"
-                      "{{ (' localtime') if datetime_options and datetime_options.localtime is defined else '' }}"
-                      "{{ (' show-timezone') if datetime_options and datetime_options.show_timezone is defined else '' }}"
-                      "{{ (' year') if datetime_options and datetime_options.year is defined else '' }}"
+                      "{{ (' msec') if datetime_options and datetime_options.msec|d(False) is defined else '' }}"
+                      "{{ (' localtime') if datetime_options and datetime_options.localtime|d(False) is defined else '' }}"
+                      "{{ (' show-timezone') if datetime_options and datetime_options.show_timezone|d(False) is defined else '' }}"
+                      "{{ (' year') if datetime_options and datetime_options.year|d(False) is defined else '' }}"
                       "",
             "result": {
                 "timestamps": [
diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index 99f973e2e..8b6838a63 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,7 +26,9 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
+        self.get_resource_connection_facts = (
+            self.mock_get_resource_connection_facts.start()
+        )
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."
@@ -368,8 +370,6 @@ def test_ios_service_replaced_idempotent_old(self):
 
         self.assertEqual(sorted(result["commands"]), sorted(replaced))
 
-    ####################
-
     def test_ios_service_parsed(self):
         set_module_args(
             dict(

From e4ca84752b19502204cb13a6ae96b6c01679d214 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 07:52:56 +0000
Subject: [PATCH 08/10] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tests/unit/modules/network/ios/test_ios_service.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index 8b6838a63..c99932125 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,9 +26,7 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = (
-            self.mock_get_resource_connection_facts.start()
-        )
+        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."

From a33828d0eeb2a6755233f0e70032a399d03d9170 Mon Sep 17 00:00:00 2001
From: KB-perByte <sagpaul@redhat.com>
Date: Mon, 13 May 2024 13:42:22 +0530
Subject: [PATCH 09/10] Confirm changes

---
 .../network/ios/rm_templates/service.py       | 33 +++++++++++--------
 .../modules/network/ios/test_ios_service.py   | 19 ++++++-----
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/plugins/module_utils/network/ios/rm_templates/service.py b/plugins/module_utils/network/ios/rm_templates/service.py
index 6c7f236d8..db1e7102f 100644
--- a/plugins/module_utils/network/ios/rm_templates/service.py
+++ b/plugins/module_utils/network/ios/rm_templates/service.py
@@ -22,6 +22,23 @@
 )
 
 
+def handleTimestamp(config_data):
+    command = "service timestamps"
+    command += " " + config_data.get("msg") if config_data.get("msg") else ""
+    command += (
+        " " + config_data.get("timestamp") if config_data.get("timestamp") else ""
+    )
+
+    if config_data.get("datetime_options"):
+        datetime_op = config_data.get("datetime_options")
+        command += " mesc" if datetime_op.get("msec") else ""
+        command += " localtime" if datetime_op.get("localtime") else ""
+        command += " show-timezone" if datetime_op.get("show_timezone") else ""
+        command += " year" if datetime_op.get("year") else ""
+
+    return command
+
+
 class ServiceTemplate(NetworkTemplate):
     def __init__(self, lines=None, module=None):
         super(ServiceTemplate, self).__init__(lines=lines, tmplt=self, module=module)
@@ -454,13 +471,7 @@ def __init__(self, lines=None, module=None):
                 """, re.VERBOSE,
             ),
             "remval": "service timestamps log",
-            "setval": "service timestamps log"
-                      "{{ (' ' + timestamp) if timestamp is defined else '' }}"
-                      "{{ ' msec' if datetime_options and datetime_options.msec|d(False) is defined else '' }}"
-                      "{{ ' localtime' if datetime_options and datetime_options.localtime|d(False) is defined else '' }}"
-                      "{{ ' show-timezone' if datetime_options and datetime_options.show_timezone|d(False) is defined else '' }}"
-                      "{{ ' year' if datetime_options and datetime_options.year|d(False) is defined else '' }}"
-                      "",
+            "setval": handleTimestamp,
             "result": {
                 "timestamps": [
                     {
@@ -489,13 +500,7 @@ def __init__(self, lines=None, module=None):
                 """, re.VERBOSE,
             ),
             "remval": "service timestamps debug",
-            "setval": "service timestamps debug"
-                      "{{ (' ' + timestamp) if timestamp is defined else '' }}"
-                      "{{ (' msec') if datetime_options and datetime_options.msec|d(False) is defined else '' }}"
-                      "{{ (' localtime') if datetime_options and datetime_options.localtime|d(False) is defined else '' }}"
-                      "{{ (' show-timezone') if datetime_options and datetime_options.show_timezone|d(False) is defined else '' }}"
-                      "{{ (' year') if datetime_options and datetime_options.year|d(False) is defined else '' }}"
-                      "",
+            "setval": handleTimestamp,
             "result": {
                 "timestamps": [
                     {
diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index c99932125..d4e49a98d 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,7 +26,9 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
+        self.get_resource_connection_facts = (
+            self.mock_get_resource_connection_facts.start()
+        )
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."
@@ -129,8 +131,8 @@ def test_ios_service_merged(self):
         }
         merged = [
             "service password-encryption",
-            "service timestamps debug uptime msec",
-            "service timestamps log datetime msec localtime show-timezone year",
+            "service timestamps debug uptime mesc",
+            "service timestamps log datetime mesc localtime show-timezone year",
         ]
         playbook["state"] = "merged"
         set_module_args(playbook)
@@ -212,12 +214,13 @@ def test_ios_service_overridden(self):
         overridden = [
             "no service call-home",
             "no service config",
-            "no service pad",
             "service counters max age 5",
+            "no service pad",
             "service password-encryption",
             "service tcp-keepalives-in",
             "service tcp-keepalives-out",
-            "service timestamps log datetime msec localtime show-timezone year",
+            "service timestamps log datetime mesc localtime show-timezone year",
+            "service timestamps debug datetime",
         ]
         playbook["state"] = "overridden"
         set_module_args(playbook)
@@ -275,8 +278,8 @@ def test_ios_service_replaced(self):
             "service password-encryption",
             "service tcp-keepalives-in",
             "service tcp-keepalives-out",
-            "service timestamps log datetime msec localtime show-timezone year",
-            "service timestamps debug datetime msec localtime",
+            "service timestamps log datetime mesc localtime show-timezone year",
+            "service timestamps debug datetime mesc localtime",
         ]
         playbook["state"] = "replaced"
         set_module_args(playbook)
@@ -499,7 +502,7 @@ def test_ios_service_rendered(self):
             "service tcp-keepalives-in",
             "service tcp-keepalives-out",
             "service timestamps debug uptime localtime",
-            "service timestamps log datetime msec localtime show-timezone year",
+            "service timestamps log datetime mesc localtime show-timezone year",
         ]
         result = self.execute_module(changed=False)
         self.maxDiff = None

From 4542aed6598bf5b04f6834e5286d898a3da6089c Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 08:13:02 +0000
Subject: [PATCH 10/10] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 plugins/module_utils/network/ios/rm_templates/service.py | 4 +---
 tests/unit/modules/network/ios/test_ios_service.py       | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/module_utils/network/ios/rm_templates/service.py b/plugins/module_utils/network/ios/rm_templates/service.py
index db1e7102f..c81593226 100644
--- a/plugins/module_utils/network/ios/rm_templates/service.py
+++ b/plugins/module_utils/network/ios/rm_templates/service.py
@@ -25,9 +25,7 @@
 def handleTimestamp(config_data):
     command = "service timestamps"
     command += " " + config_data.get("msg") if config_data.get("msg") else ""
-    command += (
-        " " + config_data.get("timestamp") if config_data.get("timestamp") else ""
-    )
+    command += " " + config_data.get("timestamp") if config_data.get("timestamp") else ""
 
     if config_data.get("datetime_options"):
         datetime_op = config_data.get("datetime_options")
diff --git a/tests/unit/modules/network/ios/test_ios_service.py b/tests/unit/modules/network/ios/test_ios_service.py
index d4e49a98d..69af87eda 100644
--- a/tests/unit/modules/network/ios/test_ios_service.py
+++ b/tests/unit/modules/network/ios/test_ios_service.py
@@ -26,9 +26,7 @@ def setUp(self):
             "ansible_collections.ansible.netcommon.plugins.module_utils.network.common.rm_base.resource_module_base."
             "get_resource_connection",
         )
-        self.get_resource_connection_facts = (
-            self.mock_get_resource_connection_facts.start()
-        )
+        self.get_resource_connection_facts = self.mock_get_resource_connection_facts.start()
 
         self.mock_execute_show_command = patch(
             "ansible_collections.cisco.ios.plugins.module_utils.network.ios.facts.service.service."